新增版本升级功能

@@ -8,7 +8,9 @@ import com.lego.core.domin.bo.QuestionBo;
 import com.lego.core.domin.bo.QuestionQueryBo;
 import com.lego.core.domin.bo.UpgradeBo;
 import com.lego.core.domin.bo.UpgradeQueryBo;
+import com.lego.core.domin.vo.CourseVo;
 import com.lego.core.domin.vo.QuestionVo;
+import com.lego.core.domin.vo.ResourceVo;
 import com.lego.core.domin.vo.UpgradeVo;
 import com.lego.core.service.IQuestionService;
 import com.lego.core.service.IUpgradeService;
@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.rmi.ServerException;
+import java.util.List;
 
 /**
  * APP升级 信息操作处理
@@ -42,6 +45,16 @@ public class UpgradeController extends BaseController {
         return service.list(query,language);
     }
 
+    @GetMapping("/list/{timestamp}")
+    public R<ResourceVo> list(@PathVariable("timestamp") String timestamp) {
+        if(true) {
+            return R.ok(service.list());
+        }
+        else{
+            return R.fail();
+        }
+    }
+
     /**
      * 新增
      *

@@ -147,6 +147,7 @@ security:
     - /core/entirety/list
     - /core/question/listPage
     - /core/upgrade/listPage
+    - /core/upgrade/list/**
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

+package com.lego.core.domin.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author chentao
+ * @date 2024/12/21
+ */
+@Data
+public class ResourceVo {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 广告
+     */
+    private List<AdvertVo> adverts;
+
+    /**
+     * 套件
+     */
+    private List<EntiretyVo> entiretys;
+
+    /**
+     * 系列
+     */
+    private List<BuildingBlockVo> buildingBlocks;
+
+    /**
+     * 课程
+     */
+    private List<CourseVo> courses;
+
+    /**
+     * 问题
+     */
+    private List<QuestionVo> questions;
+
+}

@@ -8,6 +8,7 @@ import com.lego.core.domin.bo.AdvertBo;
 import com.lego.core.domin.vo.AdvertVo;
 
 import java.rmi.ServerException;
+import java.util.List;
 
 /**
  * 广告Service接口
@@ -21,6 +22,12 @@ public interface IAdvertService {
     TableDataInfo<AdvertVo> list(PageQuery query,String language);
 
     /**
+     * 获取所有广告
+     * @return
+     */
+    List<AdvertVo> list();
+
+    /**
      * 新增
      *
      * @param advertBo

@@ -33,6 +33,13 @@ public interface IBuildingBlockService {
     List<BuildingBlockVo> list(String language);
 
     /**
+     * 获取所有系列
+     *
+     * @return
+     */
+    List<BuildingBlockVo> list();
+
+    /**
      * (根据套件ID)不带分页查询
      *
      * @return

@@ -32,6 +32,13 @@ public interface ICourseService {
     List<CourseVo> list(String buildingBlockId);
 
     /**
+     * 获取所有课程
+     *
+     * @return
+     */
+    List<CourseVo> list();
+
+    /**
      * 课程详情
      *
      * @param id

@@ -35,6 +35,13 @@ public interface IEntiretyService {
     List<EntiretyVo> list(String language);
 
     /**
+     * 获取所有套件
+     *
+     * @return
+     */
+    List<EntiretyVo> list();
+
+    /**
      * 新增
      *
      * @param entiretyBo

 package com.lego.core.service;
 
 
-import com.lego.common.core.domain.PageQuery;
 import com.lego.common.core.page.TableDataInfo;
-import com.lego.core.domin.bo.AdvertBo;
 import com.lego.core.domin.bo.QuestionBo;
 import com.lego.core.domin.bo.QuestionQueryBo;
-import com.lego.core.domin.vo.AdvertVo;
 import com.lego.core.domin.vo.QuestionVo;
 
 import java.rmi.ServerException;
+import java.util.List;
 
 /**
  * 问题MService接口
@@ -22,6 +20,8 @@ public interface IQuestionService {
 
     TableDataInfo<QuestionVo> list(QuestionQueryBo queryBo,String language);
 
+    List<QuestionVo> list();
+
     /**
      * 新增
      *

@@ -6,10 +6,13 @@ import com.lego.core.domin.bo.QuestionBo;
 import com.lego.core.domin.bo.QuestionQueryBo;
 import com.lego.core.domin.bo.UpgradeBo;
 import com.lego.core.domin.bo.UpgradeQueryBo;
+import com.lego.core.domin.vo.CourseVo;
 import com.lego.core.domin.vo.QuestionVo;
+import com.lego.core.domin.vo.ResourceVo;
 import com.lego.core.domin.vo.UpgradeVo;
 
 import java.rmi.ServerException;
+import java.util.List;
 
 /**
  * APP升级Service接口
@@ -18,6 +21,11 @@ import java.rmi.ServerException;
  * @date 2024/9/8 15:24
  */
 public interface IUpgradeService {
+    /**
+     * 新版资源
+     * @return
+     */
+    ResourceVo list();
 
     /**
      * 根据条件搜索

@@ -11,8 +11,12 @@ import com.lego.common.core.service.OssService;
 import com.lego.common.utils.MessageUtils;
 import com.lego.core.annotation.LanguageAnnotation;
 import com.lego.core.domin.Advert;
+import com.lego.core.domin.BuildingBlock;
+import com.lego.core.domin.Entirety;
 import com.lego.core.domin.bo.AdvertBo;
 import com.lego.core.domin.vo.AdvertVo;
+import com.lego.core.domin.vo.BuildingBlockVo;
+import com.lego.core.domin.vo.EntiretyVo;
 import com.lego.core.enums.StatusEnums;
 import com.lego.core.mapper.AdvertMapper;
 import com.lego.core.service.IAdvertService;
@@ -56,6 +60,21 @@ public class AdvertServiceImpl implements IAdvertService {
     }
 
     /**
+     * 获取所有广告
+     * @return
+     */
+    @Override
+    public List<AdvertVo> list() {
+        List<AdvertVo> list = baseMapper.selectVoList(Wrappers.<Advert>lambdaQuery().eq(Advert::getStatus, "1"));
+        for (AdvertVo vo : list) {
+            if (StrUtil.isNotBlank(vo.getOssId())) {
+                vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
+            }
+        }
+        return list;
+    }
+
+    /**
      * 新增
      *
      * @param advertBo

@@ -14,6 +14,7 @@ import com.lego.core.domin.BuildingBlock;
 import com.lego.core.domin.bo.BuildingBlockBo;
 import com.lego.core.domin.bo.BuildingBlockQueryBo;
 import com.lego.core.domin.vo.BuildingBlockVo;
+import com.lego.core.domin.vo.CourseVo;
 import com.lego.core.domin.vo.EntiretyVo;
 import com.lego.core.mapper.BuildingBlockMapper;
 import com.lego.core.service.IBuildingBlockService;
@@ -86,6 +87,22 @@ public class BuildingBlockServiceImpl implements IBuildingBlockService {
     }
 
     /**
+     * 获取所有系列
+     *
+     * @return
+     */
+    @Override
+    public List<BuildingBlockVo> list() {
+        List<BuildingBlockVo> list = baseMapper.selectVoList(null);
+        for (BuildingBlockVo vo : list) {
+            if (StrUtil.isNotBlank(vo.getOssId())) {
+                vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
+            }
+        }
+        return list;
+    }
+
+    /**
      * (根据套件ID)不带分页查询
      *
      * @param language

@@ -110,6 +110,33 @@ public class CourseServiceImpl implements ICourseService {
     }
 
     /**
+     * 获取所有课程
+     * @return
+     */
+    @Override
+    public List<CourseVo> list() {
+        List<CourseVo> list =  baseMapper.selectVoList(null);
+        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()));
+            }
+            if(StrUtil.isNotBlank(vo.getCaseOssId())){
+                vo.setCaseOssUrl(ossUrlService.selectUrlByIds(vo.getCaseOssId()));
+            }
+            if(StrUtil.isNotBlank(vo.getTeachingOssId())){
+                vo.setTeachingOssUrl(ossUrlService.selectUrlByIds(vo.getTeachingOssId()));
+            }
+            if(StrUtil.isNotBlank(vo.getPptOssId())){
+                vo.setPptOssUrl(ossUrlService.selectUrlByIds(vo.getPptOssId()));
+            }
+        }
+        return list;
+    }
+
+    /**
      * 课程详情
      * @param id
      * @return

@@ -101,6 +101,22 @@ public class EntiretyServiceImpl implements IEntiretyService {
     }
 
     /**
+     * 获取所有套件
+     *
+     * @return
+     */
+    @Override
+    public List<EntiretyVo> list() {
+        List<EntiretyVo> list = baseMapper.selectVoList(null);
+        for(EntiretyVo vo:list){
+            if(StrUtil.isNotBlank(vo.getOssId())){
+                vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
+            }
+        }
+        return list;
+    }
+
+    /**
      * 新增
      *
      * @param entiretyBo

@@ -8,6 +8,7 @@ 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.Course;
 import com.lego.core.domin.Question;
 import com.lego.core.domin.bo.QuestionBo;
 import com.lego.core.domin.bo.QuestionQueryBo;
@@ -71,6 +72,38 @@ public class QuestionServiceImpl implements IQuestionService {
     }
 
     /**
+     * 获取所有问题
+     * @return
+     */
+    @Override
+    public List<QuestionVo> list() {
+        List<QuestionVo> list =  baseMapper.selectVoList(Wrappers.<Question>lambdaQuery().eq(Question::getStatus, "1"));
+        for (QuestionVo vo : list) {
+            StringBuilder sb = new StringBuilder();
+            if (StrUtil.equals(vo.getShowAndroid(), "1")) {
+                sb.append("android、");
+            }
+            if (StrUtil.equals(vo.getShowIos(), "1")) {
+                sb.append("IOS、");
+            }
+            if (StrUtil.equals(vo.getShowWindows(), "1")) {
+                sb.append("windows、");
+            }
+            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.getVideoOssId()));
+            }
+        }
+        return list;
+    }
+
+
+    /**
      * 新增
      *
      * @param questionBo

@@ -10,13 +10,15 @@ 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;
+import com.lego.core.domin.Course;
 import com.lego.core.domin.Upgrade;
+import com.lego.core.domin.bo.QuestionQueryBo;
 import com.lego.core.domin.bo.UpgradeBo;
 import com.lego.core.domin.bo.UpgradeQueryBo;
-import com.lego.core.domin.vo.UpgradeVo;
+import com.lego.core.domin.vo.*;
 import com.lego.core.enums.StatusEnums;
 import com.lego.core.mapper.UpgradeMapper;
-import com.lego.core.service.IUpgradeService;
+import com.lego.core.service.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +36,34 @@ import java.util.List;
 public class UpgradeServiceImpl implements IUpgradeService {
     private final UpgradeMapper baseMapper;
     private final OssService ossService;
+    private final IAdvertService advertService;
+    private final IEntiretyService entiretyService;
+    private final IBuildingBlockService buildingBlockService;
+    private final ICourseService courseService;
+    private final IQuestionService questionService;
+
+    @Override
+    public ResourceVo list() {
+        ResourceVo resourceVo = new ResourceVo();
+
+        List<EntiretyVo> entiretys = entiretyService.list();
+        resourceVo.setEntiretys(entiretys);
+
+        List<BuildingBlockVo> buildingBlocks = buildingBlockService.list();
+        resourceVo.setBuildingBlocks(buildingBlocks);
+
+        List<CourseVo> courses = courseService.list();
+
+        List<QuestionVo> questions = questionService.list();
+        resourceVo.setQuestions(questions);
+
+        List<AdvertVo> adverts = advertService.list();
+        resourceVo.setAdverts(adverts);
+
+        resourceVo.setCourses(courses);
+
+        return resourceVo;
+    }
 
     /**
      * 查询列表