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..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 @@ -54,4 +54,19 @@ public interface PermissionPointApi { /** 查询权限点列表 - 不组装树形结构 **/ @PostMapping(value = "/api/v1/permissionPoint/queryList") ApiResult> queryList(@RequestBody PermissionPointListQueryRequest request); + + + /** + * 根据权限点code查询详情 + **/ + @GetMapping(value = "/api/v1/permissionPoint/getByCode/{code}") + ApiResult> getDetailByCode(@PathVariable String code); + + + + /** + * 根据权限点Id获取子节点 + **/ + @GetMapping(value = "/api/v1/permissionPoint/getChildByParentId/{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..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 @@ -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 id) { + return ApiResult.ok(permissionPointService.getChildByParentId(id)); + } } 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..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 @@ -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,14 @@ public class SaasFeatureDaoImpl extends ServiceImpl listByCode(String code) { + return this.lambdaQuery().in(SaasFeature::getFeatureCode, code).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..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,6 +94,11 @@ public class ProductFeatureRelationServiceImpl implements ProductFeatureRelation @Override public ApiResult> featureListByProduct(List productIds) { List list = saasProductModuleFeatureRelationDao.lambdaQuery() + .select(SaasProductModuleFeatureRelation::getFeatureId + ,SaasProductModuleFeatureRelation::getProductModuleId + ,SaasProductModuleFeatureRelation::getDictCode + ,SaasProductModuleFeatureRelation::getDictCodeId + , BaseEntity::getId) .in(SaasProductModuleFeatureRelation::getProductModuleId, productIds) .list(); return ApiResult.ok(BeanMapper.copyList(list, ProductFeatureRelationVO.class));