wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

terminals使用数组

Browse Source
This commit is contained in:
lvshaohua 2024-04-16 13:50:58 +08:00
parent e2a4600e50
commit f8aa4b70ef
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tyr-api/src/main/java/cn/axzo/tyr/client/model/req/GetFeatureResourceTreeReq.java
View File

@ -20,7 +20,7 @@ public class GetFeatureResourceTreeReq {
private String keyword; private String keyword;
/** 端 **/ /** 端 **/
private String terminal; private List<String> terminals;
/** 展示状态 默认不传返回全部 0-隐藏 1-显示 **/ /** 展示状态 默认不传返回全部 0-隐藏 1-显示 **/
private Integer status; private Integer status;

2
tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureResourceDao.java
View File

@ -37,7 +37,7 @@ public class SaasFeatureResourceDao extends ServiceImpl<SaasFeatureResourceMappe
SaasFeatureResource::getTerminal, SaasFeatureResource::getParentId, SaasFeatureResource::getTerminal, SaasFeatureResource::getParentId,
SaasFeatureResource::getDisplayOrder) SaasFeatureResource::getDisplayOrder)
.eq(SaasFeatureResource::getIsDelete, TableIsDeleteEnum.NORMAL.value) .eq(SaasFeatureResource::getIsDelete, TableIsDeleteEnum.NORMAL.value)
.eq(StringUtils.isNotBlank(req.getTerminal()), SaasFeatureResource::getTerminal, req.getTerminal()) .in(CollectionUtils.isNotEmpty(req.getTerminals()), SaasFeatureResource::getTerminal, req.getTerminals())
.eq(Objects.nonNull(req.getStatus()), SaasFeatureResource::getStatus, req.getStatus()) .eq(Objects.nonNull(req.getStatus()), SaasFeatureResource::getStatus, req.getStatus())
.in(CollectionUtils.isNotEmpty(req.getFeatureTypes()), SaasFeatureResource::getFeatureType, req.getFeatureTypes()) .in(CollectionUtils.isNotEmpty(req.getFeatureTypes()), SaasFeatureResource::getFeatureType, req.getFeatureTypes())
.list(); .list();

2
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceCacheService.java
View File

@ -23,7 +23,7 @@ public class SaasFeatureResourceCacheService {
private final SaasFeatureResourceDao featureResourceDao; private final SaasFeatureResourceDao featureResourceDao;
@Cacheable(value = CACHE_FEATURE_RESOURCE_TREE, key = "#req.keyword + '_' + #req.terminal+ '_' + #req.featureTypes", unless = "#result.isEmpty()") @Cacheable(value = CACHE_FEATURE_RESOURCE_TREE, key = "#req.keyword + '_' + #req.terminals+ '_' + #req.featureTypes", unless = "#result.isEmpty()")
public List<SaasFeatureResource> getByResourceTreeParam (GetFeatureResourceTreeReq req) { public List<SaasFeatureResource> getByResourceTreeParam (GetFeatureResourceTreeReq req) {
log.info("get feature resource tree has not user cache!"); log.info("get feature resource tree has not user cache!");
return featureResourceDao.getByResourceTreeParam(req); return featureResourceDao.getByResourceTreeParam(req);