a6694ad7 by chentao

no message

1 parent 9577d9a9
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lego.common.core.domain.PageQuery;
import com.lego.common.core.page.TableDataInfo;
import com.lego.common.core.service.OssService;
import com.lego.common.utils.MessageUtils;
import com.lego.common.utils.StreamUtils;
import com.lego.common.utils.spring.SpringUtils;
......@@ -43,6 +44,7 @@ public class EntiretyServiceImpl implements IEntiretyService {
private final EntiretyMapper baseMapper;
private final BuildingBlockMapper buildingBlockMapper;
private final ISysOssService iSysOssService;
private final OssService ossUrlService;
public IBuildingBlockService getBuildingBlockService() {
return SpringUtils.getBean(IBuildingBlockService.class);
......@@ -68,15 +70,13 @@ public class EntiretyServiceImpl implements IEntiretyService {
List<BuildingBlockVo> buildingBlockList = getBuildingBlockService().list(language, buildingBlockIdList);
for(BuildingBlockVo vo : buildingBlockList){
if(StrUtil.isNotBlank(vo.getOssId())) {
SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getOssId()));
vo.setOssUrl(oss.getUrl());
vo.setOssUrl(ossUrlService.selectUrlByIds(vo.getOssId()));
}
}
Map<String,List<BuildingBlockVo>> buildingBlockMap = StreamUtils.groupByKey(buildingBlockList,BuildingBlockVo::getEntiretyId);
for(EntiretyVo vo:list){
if(StrUtil.isNotBlank(vo.getOssId())) {
SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getOssId()));
vo.setOssUrl(oss.getUrl());
vo.setOssUrl(ossUrlService.selectUrlByIds(vo.getOssId()));
}
vo.setBuildingblockList(buildingBlockMap.get(vo.getId()));
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!