feat(AI资源广场): Skill资源相关功能开发
获取Skill资源列表时接口不返回Skill详情(Skill.md和Skill文件树),只有在查询Skill资源详情时才返回
This commit is contained in:
parent
5a55ea027b
commit
9f42c51a5f
|
|
@ -105,17 +105,17 @@ public class ZoneResourceServiceImpl implements IZoneResourceService {
|
|||
@DataScope(deptAlias = "zr")
|
||||
public GenericsTableDataInfo<ZoneResourceDataVo> selectZoneResourceList(ZoneResource zoneResourceSearch) {
|
||||
List<ZoneResource> zoneResourceList = zoneResourceMapper.selectZoneResourceList(zoneResourceSearch);
|
||||
return PageUtils.toPage(zoneResourceList, this::zoneResourceToData);
|
||||
return PageUtils.toPage(zoneResourceList, z -> zoneResourceToData(z, true));
|
||||
}
|
||||
|
||||
@Override
|
||||
@DataScope(deptAlias = "zr")
|
||||
public GenericsTableDataInfo<ZoneResourceDataVo> selectZoneResourceList(ZoneResourceOpenSearchVo zoneResourceSearchVo) {
|
||||
List<ZoneResource> zoneResourceList = zoneResourceMapper.selectZoneResourceListBySearchVo(zoneResourceSearchVo);
|
||||
return PageUtils.toPage(zoneResourceList, this::zoneResourceToData);
|
||||
return PageUtils.toPage(zoneResourceList, z -> zoneResourceToData(z, true));
|
||||
}
|
||||
|
||||
private ZoneResourceDataVo zoneResourceToData(ZoneResource zoneResource) {
|
||||
private ZoneResourceDataVo zoneResourceToData(ZoneResource zoneResource, boolean removeSkill) {
|
||||
ZoneResourceDataVo zoneResourceDataVo = zoneResource.toZoneResourceDataVo();
|
||||
int downloadCount = 0;
|
||||
if (StringUtils.isNotEmpty(zoneResource.getFileIds())) {
|
||||
|
|
@ -154,6 +154,9 @@ public class ZoneResourceServiceImpl implements IZoneResourceService {
|
|||
}
|
||||
}
|
||||
zoneResourceDataVo.setDownloadCount(downloadCount);
|
||||
if (removeSkill && zoneResourceDataVo.getExtendData() != null) {
|
||||
zoneResourceDataVo.getExtendData().remove("skill");
|
||||
}
|
||||
return zoneResourceDataVo;
|
||||
}
|
||||
|
||||
|
|
@ -265,7 +268,7 @@ public class ZoneResourceServiceImpl implements IZoneResourceService {
|
|||
public ZoneResourceDataVo selectOpenZoneResourceDataById(Long resourceId, HttpServletRequest request) {
|
||||
ZoneResource zoneResource = selectZoneResourceById(resourceId);
|
||||
if (ZoneConstants.RESOURCE_AUDIT_PASS.equals(zoneResource.getAuditStatus())) {
|
||||
return zoneResourceToData(zoneResource);
|
||||
return zoneResourceToData(zoneResource, false);
|
||||
} else {
|
||||
String gitLinkToken = AuthUtil.getGitLinkRequestToken(request);
|
||||
if (StringUtils.isNotEmpty(gitLinkToken)) {
|
||||
|
|
@ -273,7 +276,7 @@ public class ZoneResourceServiceImpl implements IZoneResourceService {
|
|||
remoteUserService.getUserNameByGitLinkToken(gitLinkToken, SecurityConstants.INNER)
|
||||
);
|
||||
if (zoneResource.getCreateBy().equals(currentUsername)) {
|
||||
return zoneResourceToData(zoneResource);
|
||||
return zoneResourceToData(zoneResource, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -287,7 +290,7 @@ public class ZoneResourceServiceImpl implements IZoneResourceService {
|
|||
throw new ServiceException("获取我的资源列表时必须传入专区Id");
|
||||
}
|
||||
List<ZoneResource> zoneResourceList = zoneResourceMapper.selectZoneResourceList(zoneResourceSearch);
|
||||
return PageUtils.toPage(zoneResourceList, this::zoneResourceToData);
|
||||
return PageUtils.toPage(zoneResourceList, x->zoneResourceToData(zoneResourceSearch, true));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -412,7 +415,7 @@ public class ZoneResourceServiceImpl implements IZoneResourceService {
|
|||
@Override
|
||||
public ZoneResourceDataVo selectZoneResourceDataById(Long id) {
|
||||
ZoneResource zoneResource = selectZoneResourceById(id);
|
||||
return zoneResourceToData(zoneResource);
|
||||
return zoneResourceToData(zoneResource, false);
|
||||
}
|
||||
|
||||
// ==================== AI资源广场 Skill 功能 ====================
|
||||
|
|
@ -440,14 +443,14 @@ public class ZoneResourceServiceImpl implements IZoneResourceService {
|
|||
@Override
|
||||
public ZoneResourceDataVo selectAiSkillResourceById(Long id) {
|
||||
ZoneResource resource = getAiResourceById(id);
|
||||
return zoneResourceToData(resource);
|
||||
return zoneResourceToData(resource,false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public GenericsTableDataInfo<ZoneResourceDataVo> selectAiSkillResourceList(ZoneResource zoneResource) {
|
||||
zoneResource.setResourceCategory(AiResourceType.SKILL.getCode());
|
||||
List<ZoneResource> list = zoneResourceMapper.selectZoneResourceList(zoneResource);
|
||||
return PageUtils.toPage(list, this::zoneResourceToData);
|
||||
return PageUtils.toPage(list, x->zoneResourceToData(zoneResource,true));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -499,7 +502,7 @@ public class ZoneResourceServiceImpl implements IZoneResourceService {
|
|||
public List<ZoneResourceDataVo> selectSkillRecommendations(int limit) {
|
||||
List<ZoneResource> list = zoneResourceMapper.selectSkillRecommendations(
|
||||
AiResourceType.SKILL.getCode(), ZoneConstants.RESOURCE_AUDIT_PASS, limit);
|
||||
return list.stream().map(this::zoneResourceToData).collect(Collectors.toList());
|
||||
return list.stream().map(z -> zoneResourceToData(z, false)).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
Loading…
Reference in New Issue