From b0048071e72acb338a5c976376f8ecdcd40991e3 Mon Sep 17 00:00:00 2001 From: TanJ Date: Thu, 30 Nov 2023 18:25:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix(1882):=20=20=E6=B7=BB=E5=8A=A0=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=82=B9=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axzo/tyr/client/feign/PermissionPointApi.java | 15 +++++++++++++++ .../permission/PermissionPointController.java | 12 ++++++++++++ .../tyr/server/repository/dao/SaasFeatureDao.java | 5 +++++ .../repository/dao/impl/SaasFeatureDaoImpl.java | 13 +++++++++++++ .../server/service/PermissionPointService.java | 13 +++++++++++++ .../service/impl/PermissionPointServiceImpl.java | 14 ++++++++++++++ .../impl/ProductFeatureRelationServiceImpl.java | 4 ++++ 7 files changed, 76 insertions(+) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/PermissionPointApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/PermissionPointApi.java index bf09e3ee..f773f11e 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/PermissionPointApi.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/PermissionPointApi.java @@ -54,4 +54,19 @@ public interface PermissionPointApi { /** 查询权限点列表 - 不组装树形结构 **/ @PostMapping(value = "/api/v1/permissionPoint/queryList") ApiResult> queryList(@RequestBody PermissionPointListQueryRequest request); + + + /** + * 根据权限点code查询详情 + **/ + @GetMapping(value = "/api/v1/permissionPoint/getDetail/{code}") + ApiResult> getDetailByCode(@PathVariable String code); + + + + /** + * 根据权限点Id获取子节点 + **/ + @GetMapping(value = "/api/v1/permissionPoint/getDetail/{id}") + ApiResult> getChildByParentId(@PathVariable Long id); } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/PermissionPointController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/PermissionPointController.java index f592485a..16c3f096 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/PermissionPointController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/PermissionPointController.java @@ -68,4 +68,16 @@ public class PermissionPointController implements PermissionPointApi { public ApiResult> queryList(PermissionPointListQueryRequest request) { return ApiResult.ok(permissionPointService.queryList(request)); } + + @Override + public ApiResult> getDetailByCode(String code) { + return ApiResult.ok(permissionPointService.getDetailByCode(code)); + + } + + + @Override + public ApiResult> getChildByParentId(Long parentId) { + return ApiResult.ok(permissionPointService.getChildByParentId(parentId)); + } } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureDao.java index 160fbe3e..26244f5d 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureDao.java @@ -25,4 +25,9 @@ public interface SaasFeatureDao extends IService { List listByParentIdAndTerminal(Long parentId, String terminal); + List listByCode(String code); + + + List getChildByParentId(Long parentId); + } \ No newline at end of file diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/impl/SaasFeatureDaoImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/impl/SaasFeatureDaoImpl.java index 86dbe780..e7dda606 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/impl/SaasFeatureDaoImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/impl/SaasFeatureDaoImpl.java @@ -1,5 +1,7 @@ package cn.axzo.tyr.server.repository.dao.impl; +import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum; +import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; import cn.axzo.tyr.server.repository.dao.SaasFeatureDao; import cn.axzo.tyr.server.repository.entity.SaasFeature; import cn.axzo.tyr.server.repository.mapper.SaasFeatureMapper; @@ -48,4 +50,15 @@ public class SaasFeatureDaoImpl extends ServiceImpl listByCode(String code) { + return this.lambdaQuery().in(SaasFeature::getFeatureCode, code) + .eq(BaseEntity::getIsDelete, TableIsDeleteEnum.NORMAL).list(); + } + + @Override + public List getChildByParentId(Long parentId) { + return lambdaQuery().eq(SaasFeature::getParentId,parentId) + .eq(BaseEntity::getIsDelete,TableIsDeleteEnum.NORMAL).list(); + } } \ No newline at end of file diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/PermissionPointService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/PermissionPointService.java index e138cf87..a77bb2a7 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/PermissionPointService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/PermissionPointService.java @@ -55,4 +55,17 @@ public interface PermissionPointService { /** 根据code查询权限点, terminal可为空 **/ List listNodeWithChildrenByCode(String featureCode, String terminal); + + /** + * 根据CODE查询详情 + * @param code + * @return + */ + List getDetailByCode(String code); + + /** + * @param parentId + * @return + */ + List getChildByParentId(Long parentId); } 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 2f2c660a..2c3b56a6 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 @@ -586,4 +586,18 @@ public class PermissionPointServiceImpl implements PermissionPointService { currentFeatrureList.addAll(children); return currentFeatrureList; } + + + @Override + public List getDetailByCode(String code) { + List feature = saasFeatureDao.listByCode(code); + return BeanMapper.copyList(feature, PermissionPointDTO.class); + } + + + @Override + public List getChildByParentId(Long parentId) { + List feature = saasFeatureDao.getChildByParentId(parentId); + return BeanMapper.copyList(feature, PermissionPointDTO.class); + } } 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 11a3788b..9eed2af0 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 @@ -93,6 +93,10 @@ public class ProductFeatureRelationServiceImpl implements ProductFeatureRelation @Override public ApiResult> featureListByProduct(List productIds) { List list = saasProductModuleFeatureRelationDao.lambdaQuery() + .select(SaasProductModuleFeatureRelation::getFeatureId) + .select(SaasProductModuleFeatureRelation::getProductModuleId) + .select(SaasProductModuleFeatureRelation::getDictCode) + .select(SaasProductModuleFeatureRelation::getDictCodeId) .in(SaasProductModuleFeatureRelation::getProductModuleId, productIds) .list(); return ApiResult.ok(BeanMapper.copyList(list, ProductFeatureRelationVO.class)); From 756bfebe4139780a5270d5462dcfcbe383f57c56 Mon Sep 17 00:00:00 2001 From: TanJ Date: Fri, 1 Dec 2023 10:44:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix(1882):=20=20select=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProductFeatureRelationServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 9eed2af0..29d65032 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 @@ -2,6 +2,7 @@ package cn.axzo.tyr.server.service.impl; import cn.axzo.basics.common.BeanMapper; import cn.axzo.framework.domain.web.result.ApiResult; +import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; import cn.axzo.thrones.client.saas.ServicePkgClient; import cn.axzo.thrones.client.saas.entity.serivicepgkproduct.ServicePkgProduct; import cn.axzo.thrones.client.saas.entity.servicepkg.ServicePkgDetailRes; @@ -93,10 +94,11 @@ public class ProductFeatureRelationServiceImpl implements ProductFeatureRelation @Override public ApiResult> featureListByProduct(List productIds) { List list = saasProductModuleFeatureRelationDao.lambdaQuery() - .select(SaasProductModuleFeatureRelation::getFeatureId) - .select(SaasProductModuleFeatureRelation::getProductModuleId) - .select(SaasProductModuleFeatureRelation::getDictCode) - .select(SaasProductModuleFeatureRelation::getDictCodeId) + .select(SaasProductModuleFeatureRelation::getFeatureId + ,SaasProductModuleFeatureRelation::getProductModuleId + ,SaasProductModuleFeatureRelation::getDictCode + ,SaasProductModuleFeatureRelation::getDictCodeId + , BaseEntity::getId) .in(SaasProductModuleFeatureRelation::getProductModuleId, productIds) .list(); return ApiResult.ok(BeanMapper.copyList(list, ProductFeatureRelationVO.class)); From 0d0a8810c0ffaab502738b3d6b19d51ee3913efa Mon Sep 17 00:00:00 2001 From: TanJ Date: Fri, 1 Dec 2023 10:54:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix(1882):=20=20=E5=90=8D=E7=A7=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/axzo/tyr/client/feign/PermissionPointApi.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/PermissionPointApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/PermissionPointApi.java index f773f11e..07e86fc6 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/PermissionPointApi.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/PermissionPointApi.java @@ -59,7 +59,7 @@ public interface PermissionPointApi { /** * 根据权限点code查询详情 **/ - @GetMapping(value = "/api/v1/permissionPoint/getDetail/{code}") + @GetMapping(value = "/api/v1/permissionPoint/getByCode/{code}") ApiResult> getDetailByCode(@PathVariable String code); @@ -67,6 +67,6 @@ public interface PermissionPointApi { /** * 根据权限点Id获取子节点 **/ - @GetMapping(value = "/api/v1/permissionPoint/getDetail/{id}") + @GetMapping(value = "/api/v1/permissionPoint/getChildByParentId/{id}") ApiResult> getChildByParentId(@PathVariable Long id); } From 2da3b5a45251b56f2c4d6e7d88c971f0a46fb380 Mon Sep 17 00:00:00 2001 From: TanJ Date: Fri, 1 Dec 2023 11:21:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E5=8F=82=E6=95=B0=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/permission/PermissionPointController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/PermissionPointController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/PermissionPointController.java index 16c3f096..8bbb45d9 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/PermissionPointController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/PermissionPointController.java @@ -77,7 +77,7 @@ public class PermissionPointController implements PermissionPointApi { @Override - public ApiResult> getChildByParentId(Long parentId) { - return ApiResult.ok(permissionPointService.getChildByParentId(parentId)); + public ApiResult> getChildByParentId(Long id) { + return ApiResult.ok(permissionPointService.getChildByParentId(id)); } } From 04dbfed2cca77ca4c857e815573efda734ad5458 Mon Sep 17 00:00:00 2001 From: TanJ Date: Fri, 1 Dec 2023 16:11:44 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix=20:=20enum=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tyr/server/repository/dao/impl/SaasFeatureDaoImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/impl/SaasFeatureDaoImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/impl/SaasFeatureDaoImpl.java index e7dda606..e7dc4d03 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/impl/SaasFeatureDaoImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/impl/SaasFeatureDaoImpl.java @@ -52,8 +52,7 @@ public class SaasFeatureDaoImpl extends ServiceImpl listByCode(String code) { - return this.lambdaQuery().in(SaasFeature::getFeatureCode, code) - .eq(BaseEntity::getIsDelete, TableIsDeleteEnum.NORMAL).list(); + return this.lambdaQuery().in(SaasFeature::getFeatureCode, code).list(); } @Override