Skip to content

legobackend / lego-manage

Go to a project
Toggle navigation
Toggle navigation pinning
a6694ad7 by chentao
Options

no message

1 parent 9577d9a9
Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
lego-core/src/main/java/com/lego/core/service/impl/EntiretyServiceImpl.java
...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; ...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7 import com.lego.common.core.domain.PageQuery; 7 import com.lego.common.core.domain.PageQuery;
8 import com.lego.common.core.page.TableDataInfo; 8 import com.lego.common.core.page.TableDataInfo;
9 import com.lego.common.core.service.OssService;
9 import com.lego.common.utils.MessageUtils; 10 import com.lego.common.utils.MessageUtils;
10 import com.lego.common.utils.StreamUtils; 11 import com.lego.common.utils.StreamUtils;
11 import com.lego.common.utils.spring.SpringUtils; 12 import com.lego.common.utils.spring.SpringUtils;
...@@ -43,6 +44,7 @@ public class EntiretyServiceImpl implements IEntiretyService { ...@@ -43,6 +44,7 @@ public class EntiretyServiceImpl implements IEntiretyService {
43 private final EntiretyMapper baseMapper; 44 private final EntiretyMapper baseMapper;
44 private final BuildingBlockMapper buildingBlockMapper; 45 private final BuildingBlockMapper buildingBlockMapper;
45 private final ISysOssService iSysOssService; 46 private final ISysOssService iSysOssService;
47 private final OssService ossUrlService;
46 48
47 public IBuildingBlockService getBuildingBlockService() { 49 public IBuildingBlockService getBuildingBlockService() {
48 return SpringUtils.getBean(IBuildingBlockService.class); 50 return SpringUtils.getBean(IBuildingBlockService.class);
...@@ -68,15 +70,13 @@ public class EntiretyServiceImpl implements IEntiretyService { ...@@ -68,15 +70,13 @@ public class EntiretyServiceImpl implements IEntiretyService {
68 List<BuildingBlockVo> buildingBlockList = getBuildingBlockService().list(language, buildingBlockIdList); 70 List<BuildingBlockVo> buildingBlockList = getBuildingBlockService().list(language, buildingBlockIdList);
69 for(BuildingBlockVo vo : buildingBlockList){ 71 for(BuildingBlockVo vo : buildingBlockList){
70 if(StrUtil.isNotBlank(vo.getOssId())) { 72 if(StrUtil.isNotBlank(vo.getOssId())) {
71 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getOssId())); 73 vo.setOssUrl(ossUrlService.selectUrlByIds(vo.getOssId()));
72 vo.setOssUrl(oss.getUrl());
73 } 74 }
74 } 75 }
75 Map<String,List<BuildingBlockVo>> buildingBlockMap = StreamUtils.groupByKey(buildingBlockList,BuildingBlockVo::getEntiretyId); 76 Map<String,List<BuildingBlockVo>> buildingBlockMap = StreamUtils.groupByKey(buildingBlockList,BuildingBlockVo::getEntiretyId);
76 for(EntiretyVo vo:list){ 77 for(EntiretyVo vo:list){
77 if(StrUtil.isNotBlank(vo.getOssId())) { 78 if(StrUtil.isNotBlank(vo.getOssId())) {
78 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getOssId())); 79 vo.setOssUrl(ossUrlService.selectUrlByIds(vo.getOssId()));
79 vo.setOssUrl(oss.getUrl());
80 } 80 }
81 vo.setBuildingblockList(buildingBlockMap.get(vo.getId())); 81 vo.setBuildingblockList(buildingBlockMap.get(vo.getId()));
82 } 82 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!