增加绝对OSSURL

@@ -40,6 +40,11 @@ public class BuildingBlockVo {
     private String ossId;
 
     /**
+     * 图片URL
+     */
+    private String ossUrl;
+
+    /**
      * 前端APP数据国际化（zh_CN、en_US、ru_RU）
      */
     private String language;

@@ -49,6 +49,11 @@ public class CourseVo {
     private String twoDimensionalUrl;
 
     /**
+     * 2D oss URL
+     */
+    private String twoDimensionalOssUrl;
+
+    /**
      * 2D oss_id
      */
     private String twoDimensionalOssId;
@@ -69,6 +74,11 @@ public class CourseVo {
     private String threeDimensionalOssId;
 
     /**
+     * 3D oss_URL
+     */
+    private String threeDimensionalOssUrl;
+
+    /**
      * 案例OSS_id
      */
     private String caseOssId;

@@ -42,6 +42,11 @@ public class EntiretyVo {
     private String ossId;
 
     /**
+     * 文件URL
+     */
+    private String ossUrl;
+
+    /**
      * 前端APP数据国际化（zh_CN、en_US、ru_RU）
      */
     private String language;

@@ -30,11 +30,21 @@ public class QuestionVo {
     private String coverOssId;
 
     /**
+     * 封面URl
+     */
+    private String coverOssUrl;
+
+    /**
      * 视频 ossId
      */
     private String videoOssId;
 
     /**
+     * 视频URL
+     */
+    private String videoOssUrl;
+
+    /**
      * Android展示状态 0 不展示 1展示
      */
     private String showAndroid;

@@ -28,6 +28,11 @@ public class UpgradeVo {
     private String fileOssId;
 
     /**
+     * 文件地址
+     */
+    private String ossUrl;
+
+    /**
      * 升级包类型 Android IOS windows
      */
     private String platformType;

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.core.annotation.LanguageAnnotation;
@@ -37,6 +38,7 @@ import java.util.Set;
 public class BuildingBlockServiceImpl implements IBuildingBlockService {
     private final BuildingBlockMapper baseMapper;
     private final IEntiretyService entiretyService;
+    private final OssService ossService;
 
     /**
      * 查询所有列表(带分页)
@@ -49,17 +51,24 @@ public class BuildingBlockServiceImpl implements IBuildingBlockService {
         Page<BuildingBlockVo> page = baseMapper.selectVoPage(queryBo.build(), Wrappers.<BuildingBlock>lambdaQuery()
                 .eq(StrUtil.isNotBlank(queryBo.getSearchKey()), BuildingBlock::getName, queryBo.getSearchKey())
                 .eq(BuildingBlock::getLanguage, language));
-        List<BuildingBlockVo> list = page.getRecords();
+        setInfo(page.getRecords());
+        return TableDataInfo.build(page);
+    }
+
+    private void setInfo(List<BuildingBlockVo> list) {
         if (ObjectUtil.isNotEmpty(list)) {
             Set<String> ids = StreamUtils.toSet(list, BuildingBlockVo::getEntiretyId);
             List<EntiretyVo> entiretyList = entiretyService.getListByIds(ids);
             Map<String, EntiretyVo> entiretyMap = StreamUtils.toMap(entiretyList, EntiretyVo::getId, v -> v);
             for (BuildingBlockVo vo : list) {
                 vo.setEntiretyName(entiretyMap.getOrDefault(vo.getEntiretyId(), new EntiretyVo()).getName());
+                if (StrUtil.isNotBlank(vo.getOssId())) {
+                    vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
                 }
             }
-        return TableDataInfo.build(page);
         }
+    }
+
 
     /**
      * 不带分页查询
@@ -68,18 +77,23 @@ public class BuildingBlockServiceImpl implements IBuildingBlockService {
      */
     @Override
     public List<BuildingBlockVo> list(String language) {
-        return baseMapper.selectVoList(Wrappers.<BuildingBlock>lambdaQuery().eq(BuildingBlock::getLanguage, language));
+        List<BuildingBlockVo> list = baseMapper.selectVoList(Wrappers.<BuildingBlock>lambdaQuery().eq(BuildingBlock::getLanguage, language));
+        setInfo(list);
+        return list;
     }
 
     /**
      * (根据套件ID)不带分页查询
+     *
      * @param language
      * @param entiretyIds
      * @return
      */
     @Override
     public List<BuildingBlockVo> list(String language, Collection<String> entiretyIds) {
-        return baseMapper.selectVoList(Wrappers.<BuildingBlock>lambdaQuery().eq(BuildingBlock::getLanguage, language).in(BuildingBlock::getEntiretyId,entiretyIds));
+        List<BuildingBlockVo> list = baseMapper.selectVoList(Wrappers.<BuildingBlock>lambdaQuery().eq(BuildingBlock::getLanguage, language).in(BuildingBlock::getEntiretyId, entiretyIds));
+        setInfo(list);
+        return list;
     }
 
     /**
@@ -131,7 +145,9 @@ public class BuildingBlockServiceImpl implements IBuildingBlockService {
      */
     @Override
     public List<BuildingBlockVo> getListByIds(Collection<String> ids) {
-        return baseMapper.selectVoList(Wrappers.<BuildingBlock>lambdaQuery().in(BuildingBlock::getId, ids));
+        List<BuildingBlockVo> list = baseMapper.selectVoList(Wrappers.<BuildingBlock>lambdaQuery().in(BuildingBlock::getId, ids));
+        setInfo(list);
+        return list;
     }
 
     @Override

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.core.annotation.LanguageAnnotation;
@@ -39,6 +40,7 @@ public class CourseServiceImpl implements ICourseService {
     private final CourseMapper baseMapper;
     private final IBuildingBlockService buildingBlockService;
     private final ISysOssService ossService;
+    private final OssService ossUrlService;
 
     /**
      * 查询所有列表
@@ -58,6 +60,12 @@ public class CourseServiceImpl implements ICourseService {
             Map<String, BuildingBlockVo> blockMap = StreamUtils.toMap(blockList, BuildingBlockVo::getId, v -> v);
             for (CourseVo vo : list) {
                 vo.setBuildingBlockName(blockMap.getOrDefault(vo.getBuildingBlockId(), new BuildingBlockVo()).getName());
+                if(StrUtil.isNotBlank(vo.getTwoDimensionalOssId())){
+                    vo.setTwoDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getTwoDimensionalOssId()));
+                }
+                if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){
+                    vo.setThreeDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getThreeDimensionalOssId()));
+                }
             }
         }
         return TableDataInfo.build(page);
@@ -70,7 +78,16 @@ public class CourseServiceImpl implements ICourseService {
      */
     @Override
     public List<CourseVo> list(String buildingBlockId) {
-        return baseMapper.selectVoList(Wrappers.<Course>lambdaQuery().eq(Course::getBuildingBlockId, buildingBlockId));
+        List<CourseVo> list =  baseMapper.selectVoList(Wrappers.<Course>lambdaQuery().eq(Course::getBuildingBlockId, buildingBlockId));
+        for (CourseVo vo : list) {
+            if(StrUtil.isNotBlank(vo.getTwoDimensionalOssId())){
+                vo.setTwoDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getTwoDimensionalOssId()));
+            }
+            if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){
+                vo.setThreeDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getThreeDimensionalOssId()));
+            }
+        }
+        return list;
     }
 
     /**

@@ -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.core.annotation.LanguageAnnotation;
@@ -32,6 +33,7 @@ import java.util.*;
 @Service
 public class EntiretyServiceImpl implements IEntiretyService {
     private final EntiretyMapper baseMapper;
+    private final OssService ossService;
     private final IBuildingBlockService buildingBlockService;
 
     /**
@@ -50,8 +52,14 @@ public class EntiretyServiceImpl implements IEntiretyService {
         List<EntiretyVo> list = page.getRecords();
         Set<String> BuildingBlockIdList = StreamUtils.toSet(list,EntiretyVo::getId);
         List<BuildingBlockVo> BuildingBlockList = buildingBlockService.list(language, BuildingBlockIdList);
+        for(BuildingBlockVo vo : BuildingBlockList){
+            if(StrUtil.isNotBlank(vo.getOssId())) {
+                vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
+            }
+        }
         Map<String,List<BuildingBlockVo>> buildingBlockMap = StreamUtils.groupByKey(BuildingBlockList,BuildingBlockVo::getEntiretyId);
         for(EntiretyVo vo:list){
+            vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
             vo.setBuildingblockList(buildingBlockMap.get(vo.getId()));
         }
         return TableDataInfo.build(page);
@@ -64,7 +72,20 @@ public class EntiretyServiceImpl implements IEntiretyService {
      */
     @Override
     public List<EntiretyVo> list(String language) {
-        return baseMapper.selectVoList(Wrappers.<Entirety>lambdaQuery().eq(Entirety::getLanguage, language).orderByAsc(Entirety::getSort));
+        List<EntiretyVo> list = baseMapper.selectVoList(Wrappers.<Entirety>lambdaQuery().eq(Entirety::getLanguage, language).orderByAsc(Entirety::getSort));
+        for(EntiretyVo vo:list){
+            if(StrUtil.isNotBlank(vo.getOssId())){
+                vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
+            }
+            List<BuildingBlockVo> buildingBlockVoList = vo.getBuildingblockList();
+            for(BuildingBlockVo blockVo:buildingBlockVoList){
+                if(StrUtil.isNotBlank(blockVo.getOssId())){
+                    blockVo.setOssUrl(ossService.selectUrlByIds(blockVo.getOssId()));
+                }
+            }
+        }
+
+        return list;
     }
 
     /**

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lego.common.core.page.TableDataInfo;
+import com.lego.common.core.service.OssService;
 import com.lego.common.utils.MessageUtils;
 import com.lego.core.annotation.LanguageAnnotation;
 import com.lego.core.domin.Question;
@@ -30,6 +31,7 @@ import java.util.List;
 @Service
 public class QuestionServiceImpl implements IQuestionService {
     private final QuestionMapper baseMapper;
+    private final OssService ossService;
 
     /**
      * 查询列表
@@ -58,6 +60,12 @@ public class QuestionServiceImpl implements IQuestionService {
             if (StrUtil.isNotBlank(sb.toString())) {
                 vo.setShowStr(sb.substring(0, sb.length() - 1));
             }
+            if(StrUtil.isNotBlank(vo.getCoverOssId())){
+                vo.setCoverOssUrl(ossService.selectUrlByIds(vo.getCoverOssId()));
+            }
+            if(StrUtil.isNotBlank(vo.getVideoOssId())){
+                vo.setVideoOssUrl(ossService.selectUrlByIds(vo.getVideoOssUrl()));
+            }
         }
         return TableDataInfo.build(page);
     }

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lego.common.core.page.TableDataInfo;
+import com.lego.common.core.service.OssService;
 import com.lego.common.utils.DateUtils;
 import com.lego.common.utils.MessageUtils;
 import com.lego.core.annotation.LanguageAnnotation;
@@ -20,6 +21,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.rmi.ServerException;
+import java.util.List;
 
 /**
  * APP升级Service业务层处理
@@ -31,6 +33,7 @@ import java.rmi.ServerException;
 @Service
 public class UpgradeServiceImpl implements IUpgradeService {
     private final UpgradeMapper baseMapper;
+    private final OssService ossService;
 
     /**
      * 查询列表
@@ -45,6 +48,12 @@ public class UpgradeServiceImpl implements IUpgradeService {
                         .eq(StrUtil.isNotBlank(query.getFileType()), Upgrade::getFileType, query.getFileType())
                         .eq(StrUtil.isNotBlank(query.getPlatformType()), Upgrade::getPlatformType, query.getPlatformType())
                         .eq(Upgrade::getLanguage, language));
+        List<UpgradeVo> list = page.getRecords();
+        for (UpgradeVo vo : list) {
+            if (StrUtil.isNotBlank(vo.getFileOssId())) {
+                vo.setOssUrl(ossService.selectUrlByIds(vo.getFileOssId()));
+            }
+        }
         return TableDataInfo.build(page);
     }