From 3210aa2d6d8fd9954d17f558f4db3f4267cf4ec2 Mon Sep 17 00:00:00 2001 From: yangsong Date: Thu, 14 Sep 2023 13:42:33 +0800 Subject: [PATCH] package rename --- .../model/req/QuerySaasRoleGroupReq.java | 4 +-- .../role/SaasPermissionGroupController.java | 6 ++-- .../roleuser/RoleUserController.java | 1 - .../tyr/server/job/OMSRoleJobHandler.java | 8 +---- .../{service => dao}/ProductModuleDao.java | 3 +- .../{service => dao}/SaasFeatureDao.java | 2 +- .../SaasPermissionGroupDao.java | 2 +- .../SaasPermissionGroupScopeDao.java | 2 +- .../SaasPgroupPermissionRelationDao.java | 2 +- .../SaasPgroupRoleRelationDao.java | 2 +- .../SaasProductModuleFeatureRelationDao.java | 2 +- .../{service => dao}/SaasRoleDao.java | 2 +- .../{service => dao}/SaasRoleGroupDao.java | 8 ++--- .../SaasRoleGroupRelationDao.java | 5 +-- .../SaasRoleUserRelationDao.java | 6 +--- .../impl/SaasFeatureDaoImpl.java | 6 ++-- .../server/repository/entity/SaasRole.java | 33 +++---------------- .../service/impl/PermissionGroupImpl.java | 2 +- .../impl/PermissionPointServiceImpl.java | 4 +-- .../ProductFeatureRelationServiceImpl.java | 2 +- .../service/impl/ProductServiceImpl.java | 2 +- .../server/service/impl/RoleServiceImpl.java | 4 +-- .../server/service/impl/RoleUserService.java | 4 +-- .../SaasPermissionGroupScopeServiceImpl.java | 2 +- ...asPgroupPermissionRelationServiceImpl.java | 2 +- .../SaasPgroupRoleRelationServiceImpl.java | 4 +-- .../SaasRoleGroupRelationServiceImpl.java | 2 +- .../impl/SaasRoleGroupServiceImpl.java | 2 +- .../permission/PermissionPointTest.java | 2 +- 29 files changed, 41 insertions(+), 85 deletions(-) rename tyr-server/src/main/java/cn/axzo/tyr/server/repository/{service => dao}/ProductModuleDao.java (82%) rename tyr-server/src/main/java/cn/axzo/tyr/server/repository/{service => dao}/SaasFeatureDao.java (92%) rename tyr-server/src/main/java/cn/axzo/tyr/server/repository/{service => dao}/SaasPermissionGroupDao.java (92%) rename tyr-server/src/main/java/cn/axzo/tyr/server/repository/{service => dao}/SaasPermissionGroupScopeDao.java (96%) rename tyr-server/src/main/java/cn/axzo/tyr/server/repository/{service => dao}/SaasPgroupPermissionRelationDao.java (97%) rename tyr-server/src/main/java/cn/axzo/tyr/server/repository/{service => dao}/SaasPgroupRoleRelationDao.java (96%) rename tyr-server/src/main/java/cn/axzo/tyr/server/repository/{service => dao}/SaasProductModuleFeatureRelationDao.java (92%) rename tyr-server/src/main/java/cn/axzo/tyr/server/repository/{service => dao}/SaasRoleDao.java (95%) rename tyr-server/src/main/java/cn/axzo/tyr/server/repository/{service => dao}/SaasRoleGroupDao.java (86%) rename tyr-server/src/main/java/cn/axzo/tyr/server/repository/{service => dao}/SaasRoleGroupRelationDao.java (82%) rename tyr-server/src/main/java/cn/axzo/tyr/server/repository/{service => dao}/SaasRoleUserRelationDao.java (86%) rename tyr-server/src/main/java/cn/axzo/tyr/server/repository/{service => dao}/impl/SaasFeatureDaoImpl.java (87%) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/QuerySaasRoleGroupReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/QuerySaasRoleGroupReq.java index 805ec758..e6309e29 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/QuerySaasRoleGroupReq.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/QuerySaasRoleGroupReq.java @@ -18,12 +18,12 @@ public class QuerySaasRoleGroupReq { /** * 项目部id(不传或者传-1查询的是标准分组) */ - private Long workspaceId; + private List workspaceIds; /** * 单位id(不传或者传-1查询的是标准分组) */ - private Long ouId; + private List ouIds; /** * 工作台类型字典code diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasPermissionGroupController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasPermissionGroupController.java index 161902ef..7b0bfcf4 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasPermissionGroupController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasPermissionGroupController.java @@ -11,9 +11,9 @@ import cn.axzo.tyr.client.model.vo.DeletePermissionGroupVO; import cn.axzo.tyr.client.model.vo.SaasPermissionGroupVO; import cn.axzo.tyr.client.model.vo.SaveOrUpdatePermissionGroupVO; import cn.axzo.tyr.client.model.vo.SavePermissionGroupPPVO; -import cn.axzo.tyr.server.repository.service.SaasPermissionGroupDao; -import cn.axzo.tyr.server.repository.service.SaasPermissionGroupScopeDao; -import cn.axzo.tyr.server.repository.service.SaasPgroupPermissionRelationDao; +import cn.axzo.tyr.server.repository.dao.SaasPermissionGroupDao; +import cn.axzo.tyr.server.repository.dao.SaasPermissionGroupScopeDao; +import cn.axzo.tyr.server.repository.dao.SaasPgroupPermissionRelationDao; import cn.axzo.tyr.server.service.PermissionGroupService; import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java index 31e58e72..b29c444e 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java @@ -3,7 +3,6 @@ package cn.axzo.tyr.server.controller.roleuser; import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.tyr.client.feign.TyrSaasRoleUserApi; import cn.axzo.tyr.client.model.roleuser.req.RoleUserReq; -import cn.axzo.tyr.server.repository.service.SaasRoleUserRelationDao; import cn.axzo.tyr.server.service.SaasRoleUserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/job/OMSRoleJobHandler.java b/tyr-server/src/main/java/cn/axzo/tyr/server/job/OMSRoleJobHandler.java index 77486a3a..4b5e44f2 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/job/OMSRoleJobHandler.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/job/OMSRoleJobHandler.java @@ -2,7 +2,7 @@ package cn.axzo.tyr.server.job; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; import cn.axzo.tyr.server.repository.entity.*; -import cn.axzo.tyr.server.repository.service.*; +import cn.axzo.tyr.server.repository.dao.*; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.IJobHandler; import com.xxl.job.core.handler.annotation.XxlJob; @@ -76,12 +76,6 @@ public class OMSRoleJobHandler extends IJobHandler { oldRole.forEach(e -> { e.setWorkspaceId(-1l); e.setOwnerOuId(-1l); - e.setFitOuTypeBit(-1); - e.setFitOuNodeTypeBit(-1); - e.setPositionTemplateId(-1l); - e.setProjectTeamManageRoleResourceId(-1l); - e.setFromPreRoleId(-1l); - e.setJobCode(""); }); roleDao.updateBatchById(oldRole); // 保存角色分组关联关系 diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/ProductModuleDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/ProductModuleDao.java similarity index 82% rename from tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/ProductModuleDao.java rename to tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/ProductModuleDao.java index 10c448dd..c83be1d3 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/ProductModuleDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/ProductModuleDao.java @@ -1,9 +1,8 @@ -package cn.axzo.tyr.server.repository.service; +package cn.axzo.tyr.server.repository.dao; import cn.axzo.tyr.server.repository.entity.ProductModule; import cn.axzo.tyr.server.repository.mapper.ProductModuleMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Repository; import org.springframework.stereotype.Service; /** diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasFeatureDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureDao.java similarity index 92% rename from tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasFeatureDao.java rename to tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureDao.java index 0751a47d..bfe031a1 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasFeatureDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureDao.java @@ -1,4 +1,4 @@ -package cn.axzo.tyr.server.repository.service; +package cn.axzo.tyr.server.repository.dao; import cn.axzo.tyr.server.repository.entity.SaasFeature; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasPermissionGroupDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPermissionGroupDao.java similarity index 92% rename from tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasPermissionGroupDao.java rename to tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPermissionGroupDao.java index a5ff031d..358ce34f 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasPermissionGroupDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPermissionGroupDao.java @@ -1,4 +1,4 @@ -package cn.axzo.tyr.server.repository.service; +package cn.axzo.tyr.server.repository.dao; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; import cn.axzo.tyr.server.repository.entity.SaasPermissionGroup; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasPermissionGroupScopeDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPermissionGroupScopeDao.java similarity index 96% rename from tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasPermissionGroupScopeDao.java rename to tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPermissionGroupScopeDao.java index 4af9a366..11174e8b 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasPermissionGroupScopeDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPermissionGroupScopeDao.java @@ -1,4 +1,4 @@ -package cn.axzo.tyr.server.repository.service; +package cn.axzo.tyr.server.repository.dao; import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasPgroupPermissionRelationDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPgroupPermissionRelationDao.java similarity index 97% rename from tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasPgroupPermissionRelationDao.java rename to tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPgroupPermissionRelationDao.java index 7075a7a6..37240edd 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasPgroupPermissionRelationDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPgroupPermissionRelationDao.java @@ -1,4 +1,4 @@ -package cn.axzo.tyr.server.repository.service; +package cn.axzo.tyr.server.repository.dao; import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasPgroupRoleRelationDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPgroupRoleRelationDao.java similarity index 96% rename from tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasPgroupRoleRelationDao.java rename to tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPgroupRoleRelationDao.java index 99c0183b..32a9560f 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasPgroupRoleRelationDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPgroupRoleRelationDao.java @@ -1,4 +1,4 @@ -package cn.axzo.tyr.server.repository.service; +package cn.axzo.tyr.server.repository.dao; import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasProductModuleFeatureRelationDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasProductModuleFeatureRelationDao.java similarity index 92% rename from tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasProductModuleFeatureRelationDao.java rename to tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasProductModuleFeatureRelationDao.java index 844bce5e..8f7bba44 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasProductModuleFeatureRelationDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasProductModuleFeatureRelationDao.java @@ -1,4 +1,4 @@ -package cn.axzo.tyr.server.repository.service; +package cn.axzo.tyr.server.repository.dao; import cn.axzo.tyr.server.repository.entity.SaasProductModuleFeatureRelation; import cn.axzo.tyr.server.repository.mapper.SaasProductModuleFeatureRelationMapper; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleDao.java similarity index 95% rename from tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleDao.java rename to tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleDao.java index f7846a02..072dd6db 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleDao.java @@ -1,4 +1,4 @@ -package cn.axzo.tyr.server.repository.service; +package cn.axzo.tyr.server.repository.dao; import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleGroupDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupDao.java similarity index 86% rename from tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleGroupDao.java rename to tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupDao.java index 6900378d..7df2637b 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleGroupDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupDao.java @@ -1,14 +1,10 @@ -package cn.axzo.tyr.server.repository.service; +package cn.axzo.tyr.server.repository.dao; import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; import cn.axzo.tyr.client.model.req.QuerySaasRoleGroupReq; -import cn.axzo.tyr.server.repository.entity.SaasPgroupRoleRelation; -import cn.axzo.tyr.server.repository.entity.SaasRole; import cn.axzo.tyr.server.repository.entity.SaasRoleGroup; -import cn.axzo.tyr.server.repository.mapper.SaasPgroupRoleRelationMapper; import cn.axzo.tyr.server.repository.mapper.SaasRoleGroupMapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.collections.CollectionUtils; @@ -38,6 +34,8 @@ public class SaasRoleGroupDao extends ServiceImpl eq = this.lambdaQuery() .in(CollectionUtils.isNotEmpty(req.getIds()), BaseEntity::getId, req.getIds()) .in(CollectionUtils.isNotEmpty(req.getWorkspaceTypeCode()), SaasRoleGroup::getWorkspaceTypeCode, req.getWorkspaceTypeCode()) + .in(CollectionUtils.isNotEmpty(req.getWorkspaceIds()), SaasRoleGroup::getWorkspaceId, req.getWorkspaceIds()) + .in(CollectionUtils.isNotEmpty(req.getOuIds()), SaasRoleGroup::getOuId, req.getOuIds()) .eq(BaseEntity::getIsDelete, TableIsDeleteEnum.NORMAL.value); if(CollectionUtils.isNotEmpty(req.getOuTypeCode())){ eq.last(" AND (" + condition.substring(0, condition.length() - 2) + ")"); diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleGroupRelationDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupRelationDao.java similarity index 82% rename from tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleGroupRelationDao.java rename to tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupRelationDao.java index 292c13db..e9381487 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleGroupRelationDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupRelationDao.java @@ -1,11 +1,8 @@ -package cn.axzo.tyr.server.repository.service; +package cn.axzo.tyr.server.repository.dao; import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; -import cn.axzo.tyr.server.repository.entity.SaasPgroupPermissionRelation; -import cn.axzo.tyr.server.repository.entity.SaasRoleGroup; import cn.axzo.tyr.server.repository.entity.SaasRoleGroupRelation; -import cn.axzo.tyr.server.repository.mapper.SaasRoleGroupMapper; import cn.axzo.tyr.server.repository.mapper.SaasRoleGroupRelationMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.collections.CollectionUtils; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleUserRelationDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java similarity index 86% rename from tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleUserRelationDao.java rename to tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java index 91674d48..d24fe166 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleUserRelationDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java @@ -1,17 +1,13 @@ -package cn.axzo.tyr.server.repository.service; +package cn.axzo.tyr.server.repository.dao; import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; import cn.axzo.tyr.client.model.BaseWorkspaceModel; -import cn.axzo.tyr.client.model.roleuser.req.RoleUserReq; import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation; import cn.axzo.tyr.server.repository.mapper.SaasRoleUserRelationMapper; import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.baomidou.mybatisplus.extension.toolkit.ChainWrappers; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/impl/SaasFeatureDaoImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/impl/SaasFeatureDaoImpl.java similarity index 87% rename from tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/impl/SaasFeatureDaoImpl.java rename to tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/impl/SaasFeatureDaoImpl.java index cb863a87..48791cd3 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/impl/SaasFeatureDaoImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/impl/SaasFeatureDaoImpl.java @@ -1,12 +1,10 @@ -package cn.axzo.tyr.server.repository.service.impl; +package cn.axzo.tyr.server.repository.dao.impl; import cn.axzo.tyr.server.repository.entity.SaasFeature; import cn.axzo.tyr.server.repository.mapper.SaasFeatureMapper; -import cn.axzo.tyr.server.repository.service.SaasFeatureDao; -import com.baomidou.mybatisplus.core.conditions.Wrapper; +import cn.axzo.tyr.server.repository.dao.SaasFeatureDao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasRole.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasRole.java index b3b5c262..75208466 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasRole.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasRole.java @@ -39,39 +39,14 @@ public class SaasRole extends BaseEntity { private Long workspaceId; + /** + * 废弃 + */ + @Deprecated private Integer workspaceType; private Long ownerOuId; - /** - * 废弃 20230911 - */ - private Integer fitOuTypeBit; - - /** - * 废弃 20230911 - */ - private Integer fitOuNodeTypeBit; - - /** - * 废弃 20230911 - */ - private Long positionTemplateId; - - /** - * 废弃 20230911 - */ - private Long projectTeamManageRoleResourceId; - - /** - * 废弃 20230911 - */ - private Long fromPreRoleId; - - /** - * 废弃 20230911 - */ - private String jobCode; /** * 创建者 diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionGroupImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionGroupImpl.java index cf0f19d6..0a9f2963 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionGroupImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionGroupImpl.java @@ -13,7 +13,7 @@ import cn.axzo.tyr.client.model.permission.PermissionPointTreeNode; import cn.axzo.tyr.client.model.req.QuerySaasPermissionGroupReq; import cn.axzo.tyr.client.model.vo.*; import cn.axzo.tyr.server.repository.entity.*; -import cn.axzo.tyr.server.repository.service.*; +import cn.axzo.tyr.server.repository.dao.*; import cn.axzo.tyr.server.service.PermissionGroupService; import cn.axzo.tyr.server.service.PermissionPointService; import cn.axzo.tyr.server.service.SaasPermissionGroupScopeService; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java index e9cab098..7dde68d3 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java @@ -19,8 +19,8 @@ import cn.axzo.tyr.client.model.permission.PermissionPointTreeQueryReq; import cn.axzo.tyr.client.model.permission.PermissionPointVO; import cn.axzo.tyr.server.repository.SaasBasicDictDao; import cn.axzo.tyr.server.repository.entity.SaasFeature; -import cn.axzo.tyr.server.repository.service.SaasFeatureDao; -import cn.axzo.tyr.server.repository.service.SaasPgroupPermissionRelationDao; +import cn.axzo.tyr.server.repository.dao.SaasFeatureDao; +import cn.axzo.tyr.server.repository.dao.SaasPgroupPermissionRelationDao; import cn.axzo.tyr.server.service.PermissionPointService; import cn.axzo.tyr.server.service.SaasBasicDictService; import cn.hutool.core.collection.CollectionUtil; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductFeatureRelationServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductFeatureRelationServiceImpl.java index 5dbd6134..2dab53a6 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductFeatureRelationServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductFeatureRelationServiceImpl.java @@ -6,7 +6,7 @@ import cn.axzo.tyr.client.model.product.ProductFeatureRelationSearchReq; import cn.axzo.tyr.client.model.product.ProductFeatureRelationUpdateReq; import cn.axzo.tyr.client.model.product.ProductFeatureRelationVO; import cn.axzo.tyr.server.repository.entity.SaasProductModuleFeatureRelation; -import cn.axzo.tyr.server.repository.service.SaasProductModuleFeatureRelationDao; +import cn.axzo.tyr.server.repository.dao.SaasProductModuleFeatureRelationDao; import cn.axzo.tyr.server.service.ProductFeatureRelationService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java index 4d0b0caa..ead2f150 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java @@ -11,7 +11,7 @@ import cn.axzo.tyr.client.model.product.ProductSearchPageReq; import cn.axzo.tyr.client.model.product.ProductUpdateReq; import cn.axzo.tyr.client.model.product.ProductVO; import cn.axzo.tyr.server.repository.entity.ProductModule; -import cn.axzo.tyr.server.repository.service.ProductModuleDao; +import cn.axzo.tyr.server.repository.dao.ProductModuleDao; import cn.axzo.tyr.server.service.ProductService; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.RequiredArgsConstructor; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java index 89e3dd60..417e88ec 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java @@ -14,7 +14,7 @@ import cn.axzo.tyr.client.model.vo.SaasPermissionGroupVO; import cn.axzo.tyr.client.model.vo.SaasRoleVO; import cn.axzo.tyr.client.model.vo.SaveOrUpdateRoleVO; import cn.axzo.tyr.server.repository.entity.*; -import cn.axzo.tyr.server.repository.service.*; +import cn.axzo.tyr.server.repository.dao.*; import cn.axzo.tyr.server.service.*; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; @@ -225,7 +225,7 @@ public class RoleServiceImpl implements RoleService { saasRole.setDescription(saasRole.getDescription()); saasRole.setRoleType(saveOrUpdateRole.getRoleType()); saasRole.setWorkspaceId(saveOrUpdateRole.getWorkspaceId()); - saasRole.setWorkspaceType(saveOrUpdateRole.getWorkspaceType()); +// saasRole.setWorkspaceType(saveOrUpdateRole.getWorkspaceType()); saasRole.setOwnerOuId(saveOrUpdateRole.getOwnerOuId()); saasRole.setUpdateBy(saveOrUpdateRole.getOperatorId()); saasRole.setUpdateAt(now); diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java index b2a927d5..8d2d4f08 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java @@ -7,8 +7,8 @@ import cn.axzo.tyr.client.model.roleuser.req.RoleUserReq; import cn.axzo.tyr.client.common.enums.RoleTypeEnum; import cn.axzo.tyr.server.repository.entity.SaasRole; import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation; -import cn.axzo.tyr.server.repository.service.SaasRoleDao; -import cn.axzo.tyr.server.repository.service.SaasRoleUserRelationDao; +import cn.axzo.tyr.server.repository.dao.SaasRoleDao; +import cn.axzo.tyr.server.repository.dao.SaasRoleUserRelationDao; import cn.axzo.tyr.server.service.SaasRoleUserService; import cn.hutool.core.collection.CollectionUtil; import lombok.RequiredArgsConstructor; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPermissionGroupScopeServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPermissionGroupScopeServiceImpl.java index e1d5f5b6..25681169 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPermissionGroupScopeServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPermissionGroupScopeServiceImpl.java @@ -2,7 +2,7 @@ package cn.axzo.tyr.server.service.impl; import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum; import cn.axzo.tyr.server.repository.entity.SaasPermissionGroupScope; -import cn.axzo.tyr.server.repository.service.SaasPermissionGroupScopeDao; +import cn.axzo.tyr.server.repository.dao.SaasPermissionGroupScopeDao; import cn.axzo.tyr.server.service.SaasPermissionGroupScopeService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPgroupPermissionRelationServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPgroupPermissionRelationServiceImpl.java index 9d8ed1a3..b86d137b 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPgroupPermissionRelationServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPgroupPermissionRelationServiceImpl.java @@ -2,7 +2,7 @@ package cn.axzo.tyr.server.service.impl; import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum; import cn.axzo.tyr.server.repository.entity.SaasPgroupPermissionRelation; -import cn.axzo.tyr.server.repository.service.SaasPgroupPermissionRelationDao; +import cn.axzo.tyr.server.repository.dao.SaasPgroupPermissionRelationDao; import cn.axzo.tyr.server.service.SaasPgroupPermissionRelationService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPgroupRoleRelationServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPgroupRoleRelationServiceImpl.java index a68d69fb..f804560f 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPgroupRoleRelationServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPgroupRoleRelationServiceImpl.java @@ -4,8 +4,8 @@ import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum; import cn.axzo.tyr.client.model.enums.PermissionGroupType; import cn.axzo.tyr.server.repository.entity.SaasPermissionGroup; import cn.axzo.tyr.server.repository.entity.SaasPgroupRoleRelation; -import cn.axzo.tyr.server.repository.service.SaasPermissionGroupDao; -import cn.axzo.tyr.server.repository.service.SaasPgroupRoleRelationDao; +import cn.axzo.tyr.server.repository.dao.SaasPermissionGroupDao; +import cn.axzo.tyr.server.repository.dao.SaasPgroupRoleRelationDao; import cn.axzo.tyr.server.service.SaasPgroupRoleRelationService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupRelationServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupRelationServiceImpl.java index 08dccf0e..a8094b64 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupRelationServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupRelationServiceImpl.java @@ -2,7 +2,7 @@ package cn.axzo.tyr.server.service.impl; import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum; import cn.axzo.tyr.server.repository.entity.SaasRoleGroupRelation; -import cn.axzo.tyr.server.repository.service.SaasRoleGroupRelationDao; +import cn.axzo.tyr.server.repository.dao.SaasRoleGroupRelationDao; import cn.axzo.tyr.server.service.SaasRoleGroupRelationService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java index 50b64f95..cc9efe1b 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java @@ -7,7 +7,7 @@ import cn.axzo.tyr.client.model.req.QuerySaasRoleGroupReq; import cn.axzo.tyr.client.model.vo.SaasRoleGroupVO; import cn.axzo.tyr.server.repository.entity.SaasRoleGroup; import cn.axzo.tyr.server.repository.entity.SaasRoleGroupRelation; -import cn.axzo.tyr.server.repository.service.*; +import cn.axzo.tyr.server.repository.dao.*; import cn.axzo.tyr.server.service.SaasRoleGroupService; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; diff --git a/tyr-server/src/test/java/cn/axzo/tyr/server/permission/PermissionPointTest.java b/tyr-server/src/test/java/cn/axzo/tyr/server/permission/PermissionPointTest.java index 93ccc452..806f084e 100644 --- a/tyr-server/src/test/java/cn/axzo/tyr/server/permission/PermissionPointTest.java +++ b/tyr-server/src/test/java/cn/axzo/tyr/server/permission/PermissionPointTest.java @@ -10,7 +10,7 @@ import cn.axzo.tyr.client.model.permission.PermissionPointTreeQueryReq; import cn.axzo.tyr.client.model.permission.PermissionPointVO; import cn.axzo.tyr.server.controller.permission.PermissionPointController; import cn.axzo.tyr.server.repository.entity.SaasFeature; -import cn.axzo.tyr.server.repository.service.SaasFeatureDao; +import cn.axzo.tyr.server.repository.dao.SaasFeatureDao; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; import org.junit.jupiter.api.Test;