diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysUserController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysUserController.java index 8e47895..9c795f0 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysUserController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysUserController.java @@ -18,7 +18,7 @@ import com.agileboot.admin.customize.aop.accessLog.AccessLog; import com.agileboot.infrastructure.user.AuthenticationUtils; import com.agileboot.infrastructure.user.web.SystemLoginUser; import com.agileboot.common.enums.common.BusinessTypeEnum; -import com.agileboot.orm.system.result.SearchUserDO; +import com.agileboot.domain.system.user.db.SearchUserDO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import java.util.List; diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/aop/accessLog/OperationLogModel.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/aop/accessLog/OperationLogModel.java index feae682..b1d3da2 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/aop/accessLog/OperationLogModel.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/aop/accessLog/OperationLogModel.java @@ -11,7 +11,7 @@ import com.agileboot.infrastructure.user.web.SystemLoginUser; import com.agileboot.common.enums.common.OperationStatusEnum; import com.agileboot.common.enums.common.RequestMethodEnum; import com.agileboot.common.enums.BasicEnumUtil; -import com.agileboot.orm.system.entity.SysOperationLogEntity; +import com.agileboot.domain.system.log.db.SysOperationLogEntity; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.springframework.validation.BindingResult; diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/async/AsyncTaskFactory.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/async/AsyncTaskFactory.java index 18b7c23..a5f66c9 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/async/AsyncTaskFactory.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/async/AsyncTaskFactory.java @@ -6,10 +6,10 @@ import cn.hutool.extra.spring.SpringUtil; import com.agileboot.common.utils.ServletHolderUtil; import com.agileboot.common.utils.ip.IpRegionUtil; import com.agileboot.common.enums.common.LoginStatusEnum; -import com.agileboot.orm.system.entity.SysLoginInfoEntity; -import com.agileboot.orm.system.entity.SysOperationLogEntity; -import com.agileboot.orm.system.service.ISysLoginInfoService; -import com.agileboot.orm.system.service.ISysOperationLogService; +import com.agileboot.domain.system.log.db.SysLoginInfoEntity; +import com.agileboot.domain.system.log.db.SysOperationLogEntity; +import com.agileboot.domain.system.log.db.SysLoginInfoService; +import com.agileboot.domain.system.log.db.SysOperationLogService; import eu.bitwalker.useragentutils.UserAgent; import lombok.extern.slf4j.Slf4j; @@ -57,7 +57,7 @@ public class AsyncTaskFactory { loginInfo.setLoginTime(DateUtil.date()); loginInfo.setStatus(loginStatusEnum.getValue()); // 插入数据 - SpringUtil.getBean(ISysLoginInfoService.class).save(loginInfo); + SpringUtil.getBean(SysLoginInfoService.class).save(loginInfo); }; } @@ -71,7 +71,7 @@ public class AsyncTaskFactory { return () -> { // 远程查询操作地点 operationLog.setOperatorLocation(IpRegionUtil.getBriefLocationByIp(operationLog.getOperatorIp())); - SpringUtil.getBean(ISysOperationLogService.class).save(operationLog); + SpringUtil.getBean(SysOperationLogService.class).save(operationLog); }; } diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/LoginService.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/LoginService.java index d77acbe..118bcbc 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/LoginService.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/LoginService.java @@ -28,7 +28,7 @@ import com.agileboot.admin.customize.service.login.command.LoginCommand; import com.agileboot.infrastructure.user.web.SystemLoginUser; import com.agileboot.common.enums.common.ConfigKeyEnum; import com.agileboot.common.enums.common.LoginStatusEnum; -import com.agileboot.orm.system.entity.SysUserEntity; +import com.agileboot.domain.system.user.db.SysUserEntity; import com.google.code.kaptcha.Producer; import java.awt.image.BufferedImage; import javax.annotation.Resource; diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/UserDetailsServiceImpl.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/UserDetailsServiceImpl.java index 37ad378..b8750da 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/UserDetailsServiceImpl.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/UserDetailsServiceImpl.java @@ -9,12 +9,12 @@ import com.agileboot.infrastructure.user.web.RoleInfo; import com.agileboot.infrastructure.user.web.DataScopeEnum; import com.agileboot.common.enums.common.UserStatusEnum; import com.agileboot.common.enums.BasicEnumUtil; -import com.agileboot.orm.system.entity.SysMenuEntity; -import com.agileboot.orm.system.entity.SysRoleEntity; -import com.agileboot.orm.system.entity.SysUserEntity; -import com.agileboot.orm.system.service.ISysMenuService; -import com.agileboot.orm.system.service.ISysRoleService; -import com.agileboot.orm.system.service.ISysUserService; +import com.agileboot.domain.system.menu.db.SysMenuEntity; +import com.agileboot.domain.system.role.db.SysRoleEntity; +import com.agileboot.domain.system.user.db.SysUserEntity; +import com.agileboot.domain.system.menu.db.SysMenuService; +import com.agileboot.domain.system.role.db.SysRoleService; +import com.agileboot.domain.system.user.db.SysUserService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import java.util.List; @@ -45,13 +45,13 @@ import org.springframework.stereotype.Service; public class UserDetailsServiceImpl implements UserDetailsService { @NonNull - private ISysUserService userService; + private SysUserService userService; @NonNull - private ISysMenuService menuService; + private SysMenuService menuService; @NonNull - private ISysRoleService roleService; + private SysRoleService roleService; @NonNull private TokenService tokenService; diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionCheckerFactory.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionCheckerFactory.java index d8d4044..c7fdcca 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionCheckerFactory.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionCheckerFactory.java @@ -10,7 +10,7 @@ import com.agileboot.admin.customize.service.permission.model.checker.DeptTreeDa import com.agileboot.admin.customize.service.permission.model.checker.OnlySelfDataPermissionChecker; import com.agileboot.admin.customize.service.permission.model.checker.SingleDeptDataPermissionChecker; import com.agileboot.infrastructure.user.web.DataScopeEnum; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptService; import javax.annotation.PostConstruct; import org.springframework.stereotype.Component; @@ -30,7 +30,7 @@ public class DataPermissionCheckerFactory { @PostConstruct public void initAllChecker() { - ISysDeptService deptService = SpringUtil.getBean(ISysDeptService.class); + SysDeptService deptService = SpringUtil.getBean(SysDeptService.class); allChecker = new AllDataPermissionChecker(); customChecker = new CustomDataPermissionChecker(deptService); diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionService.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionService.java index 6814fea..2d45de4 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionService.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionService.java @@ -5,8 +5,8 @@ import com.agileboot.admin.customize.service.permission.model.AbstractDataPermis import com.agileboot.admin.customize.service.permission.model.DataCondition; import com.agileboot.infrastructure.user.AuthenticationUtils; import com.agileboot.infrastructure.user.web.SystemLoginUser; -import com.agileboot.orm.system.entity.SysUserEntity; -import com.agileboot.orm.system.service.ISysUserService; +import com.agileboot.domain.system.user.db.SysUserEntity; +import com.agileboot.domain.system.user.db.SysUserService; import java.util.List; import lombok.NonNull; import lombok.RequiredArgsConstructor; @@ -21,7 +21,7 @@ import org.springframework.stereotype.Service; public class DataPermissionService { @NonNull - private ISysUserService userService; + private SysUserService userService; /** * 通过userId 校验当前用户 对 目标用户是否有操作权限 diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/AbstractDataPermissionChecker.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/AbstractDataPermissionChecker.java index 2a93b65..091cea1 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/AbstractDataPermissionChecker.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/AbstractDataPermissionChecker.java @@ -1,7 +1,7 @@ package com.agileboot.admin.customize.service.permission.model; import com.agileboot.infrastructure.user.web.SystemLoginUser; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptService; import lombok.Data; /** @@ -11,7 +11,7 @@ import lombok.Data; @Data public abstract class AbstractDataPermissionChecker { - private ISysDeptService deptService; + private SysDeptService deptService; /** * 检测当前用户对于 给定条件的数据 是否有权限 diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/AllDataPermissionChecker.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/AllDataPermissionChecker.java index 6f75812..e908dca 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/AllDataPermissionChecker.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/AllDataPermissionChecker.java @@ -3,7 +3,7 @@ package com.agileboot.admin.customize.service.permission.model.checker; import com.agileboot.infrastructure.user.web.SystemLoginUser; import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker; import com.agileboot.admin.customize.service.permission.model.DataCondition; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptService; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode; @Data public class AllDataPermissionChecker extends AbstractDataPermissionChecker { - private ISysDeptService deptService; + private SysDeptService deptService; @Override diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/CustomDataPermissionChecker.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/CustomDataPermissionChecker.java index 6617baf..801542e 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/CustomDataPermissionChecker.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/CustomDataPermissionChecker.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; import com.agileboot.infrastructure.user.web.SystemLoginUser; import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker; import com.agileboot.admin.customize.service.permission.model.DataCondition; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptService; import java.util.Set; import lombok.AllArgsConstructor; import lombok.Data; @@ -21,7 +21,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class CustomDataPermissionChecker extends AbstractDataPermissionChecker { - private ISysDeptService deptService; + private SysDeptService deptService; @Override diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/DefaultDataPermissionChecker.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/DefaultDataPermissionChecker.java index 436ab56..44cc15a 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/DefaultDataPermissionChecker.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/DefaultDataPermissionChecker.java @@ -3,7 +3,7 @@ package com.agileboot.admin.customize.service.permission.model.checker; import com.agileboot.infrastructure.user.web.SystemLoginUser; import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker; import com.agileboot.admin.customize.service.permission.model.DataCondition; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptService; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode; @Data public class DefaultDataPermissionChecker extends AbstractDataPermissionChecker { - private ISysDeptService deptService; + private SysDeptService deptService; @Override public boolean check(SystemLoginUser loginUser, DataCondition condition) { diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/DeptTreeDataPermissionChecker.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/DeptTreeDataPermissionChecker.java index 35812f3..4f03541 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/DeptTreeDataPermissionChecker.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/DeptTreeDataPermissionChecker.java @@ -3,7 +3,7 @@ package com.agileboot.admin.customize.service.permission.model.checker; import com.agileboot.infrastructure.user.web.SystemLoginUser; import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker; import com.agileboot.admin.customize.service.permission.model.DataCondition; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptService; import java.util.Objects; import lombok.AllArgsConstructor; import lombok.Data; @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class DeptTreeDataPermissionChecker extends AbstractDataPermissionChecker { - private ISysDeptService deptService; + private SysDeptService deptService; @Override public boolean check(SystemLoginUser loginUser, DataCondition condition) { diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/OnlySelfDataPermissionChecker.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/OnlySelfDataPermissionChecker.java index 40eb9af..b1d5554 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/OnlySelfDataPermissionChecker.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/OnlySelfDataPermissionChecker.java @@ -3,7 +3,7 @@ package com.agileboot.admin.customize.service.permission.model.checker; import com.agileboot.infrastructure.user.web.SystemLoginUser; import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker; import com.agileboot.admin.customize.service.permission.model.DataCondition; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptService; import java.util.Objects; import lombok.AllArgsConstructor; import lombok.Data; @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class OnlySelfDataPermissionChecker extends AbstractDataPermissionChecker { - private ISysDeptService deptService; + private SysDeptService deptService; @Override public boolean check(SystemLoginUser loginUser, DataCondition condition) { diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/SingleDeptDataPermissionChecker.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/SingleDeptDataPermissionChecker.java index 01ca60b..0692db7 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/SingleDeptDataPermissionChecker.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/SingleDeptDataPermissionChecker.java @@ -3,7 +3,7 @@ package com.agileboot.admin.customize.service.permission.model.checker; import com.agileboot.infrastructure.user.web.SystemLoginUser; import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker; import com.agileboot.admin.customize.service.permission.model.DataCondition; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptService; import java.util.Objects; import lombok.AllArgsConstructor; import lombok.Data; @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class SingleDeptDataPermissionChecker extends AbstractDataPermissionChecker { - private ISysDeptService deptService; + private SysDeptService deptService; @Override public boolean check(SystemLoginUser loginUser, DataCondition condition) { diff --git a/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/CustomDataPermissionCheckerTest.java b/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/CustomDataPermissionCheckerTest.java index 79b1409..9b2dee0 100644 --- a/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/CustomDataPermissionCheckerTest.java +++ b/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/CustomDataPermissionCheckerTest.java @@ -9,14 +9,14 @@ import com.agileboot.admin.customize.service.permission.model.checker.CustomData import com.agileboot.infrastructure.user.web.SystemLoginUser; import com.agileboot.infrastructure.user.web.RoleInfo; import com.agileboot.admin.customize.service.permission.model.DataCondition; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptService; import org.apache.commons.collections4.SetUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; class CustomDataPermissionCheckerTest { - private final ISysDeptService deptService = mock(ISysDeptService.class); + private final SysDeptService deptService = mock(SysDeptService.class); public SystemLoginUser loginUser = mock(SystemLoginUser.class); @BeforeEach diff --git a/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/DeptTreeDataPermissionCheckerTest.java b/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/DeptTreeDataPermissionCheckerTest.java index 0a8715a..9e9885f 100644 --- a/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/DeptTreeDataPermissionCheckerTest.java +++ b/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/DeptTreeDataPermissionCheckerTest.java @@ -10,13 +10,13 @@ import com.agileboot.admin.customize.service.permission.model.checker.DeptTreeDa import com.agileboot.infrastructure.user.web.SystemLoginUser; import com.agileboot.infrastructure.user.web.RoleInfo; import com.agileboot.admin.customize.service.permission.model.DataCondition; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; class DeptTreeDataPermissionCheckerTest { - private final ISysDeptService deptService = mock(ISysDeptService.class); + private final SysDeptService deptService = mock(SysDeptService.class); public SystemLoginUser loginUser = mock(SystemLoginUser.class); diff --git a/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/OnlySelfDataPermissionCheckerTest.java b/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/OnlySelfDataPermissionCheckerTest.java index 9cd3350..94d3759 100644 --- a/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/OnlySelfDataPermissionCheckerTest.java +++ b/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/OnlySelfDataPermissionCheckerTest.java @@ -7,12 +7,12 @@ import static org.mockito.Mockito.mock; import com.agileboot.admin.customize.service.permission.model.checker.OnlySelfDataPermissionChecker; import com.agileboot.infrastructure.user.web.SystemLoginUser; import com.agileboot.admin.customize.service.permission.model.DataCondition; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptService; import org.junit.jupiter.api.Test; class OnlySelfDataPermissionCheckerTest { - private final ISysDeptService deptService = mock(ISysDeptService.class); + private final SysDeptService deptService = mock(SysDeptService.class); @Test void testCheckWhenParameterNull() { diff --git a/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/SingleDeptDataPermissionCheckerTest.java b/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/SingleDeptDataPermissionCheckerTest.java index 08effe9..03b03ce 100644 --- a/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/SingleDeptDataPermissionCheckerTest.java +++ b/agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/SingleDeptDataPermissionCheckerTest.java @@ -9,13 +9,13 @@ import com.agileboot.admin.customize.service.permission.model.checker.SingleDept import com.agileboot.infrastructure.user.web.SystemLoginUser; import com.agileboot.infrastructure.user.web.RoleInfo; import com.agileboot.admin.customize.service.permission.model.DataCondition; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; class SingleDeptDataPermissionCheckerTest { - private final ISysDeptService deptService = mock(ISysDeptService.class); + private final SysDeptService deptService = mock(SysDeptService.class); public SystemLoginUser loginUser = mock(SystemLoginUser.class); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/CacheCenter.java b/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/CacheCenter.java index a3839ed..f7ca98b 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/CacheCenter.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/CacheCenter.java @@ -4,10 +4,10 @@ import cn.hutool.extra.spring.SpringUtil; import com.agileboot.infrastructure.cache.guava.AbstractGuavaCacheTemplate; import com.agileboot.infrastructure.cache.redis.RedisCacheTemplate; import com.agileboot.infrastructure.user.web.SystemLoginUser; -import com.agileboot.orm.system.entity.SysDeptEntity; -import com.agileboot.orm.system.entity.SysPostEntity; -import com.agileboot.orm.system.entity.SysRoleEntity; -import com.agileboot.orm.system.entity.SysUserEntity; +import com.agileboot.domain.system.dept.db.SysDeptEntity; +import com.agileboot.domain.system.post.db.SysPostEntity; +import com.agileboot.domain.system.role.db.SysRoleEntity; +import com.agileboot.domain.system.user.db.SysUserEntity; import javax.annotation.PostConstruct; import org.springframework.stereotype.Component; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/GuavaCacheService.java b/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/GuavaCacheService.java index c4c0942..3c5764c 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/GuavaCacheService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/GuavaCacheService.java @@ -2,9 +2,9 @@ package com.agileboot.domain.common.cache; import com.agileboot.infrastructure.cache.guava.AbstractGuavaCacheTemplate; -import com.agileboot.orm.system.entity.SysDeptEntity; -import com.agileboot.orm.system.service.ISysConfigService; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptEntity; +import com.agileboot.domain.system.config.db.SysConfigService; +import com.agileboot.domain.system.dept.db.SysDeptService; import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -19,10 +19,10 @@ import org.springframework.stereotype.Component; public class GuavaCacheService { @NonNull - private ISysConfigService configService; + private SysConfigService configService; @NonNull - private ISysDeptService deptService; + private SysDeptService deptService; public final AbstractGuavaCacheTemplate configCache = new AbstractGuavaCacheTemplate() { @Override diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/RedisCacheService.java b/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/RedisCacheService.java index 5745354..4c3d75b 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/RedisCacheService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/RedisCacheService.java @@ -5,12 +5,12 @@ import com.agileboot.infrastructure.cache.RedisUtil; import com.agileboot.infrastructure.cache.redis.CacheKeyEnum; import com.agileboot.infrastructure.cache.redis.RedisCacheTemplate; import com.agileboot.infrastructure.user.web.SystemLoginUser; -import com.agileboot.orm.system.entity.SysPostEntity; -import com.agileboot.orm.system.entity.SysRoleEntity; -import com.agileboot.orm.system.entity.SysUserEntity; -import com.agileboot.orm.system.service.ISysPostService; -import com.agileboot.orm.system.service.ISysRoleService; -import com.agileboot.orm.system.service.ISysUserService; +import com.agileboot.domain.system.post.db.SysPostEntity; +import com.agileboot.domain.system.role.db.SysRoleEntity; +import com.agileboot.domain.system.user.db.SysUserEntity; +import com.agileboot.domain.system.post.db.SysPostService; +import com.agileboot.domain.system.role.db.SysRoleService; +import com.agileboot.domain.system.user.db.SysUserService; import java.io.Serializable; import javax.annotation.PostConstruct; import lombok.NonNull; @@ -46,7 +46,7 @@ public class RedisCacheService { userCache = new RedisCacheTemplate(redisUtil, CacheKeyEnum.USER_ENTITY_KEY) { @Override public SysUserEntity getObjectFromDb(Object id) { - ISysUserService userService = SpringUtil.getBean(ISysUserService.class); + SysUserService userService = SpringUtil.getBean(SysUserService.class); return userService.getById((Serializable) id); } }; @@ -54,7 +54,7 @@ public class RedisCacheService { roleCache = new RedisCacheTemplate(redisUtil, CacheKeyEnum.ROLE_ENTITY_KEY) { @Override public SysRoleEntity getObjectFromDb(Object id) { - ISysRoleService roleService = SpringUtil.getBean(ISysRoleService.class); + SysRoleService roleService = SpringUtil.getBean(SysRoleService.class); return roleService.getById((Serializable) id); } }; @@ -71,7 +71,7 @@ public class RedisCacheService { postCache = new RedisCacheTemplate(redisUtil, CacheKeyEnum.POST_ENTITY_KEY) { @Override public SysPostEntity getObjectFromDb(Object id) { - ISysPostService postService = SpringUtil.getBean(ISysPostService.class); + SysPostService postService = SpringUtil.getBean(SysPostService.class); return postService.getById((Serializable) id); } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigApplicationService.java index 378344a..025d310 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigApplicationService.java @@ -7,8 +7,8 @@ import com.agileboot.domain.system.config.dto.ConfigDTO; import com.agileboot.domain.system.config.model.ConfigModel; import com.agileboot.domain.system.config.model.ConfigModelFactory; import com.agileboot.domain.system.config.query.ConfigQuery; -import com.agileboot.orm.system.entity.SysConfigEntity; -import com.agileboot.orm.system.service.ISysConfigService; +import com.agileboot.domain.system.config.db.SysConfigEntity; +import com.agileboot.domain.system.config.db.SysConfigService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; import java.util.stream.Collectors; @@ -27,7 +27,7 @@ public class ConfigApplicationService { private ConfigModelFactory configModelFactory; @NonNull - private ISysConfigService configService; + private SysConfigService configService; public PageDTO getConfigList(ConfigQuery query) { Page page = configService.page(query.toPage(), query.toQueryWrapper()); diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysConfigEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigEntity.java similarity index 97% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysConfigEntity.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigEntity.java index 904bc30..e91dce1 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysConfigEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigEntity.java @@ -1,4 +1,4 @@ -package com.agileboot.orm.system.entity; +package com.agileboot.domain.system.config.db; import com.agileboot.common.core.base.BaseEntity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysConfigMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigMapper.java similarity index 70% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysConfigMapper.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigMapper.java index e1f42f7..5cadbc8 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysConfigMapper.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigMapper.java @@ -1,6 +1,5 @@ -package com.agileboot.orm.system.mapper; +package com.agileboot.domain.system.config.db; -import com.agileboot.orm.system.entity.SysConfigEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysConfigService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigService.java similarity index 65% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysConfigService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigService.java index 6188f53..39c5a85 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysConfigService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigService.java @@ -1,6 +1,5 @@ -package com.agileboot.orm.system.service; +package com.agileboot.domain.system.config.db; -import com.agileboot.orm.system.entity.SysConfigEntity; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -11,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * @author valarchie * @since 2022-06-09 */ -public interface ISysConfigService extends IService { +public interface SysConfigService extends IService { /** * 通过key获取配置 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysConfigServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigServiceImpl.java similarity index 78% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysConfigServiceImpl.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigServiceImpl.java index 227de02..7e56254 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysConfigServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigServiceImpl.java @@ -1,9 +1,6 @@ -package com.agileboot.orm.system.service.impl; +package com.agileboot.domain.system.config.db; import cn.hutool.core.util.StrUtil; -import com.agileboot.orm.system.entity.SysConfigEntity; -import com.agileboot.orm.system.mapper.SysConfigMapper; -import com.agileboot.orm.system.service.ISysConfigService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -18,7 +15,7 @@ import org.springframework.stereotype.Service; */ @Service public class SysConfigServiceImpl extends ServiceImpl implements - ISysConfigService { + SysConfigService { @Override public String getConfigValueByKey(String key) { diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/dto/ConfigDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/dto/ConfigDTO.java index c1fca8b..6be4a1c 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/dto/ConfigDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/dto/ConfigDTO.java @@ -5,7 +5,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.json.JSONUtil; import com.agileboot.common.enums.common.YesOrNoEnum; import com.agileboot.common.enums.BasicEnumUtil; -import com.agileboot.orm.system.entity.SysConfigEntity; +import com.agileboot.domain.system.config.db.SysConfigEntity; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Date; import java.util.List; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModel.java index c32e0f4..f013c70 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModel.java @@ -7,8 +7,8 @@ import cn.hutool.json.JSONUtil; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; import com.agileboot.domain.system.config.command.ConfigUpdateCommand; -import com.agileboot.orm.system.entity.SysConfigEntity; -import com.agileboot.orm.system.service.ISysConfigService; +import com.agileboot.domain.system.config.db.SysConfigEntity; +import com.agileboot.domain.system.config.db.SysConfigService; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -22,15 +22,15 @@ import lombok.EqualsAndHashCode; @Data public class ConfigModel extends SysConfigEntity { - private ISysConfigService configService; + private SysConfigService configService; private Set configOptionSet; - public ConfigModel(ISysConfigService configService) { + public ConfigModel(SysConfigService configService) { this.configService = configService; } - public ConfigModel(SysConfigEntity entity, ISysConfigService configService) { + public ConfigModel(SysConfigEntity entity, SysConfigService configService) { BeanUtil.copyProperties(entity, this); List options = diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModelFactory.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModelFactory.java index d91f0f7..24d4608 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModelFactory.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModelFactory.java @@ -2,8 +2,8 @@ package com.agileboot.domain.system.config.model; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; -import com.agileboot.orm.system.entity.SysConfigEntity; -import com.agileboot.orm.system.service.ISysConfigService; +import com.agileboot.domain.system.config.db.SysConfigEntity; +import com.agileboot.domain.system.config.db.SysConfigService; import lombok.NonNull; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -17,7 +17,7 @@ import org.springframework.stereotype.Component; public class ConfigModelFactory { @NonNull - private ISysConfigService configService; + private SysConfigService configService; public ConfigModel loadById(Long configId) { SysConfigEntity byId = configService.getById(configId); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/query/ConfigQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/query/ConfigQuery.java index b69ed1e..1ab9e33 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/query/ConfigQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/query/ConfigQuery.java @@ -2,7 +2,7 @@ package com.agileboot.domain.system.config.query; import cn.hutool.core.util.StrUtil; import com.agileboot.common.core.page.AbstractPageQuery; -import com.agileboot.orm.system.entity.SysConfigEntity; +import com.agileboot.domain.system.config.db.SysConfigEntity; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptApplicationService.java index 210d043..cf992d1 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptApplicationService.java @@ -8,9 +8,9 @@ import com.agileboot.domain.system.dept.dto.DeptDTO; import com.agileboot.domain.system.dept.model.DeptModel; import com.agileboot.domain.system.dept.model.DeptModelFactory; import com.agileboot.domain.system.dept.query.DeptQuery; -import com.agileboot.orm.system.entity.SysDeptEntity; -import com.agileboot.orm.system.service.ISysDeptService; -import com.agileboot.orm.system.service.ISysRoleService; +import com.agileboot.domain.system.dept.db.SysDeptEntity; +import com.agileboot.domain.system.dept.db.SysDeptService; +import com.agileboot.domain.system.role.db.SysRoleService; import java.util.List; import java.util.stream.Collectors; import lombok.NonNull; @@ -26,10 +26,10 @@ import org.springframework.stereotype.Service; public class DeptApplicationService { @NonNull - private ISysDeptService deptService; + private SysDeptService deptService; @NonNull - private ISysRoleService roleService; + private SysRoleService roleService; @NonNull private DeptModelFactory deptModelFactory; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysDeptEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptEntity.java similarity index 97% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysDeptEntity.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptEntity.java index 90b3645..e3e75df 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysDeptEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptEntity.java @@ -1,4 +1,4 @@ -package com.agileboot.orm.system.entity; +package com.agileboot.domain.system.dept.db; import com.agileboot.common.core.base.BaseEntity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysDeptMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptMapper.java similarity index 70% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysDeptMapper.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptMapper.java index d0866ba..d6b35c5 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysDeptMapper.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptMapper.java @@ -1,6 +1,5 @@ -package com.agileboot.orm.system.mapper; +package com.agileboot.domain.system.dept.db; -import com.agileboot.orm.system.entity.SysDeptEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysDeptService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptService.java similarity index 86% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysDeptService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptService.java index 27d7b62..8be89d0 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysDeptService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptService.java @@ -1,6 +1,5 @@ -package com.agileboot.orm.system.service; +package com.agileboot.domain.system.dept.db; -import com.agileboot.orm.system.entity.SysDeptEntity; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -11,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * @author valarchie * @since 2022-06-16 */ -public interface ISysDeptService extends IService { +public interface SysDeptService extends IService { /** diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysDeptServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptServiceImpl.java similarity index 83% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysDeptServiceImpl.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptServiceImpl.java index db5d246..0ae8ff6 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysDeptServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptServiceImpl.java @@ -1,10 +1,7 @@ -package com.agileboot.orm.system.service.impl; +package com.agileboot.domain.system.dept.db; -import com.agileboot.orm.system.entity.SysDeptEntity; -import com.agileboot.orm.system.entity.SysUserEntity; -import com.agileboot.orm.system.mapper.SysDeptMapper; -import com.agileboot.orm.system.mapper.SysUserMapper; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.user.db.SysUserEntity; +import com.agileboot.domain.system.user.db.SysUserMapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.NonNull; @@ -21,7 +18,7 @@ import org.springframework.stereotype.Service; */ @Service @RequiredArgsConstructor -public class SysDeptServiceImpl extends ServiceImpl implements ISysDeptService { +public class SysDeptServiceImpl extends ServiceImpl implements SysDeptService { @NonNull private SysUserMapper userMapper; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/dto/DeptDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/dto/DeptDTO.java index 52b6329..fd78f43 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/dto/DeptDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/dto/DeptDTO.java @@ -2,7 +2,7 @@ package com.agileboot.domain.system.dept.dto; import com.agileboot.common.enums.common.StatusEnum; import com.agileboot.common.enums.BasicEnumUtil; -import com.agileboot.orm.system.entity.SysDeptEntity; +import com.agileboot.domain.system.dept.db.SysDeptEntity; import java.util.Date; import lombok.Data; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModel.java index ab275d1..272cb42 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModel.java @@ -8,8 +8,8 @@ import com.agileboot.domain.system.dept.command.AddDeptCommand; import com.agileboot.domain.system.dept.command.UpdateDeptCommand; import com.agileboot.common.enums.common.StatusEnum; import com.agileboot.common.enums.BasicEnumUtil; -import com.agileboot.orm.system.entity.SysDeptEntity; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptEntity; +import com.agileboot.domain.system.dept.db.SysDeptService; import java.util.Objects; /** @@ -17,13 +17,13 @@ import java.util.Objects; */ public class DeptModel extends SysDeptEntity { - private final ISysDeptService deptService; + private final SysDeptService deptService; - public DeptModel(ISysDeptService deptService) { + public DeptModel(SysDeptService deptService) { this.deptService = deptService; } - public DeptModel(SysDeptEntity entity, ISysDeptService deptService) { + public DeptModel(SysDeptEntity entity, SysDeptService deptService) { if (entity != null) { // 如果大数据量的话 可以用MapStruct优化 BeanUtil.copyProperties(entity, this); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModelFactory.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModelFactory.java index c54772d..64d2d71 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModelFactory.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModelFactory.java @@ -3,8 +3,8 @@ package com.agileboot.domain.system.dept.model; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; import com.agileboot.domain.system.dept.command.AddDeptCommand; -import com.agileboot.orm.system.entity.SysDeptEntity; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptEntity; +import com.agileboot.domain.system.dept.db.SysDeptService; import lombok.NonNull; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -18,7 +18,7 @@ import org.springframework.stereotype.Component; public class DeptModelFactory { @NonNull - private ISysDeptService deptService; + private SysDeptService deptService; public DeptModel loadById(Long deptId) { SysDeptEntity byId = deptService.getById(deptId); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/query/DeptQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/query/DeptQuery.java index 67d14bb..eff5a9f 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/query/DeptQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/query/DeptQuery.java @@ -1,7 +1,7 @@ package com.agileboot.domain.system.dept.query; import com.agileboot.common.core.page.AbstractQuery; -import com.agileboot.orm.system.entity.SysDeptEntity; +import com.agileboot.domain.system.dept.db.SysDeptEntity; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/log/LogApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/LogApplicationService.java index c0b4fc4..d55579f 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/log/LogApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/LogApplicationService.java @@ -6,10 +6,10 @@ import com.agileboot.domain.system.log.dto.LoginLogDTO; import com.agileboot.domain.system.log.query.LoginLogQuery; import com.agileboot.domain.system.log.dto.OperationLogDTO; import com.agileboot.domain.system.log.dto.OperationLogQuery; -import com.agileboot.orm.system.entity.SysLoginInfoEntity; -import com.agileboot.orm.system.entity.SysOperationLogEntity; -import com.agileboot.orm.system.service.ISysLoginInfoService; -import com.agileboot.orm.system.service.ISysOperationLogService; +import com.agileboot.domain.system.log.db.SysLoginInfoEntity; +import com.agileboot.domain.system.log.db.SysOperationLogEntity; +import com.agileboot.domain.system.log.db.SysLoginInfoService; +import com.agileboot.domain.system.log.db.SysOperationLogService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -27,10 +27,10 @@ public class LogApplicationService { // TODO 命名到时候统一改成叫LoginLog @NonNull - private ISysLoginInfoService loginInfoService; + private SysLoginInfoService loginInfoService; @NonNull - private ISysOperationLogService operationLogService; + private SysOperationLogService operationLogService; public PageDTO getLoginInfoList(LoginLogQuery query) { Page page = loginInfoService.page(query.toPage(), query.toQueryWrapper()); diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysLoginInfoEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoEntity.java similarity index 97% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysLoginInfoEntity.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoEntity.java index e00527a..39e1af8 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysLoginInfoEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoEntity.java @@ -1,4 +1,4 @@ -package com.agileboot.orm.system.entity; +package com.agileboot.domain.system.log.db; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysLoginInfoMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoMapper.java similarity index 70% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysLoginInfoMapper.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoMapper.java index e826226..2d95a60 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysLoginInfoMapper.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoMapper.java @@ -1,6 +1,5 @@ -package com.agileboot.orm.system.mapper; +package com.agileboot.domain.system.log.db; -import com.agileboot.orm.system.entity.SysLoginInfoEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoService.java new file mode 100644 index 0000000..16be0d7 --- /dev/null +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoService.java @@ -0,0 +1,15 @@ +package com.agileboot.domain.system.log.db; + +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 系统访问记录 服务类 + *

+ * + * @author valarchie + * @since 2022-06-06 + */ +public interface SysLoginInfoService extends IService { + +} diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysLoginInfoServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoServiceImpl.java similarity index 57% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysLoginInfoServiceImpl.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoServiceImpl.java index d5edaa1..def48ed 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysLoginInfoServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoServiceImpl.java @@ -1,8 +1,5 @@ -package com.agileboot.orm.system.service.impl; +package com.agileboot.domain.system.log.db; -import com.agileboot.orm.system.entity.SysLoginInfoEntity; -import com.agileboot.orm.system.mapper.SysLoginInfoMapper; -import com.agileboot.orm.system.service.ISysLoginInfoService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -16,6 +13,6 @@ import org.springframework.stereotype.Service; */ @Service public class SysLoginInfoServiceImpl extends ServiceImpl implements - ISysLoginInfoService { + SysLoginInfoService { } diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysOperationLogEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogEntity.java similarity index 98% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysOperationLogEntity.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogEntity.java index 627c4b2..a099ed5 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysOperationLogEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogEntity.java @@ -1,4 +1,4 @@ -package com.agileboot.orm.system.entity; +package com.agileboot.domain.system.log.db; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysOperationLogMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogMapper.java similarity index 70% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysOperationLogMapper.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogMapper.java index ac5e0ee..a3afe08 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysOperationLogMapper.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogMapper.java @@ -1,6 +1,5 @@ -package com.agileboot.orm.system.mapper; +package com.agileboot.domain.system.log.db; -import com.agileboot.orm.system.entity.SysOperationLogEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogService.java new file mode 100644 index 0000000..e70ccfd --- /dev/null +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogService.java @@ -0,0 +1,15 @@ +package com.agileboot.domain.system.log.db; + +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 操作日志记录 服务类 + *

+ * + * @author valarchie + * @since 2022-06-08 + */ +public interface SysOperationLogService extends IService { + +} diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysOperationLogServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogServiceImpl.java similarity index 56% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysOperationLogServiceImpl.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogServiceImpl.java index 00c3e61..1b0aa8d 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysOperationLogServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogServiceImpl.java @@ -1,8 +1,5 @@ -package com.agileboot.orm.system.service.impl; +package com.agileboot.domain.system.log.db; -import com.agileboot.orm.system.entity.SysOperationLogEntity; -import com.agileboot.orm.system.mapper.SysOperationLogMapper; -import com.agileboot.orm.system.service.ISysOperationLogService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -16,6 +13,6 @@ import org.springframework.stereotype.Service; */ @Service public class SysOperationLogServiceImpl extends ServiceImpl implements - ISysOperationLogService { + SysOperationLogService { } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/log/dto/LoginLogDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/dto/LoginLogDTO.java index 3b8e29e..7113b85 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/log/dto/LoginLogDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/dto/LoginLogDTO.java @@ -4,7 +4,7 @@ import com.agileboot.common.annotation.ExcelColumn; import com.agileboot.common.annotation.ExcelSheet; import com.agileboot.common.enums.common.LoginStatusEnum; import com.agileboot.common.enums.BasicEnumUtil; -import com.agileboot.orm.system.entity.SysLoginInfoEntity; +import com.agileboot.domain.system.log.db.SysLoginInfoEntity; import java.util.Date; import lombok.Data; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/log/dto/OperationLogDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/dto/OperationLogDTO.java index 8fa4e6e..1af9e62 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/log/dto/OperationLogDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/dto/OperationLogDTO.java @@ -8,7 +8,7 @@ import com.agileboot.common.enums.common.OperationStatusEnum; import com.agileboot.common.enums.common.OperatorTypeEnum; import com.agileboot.common.enums.common.RequestMethodEnum; import com.agileboot.common.enums.BasicEnumUtil; -import com.agileboot.orm.system.entity.SysOperationLogEntity; +import com.agileboot.domain.system.log.db.SysOperationLogEntity; import java.util.Date; import lombok.Data; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/log/dto/OperationLogQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/dto/OperationLogQuery.java index 9d19a84..621416c 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/log/dto/OperationLogQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/dto/OperationLogQuery.java @@ -2,7 +2,7 @@ package com.agileboot.domain.system.log.dto; import cn.hutool.core.util.StrUtil; import com.agileboot.common.core.page.AbstractPageQuery; -import com.agileboot.orm.system.entity.SysOperationLogEntity; +import com.agileboot.domain.system.log.db.SysOperationLogEntity; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/log/query/LoginLogQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/query/LoginLogQuery.java index 82c4768..efce5ca 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/log/query/LoginLogQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/query/LoginLogQuery.java @@ -2,7 +2,7 @@ package com.agileboot.domain.system.log.query; import cn.hutool.core.util.StrUtil; import com.agileboot.common.core.page.AbstractPageQuery; -import com.agileboot.orm.system.entity.SysLoginInfoEntity; +import com.agileboot.domain.system.log.db.SysLoginInfoEntity; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuApplicationService.java index 5fd1902..d020558 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuApplicationService.java @@ -14,8 +14,8 @@ import com.agileboot.domain.system.menu.model.MenuModelFactory; import com.agileboot.domain.system.menu.query.MenuQuery; import com.agileboot.infrastructure.user.web.SystemLoginUser; import com.agileboot.common.enums.common.StatusEnum; -import com.agileboot.orm.system.entity.SysMenuEntity; -import com.agileboot.orm.system.service.ISysMenuService; +import com.agileboot.domain.system.menu.db.SysMenuEntity; +import com.agileboot.domain.system.menu.db.SysMenuService; import java.util.Comparator; import java.util.LinkedList; import java.util.List; @@ -33,7 +33,7 @@ import org.springframework.stereotype.Service; public class MenuApplicationService { @NonNull - private ISysMenuService menuService; + private SysMenuService menuService; @NonNull private MenuModelFactory menuModelFactory; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysMenuEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuEntity.java similarity index 97% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysMenuEntity.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuEntity.java index 0691526..a79f8da 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysMenuEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuEntity.java @@ -1,4 +1,4 @@ -package com.agileboot.orm.system.entity; +package com.agileboot.domain.system.menu.db; import com.agileboot.common.core.base.BaseEntity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysMenuMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuMapper.java similarity index 93% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysMenuMapper.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuMapper.java index fa0c253..8f40aea 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysMenuMapper.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuMapper.java @@ -1,6 +1,5 @@ -package com.agileboot.orm.system.mapper; +package com.agileboot.domain.system.menu.db; -import com.agileboot.orm.system.entity.SysMenuEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysMenuService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuService.java similarity index 87% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysMenuService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuService.java index 248d79c..e94e8cd 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysMenuService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuService.java @@ -1,6 +1,5 @@ -package com.agileboot.orm.system.service; +package com.agileboot.domain.system.menu.db; -import com.agileboot.orm.system.entity.SysMenuEntity; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -13,7 +12,7 @@ import java.util.List; * @author valarchie * @since 2022-06-16 */ -public interface ISysMenuService extends IService { +public interface SysMenuService extends IService { /** * 根据用户查询系统菜单列表 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysMenuServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuServiceImpl.java similarity index 83% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysMenuServiceImpl.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuServiceImpl.java index 473e0d2..57ec0b7 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysMenuServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuServiceImpl.java @@ -1,10 +1,7 @@ -package com.agileboot.orm.system.service.impl; +package com.agileboot.domain.system.menu.db; -import com.agileboot.orm.system.entity.SysMenuEntity; -import com.agileboot.orm.system.entity.SysRoleMenuEntity; -import com.agileboot.orm.system.mapper.SysMenuMapper; -import com.agileboot.orm.system.mapper.SysRoleMenuMapper; -import com.agileboot.orm.system.service.ISysMenuService; +import com.agileboot.domain.system.role.db.SysRoleMenuEntity; +import com.agileboot.domain.system.role.db.SysRoleMenuMapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.List; @@ -22,7 +19,7 @@ import org.springframework.stereotype.Service; */ @Service @RequiredArgsConstructor -public class SysMenuServiceImpl extends ServiceImpl implements ISysMenuService { +public class SysMenuServiceImpl extends ServiceImpl implements SysMenuService { @NonNull private SysRoleMenuMapper roleMenuMapper; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDTO.java index f663fd6..9235c3e 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDTO.java @@ -5,7 +5,7 @@ import com.agileboot.common.utils.jackson.JacksonUtil; import com.agileboot.common.enums.common.MenuTypeEnum; import com.agileboot.common.enums.common.StatusEnum; import com.agileboot.common.enums.BasicEnumUtil; -import com.agileboot.orm.system.entity.SysMenuEntity; +import com.agileboot.domain.system.menu.db.SysMenuEntity; import java.util.Date; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDetailDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDetailDTO.java index d6ed015..5f1ece9 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDetailDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDetailDTO.java @@ -2,7 +2,7 @@ package com.agileboot.domain.system.menu.dto; import cn.hutool.core.util.StrUtil; import com.agileboot.common.utils.jackson.JacksonUtil; -import com.agileboot.orm.system.entity.SysMenuEntity; +import com.agileboot.domain.system.menu.db.SysMenuEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/RouterDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/RouterDTO.java index d89b08e..7ad36cf 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/RouterDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/RouterDTO.java @@ -1,7 +1,7 @@ package com.agileboot.domain.system.menu.dto; import com.agileboot.common.utils.jackson.JacksonUtil; -import com.agileboot.orm.system.entity.SysMenuEntity; +import com.agileboot.domain.system.menu.db.SysMenuEntity; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.google.common.collect.Lists; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModel.java index 725c307..f94d99d 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModel.java @@ -8,8 +8,8 @@ import com.agileboot.common.utils.jackson.JacksonUtil; import com.agileboot.domain.system.menu.command.AddMenuCommand; import com.agileboot.domain.system.menu.command.UpdateMenuCommand; import com.agileboot.common.enums.common.MenuTypeEnum; -import com.agileboot.orm.system.entity.SysMenuEntity; -import com.agileboot.orm.system.service.ISysMenuService; +import com.agileboot.domain.system.menu.db.SysMenuEntity; +import com.agileboot.domain.system.menu.db.SysMenuService; import java.util.Objects; import lombok.NoArgsConstructor; @@ -19,13 +19,13 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class MenuModel extends SysMenuEntity { - private ISysMenuService menuService; + private SysMenuService menuService; - public MenuModel(ISysMenuService menuService) { + public MenuModel(SysMenuService menuService) { this.menuService = menuService; } - public MenuModel(SysMenuEntity entity, ISysMenuService menuService) { + public MenuModel(SysMenuEntity entity, SysMenuService menuService) { if (entity != null) { BeanUtil.copyProperties(entity, this); } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModelFactory.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModelFactory.java index 42a7cba..160ee0d 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModelFactory.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModelFactory.java @@ -2,8 +2,8 @@ package com.agileboot.domain.system.menu.model; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; -import com.agileboot.orm.system.entity.SysMenuEntity; -import com.agileboot.orm.system.service.ISysMenuService; +import com.agileboot.domain.system.menu.db.SysMenuEntity; +import com.agileboot.domain.system.menu.db.SysMenuService; import lombok.NonNull; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -17,7 +17,7 @@ import org.springframework.stereotype.Component; public class MenuModelFactory { @NonNull - private ISysMenuService menuService; + private SysMenuService menuService; public MenuModel loadById(Long menuId) { SysMenuEntity byId = menuService.getById(menuId); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/RouterModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/RouterModel.java index e55e928..6f6c6df 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/RouterModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/RouterModel.java @@ -1,6 +1,6 @@ package com.agileboot.domain.system.menu.model; -import com.agileboot.orm.system.entity.SysMenuEntity; +import com.agileboot.domain.system.menu.db.SysMenuEntity; /** * @author valarchie diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/query/MenuQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/query/MenuQuery.java index f3fecec..bc3c9a4 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/query/MenuQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/query/MenuQuery.java @@ -1,7 +1,7 @@ package com.agileboot.domain.system.menu.query; import com.agileboot.common.core.page.AbstractQuery; -import com.agileboot.orm.system.entity.SysMenuEntity; +import com.agileboot.domain.system.menu.db.SysMenuEntity; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/OnlineUserDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/OnlineUserDTO.java index f6dece0..5f6d03d 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/OnlineUserDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/OnlineUserDTO.java @@ -2,7 +2,7 @@ package com.agileboot.domain.system.monitor.dto; import com.agileboot.domain.common.cache.CacheCenter; import com.agileboot.infrastructure.user.web.SystemLoginUser; -import com.agileboot.orm.system.entity.SysDeptEntity; +import com.agileboot.domain.system.dept.db.SysDeptEntity; import lombok.Data; /** diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeApplicationService.java index 35c7d7f..1a5e3e7 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeApplicationService.java @@ -1,8 +1,6 @@ package com.agileboot.domain.system.notice; import com.agileboot.common.core.page.PageDTO; -import com.agileboot.common.exception.ApiException; -import com.agileboot.common.exception.error.ErrorCode.Client; import com.agileboot.domain.common.command.BulkOperationCommand; import com.agileboot.domain.system.notice.command.NoticeAddCommand; import com.agileboot.domain.system.notice.command.NoticeUpdateCommand; @@ -10,8 +8,8 @@ import com.agileboot.domain.system.notice.dto.NoticeDTO; import com.agileboot.domain.system.notice.model.NoticeModel; import com.agileboot.domain.system.notice.model.NoticeModelFactory; import com.agileboot.domain.system.notice.query.NoticeQuery; -import com.agileboot.orm.system.entity.SysNoticeEntity; -import com.agileboot.orm.system.service.ISysNoticeService; +import com.agileboot.domain.system.notice.db.SysNoticeEntity; +import com.agileboot.domain.system.notice.db.SysNoticeService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; import java.util.stream.Collectors; @@ -27,7 +25,7 @@ import org.springframework.stereotype.Service; public class NoticeApplicationService { @NonNull - private ISysNoticeService noticeService; + private SysNoticeService noticeService; @NonNull private NoticeModelFactory noticeModelFactory; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysNoticeEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeEntity.java similarity index 96% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysNoticeEntity.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeEntity.java index 300a72c..5933b7d 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysNoticeEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeEntity.java @@ -1,4 +1,4 @@ -package com.agileboot.orm.system.entity; +package com.agileboot.domain.system.notice.db; import com.agileboot.common.core.base.BaseEntity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysNoticeMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeMapper.java similarity index 91% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysNoticeMapper.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeMapper.java index 0cf6b70..ebadaff 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysNoticeMapper.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeMapper.java @@ -1,6 +1,5 @@ -package com.agileboot.orm.system.mapper; +package com.agileboot.domain.system.notice.db; -import com.agileboot.orm.system.entity.SysNoticeEntity; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysNoticeService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeService.java similarity index 80% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysNoticeService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeService.java index 01a46f7..a6555e3 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysNoticeService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeService.java @@ -1,6 +1,5 @@ -package com.agileboot.orm.system.service; +package com.agileboot.domain.system.notice.db; -import com.agileboot.orm.system.entity.SysNoticeEntity; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +14,7 @@ import org.apache.ibatis.annotations.Param; * @author valarchie * @since 2022-06-16 */ -public interface ISysNoticeService extends IService { +public interface SysNoticeService extends IService { /** * 获取公告列表 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysNoticeServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeServiceImpl.java similarity index 69% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysNoticeServiceImpl.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeServiceImpl.java index de808bb..5662989 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysNoticeServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeServiceImpl.java @@ -1,8 +1,5 @@ -package com.agileboot.orm.system.service.impl; +package com.agileboot.domain.system.notice.db; -import com.agileboot.orm.system.entity.SysNoticeEntity; -import com.agileboot.orm.system.mapper.SysNoticeMapper; -import com.agileboot.orm.system.service.ISysNoticeService; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -17,7 +14,7 @@ import org.springframework.stereotype.Service; * @since 2022-06-16 */ @Service -public class SysNoticeServiceImpl extends ServiceImpl implements ISysNoticeService { +public class SysNoticeServiceImpl extends ServiceImpl implements SysNoticeService { @Override public Page getNoticeList(Page page, Wrapper queryWrapper) { diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/dto/NoticeDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/dto/NoticeDTO.java index cf0b6de..8a693a6 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/dto/NoticeDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/dto/NoticeDTO.java @@ -1,8 +1,8 @@ package com.agileboot.domain.system.notice.dto; import com.agileboot.domain.common.cache.CacheCenter; -import com.agileboot.orm.system.entity.SysNoticeEntity; -import com.agileboot.orm.system.entity.SysUserEntity; +import com.agileboot.domain.system.notice.db.SysNoticeEntity; +import com.agileboot.domain.system.user.db.SysUserEntity; import java.util.Date; import lombok.Data; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModel.java index c5a354e..7f3f288 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModel.java @@ -6,7 +6,7 @@ import com.agileboot.domain.system.notice.command.NoticeUpdateCommand; import com.agileboot.common.enums.common.NoticeTypeEnum; import com.agileboot.common.enums.common.StatusEnum; import com.agileboot.common.enums.BasicEnumUtil; -import com.agileboot.orm.system.entity.SysNoticeEntity; +import com.agileboot.domain.system.notice.db.SysNoticeEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModelFactory.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModelFactory.java index 09827e1..b7cf838 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModelFactory.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModelFactory.java @@ -2,8 +2,8 @@ package com.agileboot.domain.system.notice.model; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; -import com.agileboot.orm.system.entity.SysNoticeEntity; -import com.agileboot.orm.system.service.ISysNoticeService; +import com.agileboot.domain.system.notice.db.SysNoticeEntity; +import com.agileboot.domain.system.notice.db.SysNoticeService; import lombok.NonNull; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -17,7 +17,7 @@ import org.springframework.stereotype.Component; public class NoticeModelFactory { @NonNull - private ISysNoticeService noticeService; + private SysNoticeService noticeService; public NoticeModel loadById(Long noticeId) { SysNoticeEntity byId = noticeService.getById(noticeId); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/query/NoticeQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/query/NoticeQuery.java index 5c2d973..08a3f55 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/query/NoticeQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/query/NoticeQuery.java @@ -2,7 +2,7 @@ package com.agileboot.domain.system.notice.query; import cn.hutool.core.util.StrUtil; import com.agileboot.common.core.page.AbstractPageQuery; -import com.agileboot.orm.system.entity.SysNoticeEntity; +import com.agileboot.domain.system.notice.db.SysNoticeEntity; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java index 3df681d..e9f42c8 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java @@ -8,8 +8,8 @@ import com.agileboot.domain.system.post.dto.PostDTO; import com.agileboot.domain.system.post.model.PostModel; import com.agileboot.domain.system.post.model.PostModelFactory; import com.agileboot.domain.system.post.query.PostQuery; -import com.agileboot.orm.system.entity.SysPostEntity; -import com.agileboot.orm.system.service.ISysPostService; +import com.agileboot.domain.system.post.db.SysPostEntity; +import com.agileboot.domain.system.post.db.SysPostService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; import java.util.stream.Collectors; @@ -28,7 +28,7 @@ public class PostApplicationService { private PostModelFactory postModelFactory; @NonNull - private ISysPostService postService; + private SysPostService postService; public PageDTO getPostList(PostQuery query) { Page page = postService.page(query.toPage(), query.toQueryWrapper()); diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysPostEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostEntity.java similarity index 96% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysPostEntity.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostEntity.java index 0619c85..4d62c8b 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysPostEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostEntity.java @@ -1,4 +1,4 @@ -package com.agileboot.orm.system.entity; +package com.agileboot.domain.system.post.db; import com.agileboot.common.core.base.BaseEntity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysPostMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostMapper.java similarity index 70% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysPostMapper.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostMapper.java index 83b2e4a..a6fd482 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysPostMapper.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostMapper.java @@ -1,6 +1,5 @@ -package com.agileboot.orm.system.mapper; +package com.agileboot.domain.system.post.db; -import com.agileboot.orm.system.entity.SysPostEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysPostService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostService.java similarity index 81% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysPostService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostService.java index 3d76749..264fb8f 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysPostService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostService.java @@ -1,6 +1,5 @@ -package com.agileboot.orm.system.service; +package com.agileboot.domain.system.post.db; -import com.agileboot.orm.system.entity.SysPostEntity; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -11,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * @author valarchie * @since 2022-06-16 */ -public interface ISysPostService extends IService { +public interface SysPostService extends IService { /** * 校验岗位名称 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysPostServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostServiceImpl.java similarity index 80% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysPostServiceImpl.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostServiceImpl.java index e229cc5..758f552 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysPostServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostServiceImpl.java @@ -1,10 +1,7 @@ -package com.agileboot.orm.system.service.impl; +package com.agileboot.domain.system.post.db; -import com.agileboot.orm.system.entity.SysPostEntity; -import com.agileboot.orm.system.entity.SysUserEntity; -import com.agileboot.orm.system.mapper.SysPostMapper; -import com.agileboot.orm.system.mapper.SysUserMapper; -import com.agileboot.orm.system.service.ISysPostService; +import com.agileboot.domain.system.user.db.SysUserEntity; +import com.agileboot.domain.system.user.db.SysUserMapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.NonNull; @@ -21,7 +18,7 @@ import org.springframework.stereotype.Service; */ @Service @RequiredArgsConstructor -public class SysPostServiceImpl extends ServiceImpl implements ISysPostService { +public class SysPostServiceImpl extends ServiceImpl implements SysPostService { @NonNull private SysUserMapper userMapper; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/dto/PostDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/dto/PostDTO.java index 1f77823..da32e3e 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/dto/PostDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/dto/PostDTO.java @@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.agileboot.common.annotation.ExcelColumn; import com.agileboot.common.enums.common.StatusEnum; import com.agileboot.common.enums.BasicEnumUtil; -import com.agileboot.orm.system.entity.SysPostEntity; +import com.agileboot.domain.system.post.db.SysPostEntity; import java.util.Date; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModel.java index 6369d7d..a69b4fd 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModel.java @@ -5,8 +5,8 @@ import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; import com.agileboot.domain.system.post.command.AddPostCommand; import com.agileboot.domain.system.post.command.UpdatePostCommand; -import com.agileboot.orm.system.entity.SysPostEntity; -import com.agileboot.orm.system.service.ISysPostService; +import com.agileboot.domain.system.post.db.SysPostEntity; +import com.agileboot.domain.system.post.db.SysPostService; import lombok.NoArgsConstructor; /** @@ -15,13 +15,13 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class PostModel extends SysPostEntity { - private ISysPostService postService; + private SysPostService postService; - public PostModel(ISysPostService postService) { + public PostModel(SysPostService postService) { this.postService = postService; } - public PostModel(SysPostEntity entity, ISysPostService postService) { + public PostModel(SysPostEntity entity, SysPostService postService) { if (entity != null) { BeanUtil.copyProperties(entity, this); } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModelFactory.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModelFactory.java index f2d9c71..e98b717 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModelFactory.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModelFactory.java @@ -2,8 +2,8 @@ package com.agileboot.domain.system.post.model; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode.Business; -import com.agileboot.orm.system.entity.SysPostEntity; -import com.agileboot.orm.system.service.ISysPostService; +import com.agileboot.domain.system.post.db.SysPostEntity; +import com.agileboot.domain.system.post.db.SysPostService; import lombok.NonNull; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; public class PostModelFactory { @NonNull - private ISysPostService postService; + private SysPostService postService; public PostModel loadById(Long postId) { SysPostEntity byId = postService.getById(postId); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/query/PostQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/query/PostQuery.java index aeb9a58..28910fa 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/query/PostQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/query/PostQuery.java @@ -2,7 +2,7 @@ package com.agileboot.domain.system.post.query; import cn.hutool.core.util.StrUtil; import com.agileboot.common.core.page.AbstractPageQuery; -import com.agileboot.orm.system.entity.SysPostEntity; +import com.agileboot.domain.system.post.db.SysPostEntity; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java index 41e0fd1..7d84fc9 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java @@ -17,11 +17,11 @@ import com.agileboot.domain.system.role.query.UnallocatedRoleQuery; import com.agileboot.domain.system.user.dto.UserDTO; import com.agileboot.domain.system.user.model.UserModel; import com.agileboot.domain.system.user.model.UserModelFactory; -import com.agileboot.orm.system.entity.SysRoleEntity; -import com.agileboot.orm.system.entity.SysUserEntity; -import com.agileboot.orm.system.service.ISysMenuService; -import com.agileboot.orm.system.service.ISysRoleService; -import com.agileboot.orm.system.service.ISysUserService; +import com.agileboot.domain.system.role.db.SysRoleEntity; +import com.agileboot.domain.system.user.db.SysUserEntity; +import com.agileboot.domain.system.menu.db.SysMenuService; +import com.agileboot.domain.system.role.db.SysRoleService; +import com.agileboot.domain.system.user.db.SysUserService; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -44,13 +44,13 @@ public class RoleApplicationService { private UserModelFactory userModelFactory; @NonNull - private ISysRoleService roleService; + private SysRoleService roleService; @NonNull - private ISysUserService userService; + private SysUserService userService; @NonNull - private ISysMenuService menuService; + private SysMenuService menuService; public PageDTO getRoleList(RoleQuery query) { diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysRoleEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleEntity.java similarity index 97% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysRoleEntity.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleEntity.java index fdfc54a..bf035df 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysRoleEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleEntity.java @@ -1,4 +1,4 @@ -package com.agileboot.orm.system.entity; +package com.agileboot.domain.system.role.db; import com.agileboot.common.core.base.BaseEntity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysRoleMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMapper.java similarity index 84% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysRoleMapper.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMapper.java index 215c8f7..e4dbe83 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysRoleMapper.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMapper.java @@ -1,7 +1,6 @@ -package com.agileboot.orm.system.mapper; +package com.agileboot.domain.system.role.db; -import com.agileboot.orm.system.entity.SysMenuEntity; -import com.agileboot.orm.system.entity.SysRoleEntity; +import com.agileboot.domain.system.menu.db.SysMenuEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; import org.apache.ibatis.annotations.Select; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysRoleMenuEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuEntity.java similarity index 95% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysRoleMenuEntity.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuEntity.java index 63f3ccb..a43703e 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysRoleMenuEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuEntity.java @@ -1,4 +1,4 @@ -package com.agileboot.orm.system.entity; +package com.agileboot.domain.system.role.db; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysRoleMenuMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuMapper.java similarity index 71% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysRoleMenuMapper.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuMapper.java index 695c7b8..ac8317d 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysRoleMenuMapper.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuMapper.java @@ -1,6 +1,5 @@ -package com.agileboot.orm.system.mapper; +package com.agileboot.domain.system.role.db; -import com.agileboot.orm.system.entity.SysRoleMenuEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuService.java new file mode 100644 index 0000000..b901da9 --- /dev/null +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuService.java @@ -0,0 +1,15 @@ +package com.agileboot.domain.system.role.db; + +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 角色和菜单关联表 服务类 + *

+ * + * @author valarchie + * @since 2022-06-16 + */ +public interface SysRoleMenuService extends IService { + +} diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysRoleMenuServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuServiceImpl.java similarity index 58% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysRoleMenuServiceImpl.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuServiceImpl.java index 42ebfaf..7f7c278 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysRoleMenuServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuServiceImpl.java @@ -1,8 +1,5 @@ -package com.agileboot.orm.system.service.impl; +package com.agileboot.domain.system.role.db; -import com.agileboot.orm.system.entity.SysRoleMenuEntity; -import com.agileboot.orm.system.mapper.SysRoleMenuMapper; -import com.agileboot.orm.system.service.ISysRoleMenuService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -16,6 +13,6 @@ import org.springframework.stereotype.Service; */ @Service public class SysRoleMenuServiceImpl extends ServiceImpl implements - ISysRoleMenuService { + SysRoleMenuService { } diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysRoleService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleService.java similarity index 81% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysRoleService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleService.java index afdce86..81b71fe 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysRoleService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleService.java @@ -1,7 +1,6 @@ -package com.agileboot.orm.system.service; +package com.agileboot.domain.system.role.db; -import com.agileboot.orm.system.entity.SysMenuEntity; -import com.agileboot.orm.system.entity.SysRoleEntity; +import com.agileboot.domain.system.menu.db.SysMenuEntity; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -14,7 +13,7 @@ import java.util.List; * @author valarchie * @since 2022-06-16 */ -public interface ISysRoleService extends IService { +public interface SysRoleService extends IService { /** diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysRoleServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleServiceImpl.java similarity index 78% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysRoleServiceImpl.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleServiceImpl.java index 1a5355c..4abac93 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysRoleServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleServiceImpl.java @@ -1,11 +1,8 @@ -package com.agileboot.orm.system.service.impl; +package com.agileboot.domain.system.role.db; -import com.agileboot.orm.system.entity.SysMenuEntity; -import com.agileboot.orm.system.entity.SysRoleEntity; -import com.agileboot.orm.system.entity.SysUserEntity; -import com.agileboot.orm.system.mapper.SysRoleMapper; -import com.agileboot.orm.system.mapper.SysUserMapper; -import com.agileboot.orm.system.service.ISysRoleService; +import com.agileboot.domain.system.menu.db.SysMenuEntity; +import com.agileboot.domain.system.user.db.SysUserEntity; +import com.agileboot.domain.system.user.db.SysUserMapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.List; @@ -23,7 +20,7 @@ import org.springframework.stereotype.Service; */ @Service @RequiredArgsConstructor -public class SysRoleServiceImpl extends ServiceImpl implements ISysRoleService { +public class SysRoleServiceImpl extends ServiceImpl implements SysRoleService { @NonNull private SysUserMapper userMapper; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/dto/RoleDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/dto/RoleDTO.java index d0d64f7..881fc45 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/dto/RoleDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/dto/RoleDTO.java @@ -2,7 +2,7 @@ package com.agileboot.domain.system.role.dto; import com.agileboot.common.annotation.ExcelColumn; import com.agileboot.common.annotation.ExcelSheet; -import com.agileboot.orm.system.entity.SysRoleEntity; +import com.agileboot.domain.system.role.db.SysRoleEntity; import java.util.Date; import java.util.List; import lombok.Data; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModel.java index 076f0b1..7d9d718 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModel.java @@ -8,10 +8,10 @@ import com.agileboot.common.exception.error.ErrorCode.Business; import com.agileboot.domain.system.role.command.AddRoleCommand; import com.agileboot.domain.system.role.command.UpdateRoleCommand; import com.agileboot.common.enums.common.StatusEnum; -import com.agileboot.orm.system.entity.SysRoleEntity; -import com.agileboot.orm.system.entity.SysRoleMenuEntity; -import com.agileboot.orm.system.service.ISysRoleMenuService; -import com.agileboot.orm.system.service.ISysRoleService; +import com.agileboot.domain.system.role.db.SysRoleEntity; +import com.agileboot.domain.system.role.db.SysRoleMenuEntity; +import com.agileboot.domain.system.role.db.SysRoleMenuService; +import com.agileboot.domain.system.role.db.SysRoleService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.ArrayList; import java.util.HashSet; @@ -32,15 +32,15 @@ public class RoleModel extends SysRoleEntity { private List deptIds; - private ISysRoleService roleService; - private ISysRoleMenuService roleMenuService; + private SysRoleService roleService; + private SysRoleMenuService roleMenuService; - public RoleModel(ISysRoleService roleService, ISysRoleMenuService roleMenuService) { + public RoleModel(SysRoleService roleService, SysRoleMenuService roleMenuService) { this.roleService = roleService; this.roleMenuService = roleMenuService; } - public RoleModel(SysRoleEntity entity, ISysRoleService roleService, ISysRoleMenuService roleMenuService) { + public RoleModel(SysRoleEntity entity, SysRoleService roleService, SysRoleMenuService roleMenuService) { if (entity != null) { BeanUtil.copyProperties(entity, this); } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModelFactory.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModelFactory.java index c4081c6..c18dcb6 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModelFactory.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModelFactory.java @@ -4,10 +4,10 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; -import com.agileboot.orm.system.entity.SysRoleEntity; -import com.agileboot.orm.system.entity.SysRoleMenuEntity; -import com.agileboot.orm.system.service.ISysRoleMenuService; -import com.agileboot.orm.system.service.ISysRoleService; +import com.agileboot.domain.system.role.db.SysRoleEntity; +import com.agileboot.domain.system.role.db.SysRoleMenuEntity; +import com.agileboot.domain.system.role.db.SysRoleMenuService; +import com.agileboot.domain.system.role.db.SysRoleService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.List; import java.util.stream.Collectors; @@ -24,10 +24,10 @@ import org.springframework.stereotype.Component; public class RoleModelFactory { @NonNull - private ISysRoleService roleService; + private SysRoleService roleService; @NonNull - private ISysRoleMenuService roleMenuService; + private SysRoleMenuService roleMenuService; public RoleModel loadById(Long roleId) { SysRoleEntity byId = roleService.getById(roleId); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/AllocatedRoleQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/AllocatedRoleQuery.java index 605b36c..e5a4a52 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/AllocatedRoleQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/AllocatedRoleQuery.java @@ -2,7 +2,7 @@ package com.agileboot.domain.system.role.query; import cn.hutool.core.util.StrUtil; import com.agileboot.common.core.page.AbstractPageQuery; -import com.agileboot.orm.system.entity.SysUserEntity; +import com.agileboot.domain.system.user.db.SysUserEntity; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/RoleQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/RoleQuery.java index b8d3fa1..420abe5 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/RoleQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/RoleQuery.java @@ -2,7 +2,7 @@ package com.agileboot.domain.system.role.query; import cn.hutool.core.util.StrUtil; import com.agileboot.common.core.page.AbstractPageQuery; -import com.agileboot.orm.system.entity.SysRoleEntity; +import com.agileboot.domain.system.role.db.SysRoleEntity; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/UnallocatedRoleQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/UnallocatedRoleQuery.java index bfa52b9..c7b857c 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/UnallocatedRoleQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/UnallocatedRoleQuery.java @@ -2,7 +2,7 @@ package com.agileboot.domain.system.role.query; import cn.hutool.core.util.StrUtil; import com.agileboot.common.core.page.AbstractPageQuery; -import com.agileboot.orm.system.entity.SysUserEntity; +import com.agileboot.domain.system.user.db.SysUserEntity; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserApplicationService.java index 6e88139..80091cd 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserApplicationService.java @@ -14,6 +14,7 @@ import com.agileboot.domain.system.user.command.UpdateProfileCommand; import com.agileboot.domain.system.user.command.UpdateUserAvatarCommand; import com.agileboot.domain.system.user.command.UpdateUserCommand; import com.agileboot.domain.system.user.command.UpdateUserPasswordCommand; +import com.agileboot.domain.system.user.db.SearchUserDO; import com.agileboot.domain.system.user.dto.UserDTO; import com.agileboot.domain.system.user.dto.UserDetailDTO; import com.agileboot.domain.system.user.dto.UserProfileDTO; @@ -21,13 +22,12 @@ import com.agileboot.domain.system.user.model.UserModel; import com.agileboot.domain.system.user.model.UserModelFactory; import com.agileboot.domain.system.user.query.SearchUserQuery; import com.agileboot.infrastructure.user.web.SystemLoginUser; -import com.agileboot.orm.system.entity.SysPostEntity; -import com.agileboot.orm.system.entity.SysRoleEntity; -import com.agileboot.orm.system.entity.SysUserEntity; -import com.agileboot.orm.system.result.SearchUserDO; -import com.agileboot.orm.system.service.ISysPostService; -import com.agileboot.orm.system.service.ISysRoleService; -import com.agileboot.orm.system.service.ISysUserService; +import com.agileboot.domain.system.post.db.SysPostEntity; +import com.agileboot.domain.system.role.db.SysRoleEntity; +import com.agileboot.domain.system.user.db.SysUserEntity; +import com.agileboot.domain.system.post.db.SysPostService; +import com.agileboot.domain.system.role.db.SysRoleService; +import com.agileboot.domain.system.user.db.SysUserService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -44,13 +44,13 @@ import org.springframework.stereotype.Service; public class UserApplicationService { @NonNull - private ISysUserService userService; + private SysUserService userService; @NonNull - private ISysRoleService roleService; + private SysRoleService roleService; @NonNull - private ISysPostService postService; + private SysPostService postService; @NonNull private UserModelFactory userModelFactory; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/result/SearchUserDO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SearchUserDO.java similarity index 76% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/result/SearchUserDO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SearchUserDO.java index 0ea5074..d7b2af7 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/result/SearchUserDO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SearchUserDO.java @@ -1,6 +1,5 @@ -package com.agileboot.orm.system.result; +package com.agileboot.domain.system.user.db; -import com.agileboot.orm.system.entity.SysUserEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysUserEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SysUserEntity.java similarity index 98% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysUserEntity.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SysUserEntity.java index 91586dc..e0ab5e1 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/entity/SysUserEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SysUserEntity.java @@ -1,4 +1,4 @@ -package com.agileboot.orm.system.entity; +package com.agileboot.domain.system.user.db; import com.agileboot.common.core.base.BaseEntity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysUserMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SysUserMapper.java similarity index 92% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysUserMapper.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SysUserMapper.java index 991173d..8c84e15 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/mapper/SysUserMapper.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SysUserMapper.java @@ -1,9 +1,7 @@ -package com.agileboot.orm.system.mapper; +package com.agileboot.domain.system.user.db; -import com.agileboot.orm.system.entity.SysPostEntity; -import com.agileboot.orm.system.entity.SysRoleEntity; -import com.agileboot.orm.system.entity.SysUserEntity; -import com.agileboot.orm.system.result.SearchUserDO; +import com.agileboot.domain.system.post.db.SysPostEntity; +import com.agileboot.domain.system.role.db.SysRoleEntity; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysUserService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SysUserService.java similarity index 85% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysUserService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SysUserService.java index 5b01fb4..631d4e1 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysUserService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SysUserService.java @@ -1,10 +1,8 @@ -package com.agileboot.orm.system.service; +package com.agileboot.domain.system.user.db; import com.agileboot.common.core.page.AbstractPageQuery; -import com.agileboot.orm.system.entity.SysPostEntity; -import com.agileboot.orm.system.entity.SysRoleEntity; -import com.agileboot.orm.system.entity.SysUserEntity; -import com.agileboot.orm.system.result.SearchUserDO; +import com.agileboot.domain.system.post.db.SysPostEntity; +import com.agileboot.domain.system.role.db.SysRoleEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -18,7 +16,7 @@ import java.util.Set; * @author valarchie * @since 2022-06-16 */ -public interface ISysUserService extends IService { +public interface SysUserService extends IService { /** * 检测号码是否唯一 diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysUserServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SysUserServiceImpl.java similarity index 85% rename from agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysUserServiceImpl.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SysUserServiceImpl.java index fc070ab..f83654e 100644 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysUserServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SysUserServiceImpl.java @@ -1,12 +1,8 @@ -package com.agileboot.orm.system.service.impl; +package com.agileboot.domain.system.user.db; import com.agileboot.common.core.page.AbstractPageQuery; -import com.agileboot.orm.system.entity.SysPostEntity; -import com.agileboot.orm.system.entity.SysRoleEntity; -import com.agileboot.orm.system.entity.SysUserEntity; -import com.agileboot.orm.system.mapper.SysUserMapper; -import com.agileboot.orm.system.result.SearchUserDO; -import com.agileboot.orm.system.service.ISysUserService; +import com.agileboot.domain.system.post.db.SysPostEntity; +import com.agileboot.domain.system.role.db.SysRoleEntity; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -23,7 +19,7 @@ import org.springframework.stereotype.Service; * @since 2022-06-16 */ @Service -public class SysUserServiceImpl extends ServiceImpl implements ISysUserService { +public class SysUserServiceImpl extends ServiceImpl implements SysUserService { @Override diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserDTO.java index f4b68a6..5bea65f 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserDTO.java @@ -4,11 +4,11 @@ import cn.hutool.core.bean.BeanUtil; import com.agileboot.common.annotation.ExcelColumn; import com.agileboot.common.annotation.ExcelSheet; import com.agileboot.domain.common.cache.CacheCenter; -import com.agileboot.orm.system.entity.SysDeptEntity; -import com.agileboot.orm.system.entity.SysPostEntity; -import com.agileboot.orm.system.entity.SysRoleEntity; -import com.agileboot.orm.system.entity.SysUserEntity; -import com.agileboot.orm.system.result.SearchUserDO; +import com.agileboot.domain.system.dept.db.SysDeptEntity; +import com.agileboot.domain.system.post.db.SysPostEntity; +import com.agileboot.domain.system.role.db.SysRoleEntity; +import com.agileboot.domain.system.user.db.SysUserEntity; +import com.agileboot.domain.system.user.db.SearchUserDO; import java.util.Date; import lombok.Data; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserProfileDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserProfileDTO.java index 62d1c9f..0fa9e18 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserProfileDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserProfileDTO.java @@ -1,8 +1,8 @@ package com.agileboot.domain.system.user.dto; -import com.agileboot.orm.system.entity.SysPostEntity; -import com.agileboot.orm.system.entity.SysRoleEntity; -import com.agileboot.orm.system.entity.SysUserEntity; +import com.agileboot.domain.system.post.db.SysPostEntity; +import com.agileboot.domain.system.role.db.SysRoleEntity; +import com.agileboot.domain.system.user.db.SysUserEntity; import lombok.Data; /** diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/UserModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/UserModel.java index 6eae6ff..fbf261f 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/UserModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/UserModel.java @@ -15,8 +15,8 @@ import com.agileboot.domain.system.user.command.UpdateUserCommand; import com.agileboot.domain.system.user.command.UpdateUserPasswordCommand; import com.agileboot.infrastructure.user.AuthenticationUtils; import com.agileboot.infrastructure.user.web.SystemLoginUser; -import com.agileboot.orm.system.entity.SysUserEntity; -import com.agileboot.orm.system.service.ISysUserService; +import com.agileboot.domain.system.user.db.SysUserEntity; +import com.agileboot.domain.system.user.db.SysUserService; import java.util.Objects; import lombok.Data; import lombok.EqualsAndHashCode; @@ -30,7 +30,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class UserModel extends SysUserEntity { - private ISysUserService userService; + private SysUserService userService; private PostModelFactory postModelFactory; @@ -38,7 +38,7 @@ public class UserModel extends SysUserEntity { private RoleModelFactory roleModelFactory; - public UserModel(SysUserEntity entity, ISysUserService userService, PostModelFactory postModelFactory, + public UserModel(SysUserEntity entity, SysUserService userService, PostModelFactory postModelFactory, DeptModelFactory deptModelFactory, RoleModelFactory roleModelFactory) { this(userService, postModelFactory, deptModelFactory, roleModelFactory); @@ -47,7 +47,7 @@ public class UserModel extends SysUserEntity { } } - public UserModel(ISysUserService userService, PostModelFactory postModelFactory, + public UserModel(SysUserService userService, PostModelFactory postModelFactory, DeptModelFactory deptModelFactory, RoleModelFactory roleModelFactory) { this.userService = userService; this.postModelFactory = postModelFactory; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/UserModelFactory.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/UserModelFactory.java index 878b375..5b420f9 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/UserModelFactory.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/UserModelFactory.java @@ -5,8 +5,8 @@ import com.agileboot.common.exception.error.ErrorCode; import com.agileboot.domain.system.dept.model.DeptModelFactory; import com.agileboot.domain.system.post.model.PostModelFactory; import com.agileboot.domain.system.role.model.RoleModelFactory; -import com.agileboot.orm.system.entity.SysUserEntity; -import com.agileboot.orm.system.service.ISysUserService; +import com.agileboot.domain.system.user.db.SysUserEntity; +import com.agileboot.domain.system.user.db.SysUserService; import lombok.NonNull; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -20,7 +20,7 @@ import org.springframework.stereotype.Component; public class UserModelFactory { @NonNull - private ISysUserService userService; + private SysUserService userService; @NonNull private PostModelFactory postModelFactory; diff --git a/agileboot-orm/src/main/resources/mapper/orm/SysUserMapper.xml b/agileboot-domain/src/main/resources/mapper/user/SysUserMapper.xml similarity index 76% rename from agileboot-orm/src/main/resources/mapper/orm/SysUserMapper.xml rename to agileboot-domain/src/main/resources/mapper/user/SysUserMapper.xml index b4d57fd..5d14f7a 100644 --- a/agileboot-orm/src/main/resources/mapper/orm/SysUserMapper.xml +++ b/agileboot-domain/src/main/resources/mapper/user/SysUserMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/agileboot-domain/src/test/java/com/agileboot/domain/system/config/model/ConfigModelTest.java b/agileboot-domain/src/test/java/com/agileboot/domain/system/config/model/ConfigModelTest.java index 1a01a5c..2a43022 100644 --- a/agileboot-domain/src/test/java/com/agileboot/domain/system/config/model/ConfigModelTest.java +++ b/agileboot-domain/src/test/java/com/agileboot/domain/system/config/model/ConfigModelTest.java @@ -7,15 +7,15 @@ import static org.mockito.Mockito.when; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode.Business; -import com.agileboot.orm.system.entity.SysConfigEntity; -import com.agileboot.orm.system.service.ISysConfigService; +import com.agileboot.domain.system.config.db.SysConfigEntity; +import com.agileboot.domain.system.config.db.SysConfigService; import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class ConfigModelTest { - private final ISysConfigService configService = mock(ISysConfigService.class); + private final SysConfigService configService = mock(SysConfigService.class); private final ConfigModelFactory configModelFactory = new ConfigModelFactory(configService); diff --git a/agileboot-domain/src/test/java/com/agileboot/domain/system/dept/model/DeptModelTest.java b/agileboot-domain/src/test/java/com/agileboot/domain/system/dept/model/DeptModelTest.java index 9258a87..bc782c6 100644 --- a/agileboot-domain/src/test/java/com/agileboot/domain/system/dept/model/DeptModelTest.java +++ b/agileboot-domain/src/test/java/com/agileboot/domain/system/dept/model/DeptModelTest.java @@ -7,8 +7,8 @@ import static org.mockito.Mockito.when; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode.Business; -import com.agileboot.orm.system.entity.SysDeptEntity; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptEntity; +import com.agileboot.domain.system.dept.db.SysDeptService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; @@ -18,7 +18,7 @@ class DeptModelTest { private static final Long DEPT_ID = 1L; private static final Long PARENT_ID = 2L; - private final ISysDeptService deptService = mock(ISysDeptService.class); + private final SysDeptService deptService = mock(SysDeptService.class); private final DeptModelFactory deptModelFactory = new DeptModelFactory(deptService); diff --git a/agileboot-domain/src/test/java/com/agileboot/domain/system/menu/model/MenuModelTest.java b/agileboot-domain/src/test/java/com/agileboot/domain/system/menu/model/MenuModelTest.java index 79e4bf4..0cafd6c 100644 --- a/agileboot-domain/src/test/java/com/agileboot/domain/system/menu/model/MenuModelTest.java +++ b/agileboot-domain/src/test/java/com/agileboot/domain/system/menu/model/MenuModelTest.java @@ -6,7 +6,7 @@ import static org.mockito.Mockito.when; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode.Business; -import com.agileboot.orm.system.service.ISysMenuService; +import com.agileboot.domain.system.menu.db.SysMenuService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; @@ -15,7 +15,7 @@ class MenuModelTest { private static final long MENU_ID = 1L; - private final ISysMenuService menuService = mock(ISysMenuService.class); + private final SysMenuService menuService = mock(SysMenuService.class); private final MenuModelFactory menuModelFactory = new MenuModelFactory(menuService); diff --git a/agileboot-domain/src/test/java/com/agileboot/domain/system/post/model/PostModelTest.java b/agileboot-domain/src/test/java/com/agileboot/domain/system/post/model/PostModelTest.java index aa546e6..40f2642 100644 --- a/agileboot-domain/src/test/java/com/agileboot/domain/system/post/model/PostModelTest.java +++ b/agileboot-domain/src/test/java/com/agileboot/domain/system/post/model/PostModelTest.java @@ -7,7 +7,7 @@ import static org.mockito.Mockito.when; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode.Business; -import com.agileboot.orm.system.service.ISysPostService; +import com.agileboot.domain.system.post.db.SysPostService; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import org.mockito.Mockito; class PostModelTest { - private final ISysPostService postService = mock(ISysPostService.class); + private final SysPostService postService = mock(SysPostService.class); private final PostModelFactory postModelFactory = new PostModelFactory(postService); diff --git a/agileboot-domain/src/test/java/com/agileboot/domain/system/role/model/RoleModelTest.java b/agileboot-domain/src/test/java/com/agileboot/domain/system/role/model/RoleModelTest.java index 1a9b0fe..0f81f9a 100644 --- a/agileboot-domain/src/test/java/com/agileboot/domain/system/role/model/RoleModelTest.java +++ b/agileboot-domain/src/test/java/com/agileboot/domain/system/role/model/RoleModelTest.java @@ -7,16 +7,16 @@ import static org.mockito.Mockito.when; import cn.hutool.core.collection.ListUtil; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode.Business; -import com.agileboot.orm.system.service.ISysRoleMenuService; -import com.agileboot.orm.system.service.ISysRoleService; +import com.agileboot.domain.system.role.db.SysRoleMenuService; +import com.agileboot.domain.system.role.db.SysRoleService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class RoleModelTest { - private final ISysRoleService roleService = mock(ISysRoleService.class); + private final SysRoleService roleService = mock(SysRoleService.class); - private final ISysRoleMenuService roleMenuService = mock(ISysRoleMenuService.class); + private final SysRoleMenuService roleMenuService = mock(SysRoleMenuService.class); private final RoleModelFactory roleModelFactory = new RoleModelFactory(roleService, roleMenuService); diff --git a/agileboot-domain/src/test/java/com/agileboot/domain/system/user/model/UserModelTest.java b/agileboot-domain/src/test/java/com/agileboot/domain/system/user/model/UserModelTest.java index 409ba9c..347c313 100644 --- a/agileboot-domain/src/test/java/com/agileboot/domain/system/user/model/UserModelTest.java +++ b/agileboot-domain/src/test/java/com/agileboot/domain/system/user/model/UserModelTest.java @@ -12,13 +12,13 @@ import com.agileboot.domain.system.role.model.RoleModelFactory; import com.agileboot.domain.system.user.command.UpdateUserPasswordCommand; import com.agileboot.infrastructure.user.AuthenticationUtils; import com.agileboot.infrastructure.user.web.SystemLoginUser; -import com.agileboot.orm.system.service.ISysUserService; +import com.agileboot.domain.system.user.db.SysUserService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class UserModelTest { - private final ISysUserService userService = mock(ISysUserService.class); + private final SysUserService userService = mock(SysUserService.class); private final PostModelFactory postModelFactory = mock(PostModelFactory.class); private final DeptModelFactory deptModelFactory = mock(DeptModelFactory.class); private final RoleModelFactory roleModelFactory = mock(RoleModelFactory.class); diff --git a/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysConfigServiceImplTest.java b/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysConfigServiceImplTest.java index dd03ce8..2897480 100644 --- a/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysConfigServiceImplTest.java +++ b/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysConfigServiceImplTest.java @@ -1,8 +1,8 @@ package com.agileboot.integrationTest.db; +import com.agileboot.domain.system.config.db.SysConfigService; import com.agileboot.integrationTest.IntegrationTestApplication; import com.agileboot.common.enums.common.ConfigKeyEnum; -import com.agileboot.orm.system.service.ISysConfigService; import javax.annotation.Resource; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import org.springframework.test.context.junit4.SpringRunner; class SysConfigServiceImplTest { @Resource - ISysConfigService configService; + SysConfigService configService; @Test void testGetConfigValueByKey() { diff --git a/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysDeptServiceImplTest.java b/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysDeptServiceImplTest.java index 85741ba..9b31ead 100644 --- a/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysDeptServiceImplTest.java +++ b/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysDeptServiceImplTest.java @@ -1,7 +1,7 @@ package com.agileboot.integrationTest.db; import com.agileboot.integrationTest.IntegrationTestApplication; -import com.agileboot.orm.system.service.ISysDeptService; +import com.agileboot.domain.system.dept.db.SysDeptService; import javax.annotation.Resource; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import org.springframework.test.context.junit4.SpringRunner; class SysDeptServiceImplTest { @Resource - ISysDeptService deptService; + SysDeptService deptService; @Test @Rollback diff --git a/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysMenuServiceImplTest.java b/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysMenuServiceImplTest.java index 2c66fe7..d741b8d 100644 --- a/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysMenuServiceImplTest.java +++ b/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysMenuServiceImplTest.java @@ -2,8 +2,8 @@ package com.agileboot.integrationTest.db; import cn.hutool.core.collection.CollUtil; import com.agileboot.integrationTest.IntegrationTestApplication; -import com.agileboot.orm.system.entity.SysMenuEntity; -import com.agileboot.orm.system.service.ISysMenuService; +import com.agileboot.domain.system.menu.db.SysMenuEntity; +import com.agileboot.domain.system.menu.db.SysMenuService; import java.util.List; import javax.annotation.Resource; import org.junit.jupiter.api.Assertions; @@ -18,7 +18,7 @@ import org.springframework.test.context.junit4.SpringRunner; class SysMenuServiceImplTest { @Resource - ISysMenuService menuService; + SysMenuService menuService; @Test @Rollback diff --git a/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysPostServiceImplTest.java b/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysPostServiceImplTest.java index 7bb4a25..4bca6c5 100644 --- a/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysPostServiceImplTest.java +++ b/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysPostServiceImplTest.java @@ -1,7 +1,7 @@ package com.agileboot.integrationTest.db; import com.agileboot.integrationTest.IntegrationTestApplication; -import com.agileboot.orm.system.service.ISysPostService; +import com.agileboot.domain.system.post.db.SysPostService; import javax.annotation.Resource; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import org.springframework.test.context.junit4.SpringRunner; class SysPostServiceImplTest { @Resource - ISysPostService postService; + SysPostService postService; @Test @Rollback diff --git a/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysRoleServiceImplTest.java b/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysRoleServiceImplTest.java index d8fd8b0..f2169ec 100644 --- a/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysRoleServiceImplTest.java +++ b/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysRoleServiceImplTest.java @@ -1,7 +1,7 @@ package com.agileboot.integrationTest.db; import com.agileboot.integrationTest.IntegrationTestApplication; -import com.agileboot.orm.system.service.ISysRoleService; +import com.agileboot.domain.system.role.db.SysRoleService; import javax.annotation.Resource; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import org.springframework.test.context.junit4.SpringRunner; class SysRoleServiceImplTest { @Resource - ISysRoleService roleService; + SysRoleService roleService; @Test diff --git a/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysUserServiceImplTest.java b/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysUserServiceImplTest.java index aebf431..9a72488 100644 --- a/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysUserServiceImplTest.java +++ b/agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysUserServiceImplTest.java @@ -4,13 +4,13 @@ import com.agileboot.domain.system.role.query.AllocatedRoleQuery; import com.agileboot.domain.system.role.query.UnallocatedRoleQuery; import com.agileboot.domain.system.user.query.SearchUserQuery; import com.agileboot.integrationTest.IntegrationTestApplication; -import com.agileboot.orm.system.entity.SysMenuEntity; -import com.agileboot.orm.system.entity.SysPostEntity; -import com.agileboot.orm.system.entity.SysRoleEntity; -import com.agileboot.orm.system.entity.SysUserEntity; -import com.agileboot.orm.system.result.SearchUserDO; -import com.agileboot.orm.system.service.ISysMenuService; -import com.agileboot.orm.system.service.ISysUserService; +import com.agileboot.domain.system.menu.db.SysMenuEntity; +import com.agileboot.domain.system.post.db.SysPostEntity; +import com.agileboot.domain.system.role.db.SysRoleEntity; +import com.agileboot.domain.system.user.db.SysUserEntity; +import com.agileboot.domain.system.user.db.SearchUserDO; +import com.agileboot.domain.system.menu.db.SysMenuService; +import com.agileboot.domain.system.user.db.SysUserService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; import java.util.Set; @@ -28,9 +28,9 @@ import org.springframework.test.context.junit4.SpringRunner; class SysUserServiceImplTest { @Resource - ISysUserService userService; + SysUserService userService; @Resource - ISysMenuService menuService; + SysMenuService menuService; @Test @Rollback diff --git a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/config/ApplicationConfig.java b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/config/ApplicationConfig.java index 8959747..2bcf08a 100644 --- a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/config/ApplicationConfig.java +++ b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/config/ApplicationConfig.java @@ -14,7 +14,8 @@ import org.springframework.scheduling.annotation.EnableScheduling; @Configuration @EnableAspectJAutoProxy(exposeProxy = true) @EnableScheduling -@MapperScan("com.agileboot.orm.**.mapper") +// 因为如果直接指定db包 service也会被扫描到 所以通过markerInterface 进行限定 +@MapperScan(value = "com.agileboot.**.db", markerInterface = com.baomidou.mybatisplus.core.mapper.BaseMapper.class) public class ApplicationConfig { } diff --git a/agileboot-infrastructure/src/main/resources/application-basic.yml b/agileboot-infrastructure/src/main/resources/application-basic.yml index 5f43159..b891797 100644 --- a/agileboot-infrastructure/src/main/resources/application-basic.yml +++ b/agileboot-infrastructure/src/main/resources/application-basic.yml @@ -94,8 +94,8 @@ token: # MyBatis配置 mybatis-plus: - # 搜索指定包别名 - typeAliasesPackage: com.agileboot.orm.* + # 搜索指定包别名 使用简短的类型名称来代替完整的类型名称 +# typeAliasesPackage: com.agileboot.orm.* # 配置mapper的扫描，找到所有的mapper.xml映射文件 mapperLocations: classpath*:mapper/**/*Mapper.xml # 加载全局的配置文件 diff --git a/agileboot-orm/pom.xml b/agileboot-orm/pom.xml index 1078292..0486de4 100644 --- a/agileboot-orm/pom.xml +++ b/agileboot-orm/pom.xml @@ -33,7 +33,7 @@ - src/main/resources + ../agileboot-domain/src/main/resources **/*.xml diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysLoginInfoService.java b/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysLoginInfoService.java deleted file mode 100644 index d02d494..0000000 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysLoginInfoService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.agileboot.orm.system.service; - -import com.agileboot.orm.system.entity.SysLoginInfoEntity; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 系统访问记录 服务类 - *

- * - * @author valarchie - * @since 2022-06-06 - */ -public interface ISysLoginInfoService extends IService { - -} diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysOperationLogService.java b/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysOperationLogService.java deleted file mode 100644 index 0adf59f..0000000 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysOperationLogService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.agileboot.orm.system.service; - -import com.agileboot.orm.system.entity.SysOperationLogEntity; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 操作日志记录 服务类 - *

- * - * @author valarchie - * @since 2022-06-08 - */ -public interface ISysOperationLogService extends IService { - -} diff --git a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysRoleMenuService.java b/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysRoleMenuService.java deleted file mode 100644 index 733817b..0000000 --- a/agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysRoleMenuService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.agileboot.orm.system.service; - -import com.agileboot.orm.system.entity.SysRoleMenuEntity; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 角色和菜单关联表 服务类 - *

- * - * @author valarchie - * @since 2022-06-16 - */ -public interface ISysRoleMenuService extends IService { - -}