Skip to content

legobackend / lego-manage

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

新增版本升级功能

1 parent 6302b5e8
Inline Side-by-side
Showing 15 changed files with 236 additions and 5 deletions
lego-admin/src/main/java/com/lego/web/controller/core/UpgradeController.java
...@@ -8,7 +8,9 @@ import com.lego.core.domin.bo.QuestionBo; ...@@ -8,7 +8,9 @@ import com.lego.core.domin.bo.QuestionBo;
8 import com.lego.core.domin.bo.QuestionQueryBo; 8 import com.lego.core.domin.bo.QuestionQueryBo;
9 import com.lego.core.domin.bo.UpgradeBo; 9 import com.lego.core.domin.bo.UpgradeBo;
10 import com.lego.core.domin.bo.UpgradeQueryBo; 10 import com.lego.core.domin.bo.UpgradeQueryBo;
11 import com.lego.core.domin.vo.CourseVo;
11 import com.lego.core.domin.vo.QuestionVo; 12 import com.lego.core.domin.vo.QuestionVo;
13 import com.lego.core.domin.vo.ResourceVo;
12 import com.lego.core.domin.vo.UpgradeVo; 14 import com.lego.core.domin.vo.UpgradeVo;
13 import com.lego.core.service.IQuestionService; 15 import com.lego.core.service.IQuestionService;
14 import com.lego.core.service.IUpgradeService; 16 import com.lego.core.service.IUpgradeService;
...@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
17 19
18 import javax.servlet.http.HttpServletRequest; 20 import javax.servlet.http.HttpServletRequest;
19 import java.rmi.ServerException; 21 import java.rmi.ServerException;
22 import java.util.List;
20 23
21 /** 24 /**
22 * APP升级 信息操作处理 25 * APP升级 信息操作处理
...@@ -42,6 +45,16 @@ public class UpgradeController extends BaseController { ...@@ -42,6 +45,16 @@ public class UpgradeController extends BaseController {
42 return service.list(query,language); 45 return service.list(query,language);
43 } 46 }
44 47
48 @GetMapping("/list/{timestamp}")
49 public R<ResourceVo> list(@PathVariable("timestamp") String timestamp) {
50 if(true) {
51 return R.ok(service.list());
52 }
53 else{
54 return R.fail();
55 }
56 }
57
45 /** 58 /**
46 * 新增 59 * 新增
47 * 60 *
......
lego-admin/src/main/resources/application.yml
...@@ -147,6 +147,7 @@ security: ...@@ -147,6 +147,7 @@ security:
147 - /core/entirety/list 147 - /core/entirety/list
148 - /core/question/listPage 148 - /core/question/listPage
149 - /core/upgrade/listPage 149 - /core/upgrade/listPage
150 - /core/upgrade/list/**
150 151
151 # MyBatisPlus配置 152 # MyBatisPlus配置
152 # https://baomidou.com/config/ 153 # https://baomidou.com/config/
......
lego-core/src/main/java/com/lego/core/domin/vo/ResourceVo.java 0 → 100644
1 package com.lego.core.domin.vo;
2
3 import lombok.Data;
4
5 import java.util.List;
6
7 /**
8 * @author chentao
9 * @date 2024/12/21
10 */
11 @Data
12 public class ResourceVo {
13 private static final long serialVersionUID = 1L;
14 /**
15 * 广告
16 */
17 private List<AdvertVo> adverts;
18
19 /**
20 * 套件
21 */
22 private List<EntiretyVo> entiretys;
23
24 /**
25 * 系列
26 */
27 private List<BuildingBlockVo> buildingBlocks;
28
29 /**
30 * 课程
31 */
32 private List<CourseVo> courses;
33
34 /**
35 * 问题
36 */
37 private List<QuestionVo> questions;
38
39 }
lego-core/src/main/java/com/lego/core/service/IAdvertService.java
...@@ -8,6 +8,7 @@ import com.lego.core.domin.bo.AdvertBo; ...@@ -8,6 +8,7 @@ import com.lego.core.domin.bo.AdvertBo;
8 import com.lego.core.domin.vo.AdvertVo; 8 import com.lego.core.domin.vo.AdvertVo;
9 9
10 import java.rmi.ServerException; 10 import java.rmi.ServerException;
11 import java.util.List;
11 12
12 /** 13 /**
13 * 广告Service接口 14 * 广告Service接口
...@@ -21,6 +22,12 @@ public interface IAdvertService { ...@@ -21,6 +22,12 @@ public interface IAdvertService {
21 TableDataInfo<AdvertVo> list(PageQuery query,String language); 22 TableDataInfo<AdvertVo> list(PageQuery query,String language);
22 23
23 /** 24 /**
25 * 获取所有广告
26 * @return
27 */
28 List<AdvertVo> list();
29
30 /**
24 * 新增 31 * 新增
25 * 32 *
26 * @param advertBo 33 * @param advertBo
......
lego-core/src/main/java/com/lego/core/service/IBuildingBlockService.java
...@@ -33,6 +33,13 @@ public interface IBuildingBlockService { ...@@ -33,6 +33,13 @@ public interface IBuildingBlockService {
33 List<BuildingBlockVo> list(String language); 33 List<BuildingBlockVo> list(String language);
34 34
35 /** 35 /**
36 * 获取所有系列
37 *
38 * @return
39 */
40 List<BuildingBlockVo> list();
41
42 /**
36 * (根据套件ID)不带分页查询 43 * (根据套件ID)不带分页查询
37 * 44 *
38 * @return 45 * @return
......
lego-core/src/main/java/com/lego/core/service/ICourseService.java
...@@ -32,6 +32,13 @@ public interface ICourseService { ...@@ -32,6 +32,13 @@ public interface ICourseService {
32 List<CourseVo> list(String buildingBlockId); 32 List<CourseVo> list(String buildingBlockId);
33 33
34 /** 34 /**
35 * 获取所有课程
36 *
37 * @return
38 */
39 List<CourseVo> list();
40
41 /**
35 * 课程详情 42 * 课程详情
36 * 43 *
37 * @param id 44 * @param id
......
lego-core/src/main/java/com/lego/core/service/IEntiretyService.java
...@@ -35,6 +35,13 @@ public interface IEntiretyService { ...@@ -35,6 +35,13 @@ public interface IEntiretyService {
35 List<EntiretyVo> list(String language); 35 List<EntiretyVo> list(String language);
36 36
37 /** 37 /**
38 * 获取所有套件
39 *
40 * @return
41 */
42 List<EntiretyVo> list();
43
44 /**
38 * 新增 45 * 新增
39 * 46 *
40 * @param entiretyBo 47 * @param entiretyBo
......
lego-core/src/main/java/com/lego/core/service/IQuestionService.java
1 package com.lego.core.service; 1 package com.lego.core.service;
2 2
3 3
4 import com.lego.common.core.domain.PageQuery;
5 import com.lego.common.core.page.TableDataInfo; 4 import com.lego.common.core.page.TableDataInfo;
6 import com.lego.core.domin.bo.AdvertBo;
7 import com.lego.core.domin.bo.QuestionBo; 5 import com.lego.core.domin.bo.QuestionBo;
8 import com.lego.core.domin.bo.QuestionQueryBo; 6 import com.lego.core.domin.bo.QuestionQueryBo;
9 import com.lego.core.domin.vo.AdvertVo;
10 import com.lego.core.domin.vo.QuestionVo; 7 import com.lego.core.domin.vo.QuestionVo;
11 8
12 import java.rmi.ServerException; 9 import java.rmi.ServerException;
10 import java.util.List;
13 11
14 /** 12 /**
15 * 问题MService接口 13 * 问题MService接口
...@@ -22,6 +20,8 @@ public interface IQuestionService { ...@@ -22,6 +20,8 @@ public interface IQuestionService {
22 20
23 TableDataInfo<QuestionVo> list(QuestionQueryBo queryBo,String language); 21 TableDataInfo<QuestionVo> list(QuestionQueryBo queryBo,String language);
24 22
23 List<QuestionVo> list();
24
25 /** 25 /**
26 * 新增 26 * 新增
27 * 27 *
......
lego-core/src/main/java/com/lego/core/service/IUpgradeService.java
...@@ -6,10 +6,13 @@ import com.lego.core.domin.bo.QuestionBo; ...@@ -6,10 +6,13 @@ import com.lego.core.domin.bo.QuestionBo;
6 import com.lego.core.domin.bo.QuestionQueryBo; 6 import com.lego.core.domin.bo.QuestionQueryBo;
7 import com.lego.core.domin.bo.UpgradeBo; 7 import com.lego.core.domin.bo.UpgradeBo;
8 import com.lego.core.domin.bo.UpgradeQueryBo; 8 import com.lego.core.domin.bo.UpgradeQueryBo;
9 import com.lego.core.domin.vo.CourseVo;
9 import com.lego.core.domin.vo.QuestionVo; 10 import com.lego.core.domin.vo.QuestionVo;
11 import com.lego.core.domin.vo.ResourceVo;
10 import com.lego.core.domin.vo.UpgradeVo; 12 import com.lego.core.domin.vo.UpgradeVo;
11 13
12 import java.rmi.ServerException; 14 import java.rmi.ServerException;
15 import java.util.List;
13 16
14 /** 17 /**
15 * APP升级Service接口 18 * APP升级Service接口
...@@ -18,6 +21,11 @@ import java.rmi.ServerException; ...@@ -18,6 +21,11 @@ import java.rmi.ServerException;
18 * @date 2024/9/8 15:24 21 * @date 2024/9/8 15:24
19 */ 22 */
20 public interface IUpgradeService { 23 public interface IUpgradeService {
24 /**
25 * 新版资源
26 * @return
27 */
28 ResourceVo list();
21 29
22 /** 30 /**
23 * 根据条件搜索 31 * 根据条件搜索
......
lego-core/src/main/java/com/lego/core/service/impl/AdvertServiceImpl.java
...@@ -11,8 +11,12 @@ import com.lego.common.core.service.OssService; ...@@ -11,8 +11,12 @@ import com.lego.common.core.service.OssService;
11 import com.lego.common.utils.MessageUtils; 11 import com.lego.common.utils.MessageUtils;
12 import com.lego.core.annotation.LanguageAnnotation; 12 import com.lego.core.annotation.LanguageAnnotation;
13 import com.lego.core.domin.Advert; 13 import com.lego.core.domin.Advert;
14 import com.lego.core.domin.BuildingBlock;
15 import com.lego.core.domin.Entirety;
14 import com.lego.core.domin.bo.AdvertBo; 16 import com.lego.core.domin.bo.AdvertBo;
15 import com.lego.core.domin.vo.AdvertVo; 17 import com.lego.core.domin.vo.AdvertVo;
18 import com.lego.core.domin.vo.BuildingBlockVo;
19 import com.lego.core.domin.vo.EntiretyVo;
16 import com.lego.core.enums.StatusEnums; 20 import com.lego.core.enums.StatusEnums;
17 import com.lego.core.mapper.AdvertMapper; 21 import com.lego.core.mapper.AdvertMapper;
18 import com.lego.core.service.IAdvertService; 22 import com.lego.core.service.IAdvertService;
...@@ -56,6 +60,21 @@ public class AdvertServiceImpl implements IAdvertService { ...@@ -56,6 +60,21 @@ public class AdvertServiceImpl implements IAdvertService {
56 } 60 }
57 61
58 /** 62 /**
63 * 获取所有广告
64 * @return
65 */
66 @Override
67 public List<AdvertVo> list() {
68 List<AdvertVo> list = baseMapper.selectVoList(Wrappers.<Advert>lambdaQuery().eq(Advert::getStatus, "1"));
69 for (AdvertVo vo : list) {
70 if (StrUtil.isNotBlank(vo.getOssId())) {
71 vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
72 }
73 }
74 return list;
75 }
76
77 /**
59 * 新增 78 * 新增
60 * 79 *
61 * @param advertBo 80 * @param advertBo
......
lego-core/src/main/java/com/lego/core/service/impl/BuildingBlockServiceImpl.java
...@@ -14,6 +14,7 @@ import com.lego.core.domin.BuildingBlock; ...@@ -14,6 +14,7 @@ import com.lego.core.domin.BuildingBlock;
14 import com.lego.core.domin.bo.BuildingBlockBo; 14 import com.lego.core.domin.bo.BuildingBlockBo;
15 import com.lego.core.domin.bo.BuildingBlockQueryBo; 15 import com.lego.core.domin.bo.BuildingBlockQueryBo;
16 import com.lego.core.domin.vo.BuildingBlockVo; 16 import com.lego.core.domin.vo.BuildingBlockVo;
17 import com.lego.core.domin.vo.CourseVo;
17 import com.lego.core.domin.vo.EntiretyVo; 18 import com.lego.core.domin.vo.EntiretyVo;
18 import com.lego.core.mapper.BuildingBlockMapper; 19 import com.lego.core.mapper.BuildingBlockMapper;
19 import com.lego.core.service.IBuildingBlockService; 20 import com.lego.core.service.IBuildingBlockService;
...@@ -86,6 +87,22 @@ public class BuildingBlockServiceImpl implements IBuildingBlockService { ...@@ -86,6 +87,22 @@ public class BuildingBlockServiceImpl implements IBuildingBlockService {
86 } 87 }
87 88
88 /** 89 /**
90 * 获取所有系列
91 *
92 * @return
93 */
94 @Override
95 public List<BuildingBlockVo> list() {
96 List<BuildingBlockVo> list = baseMapper.selectVoList(null);
97 for (BuildingBlockVo vo : list) {
98 if (StrUtil.isNotBlank(vo.getOssId())) {
99 vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
100 }
101 }
102 return list;
103 }
104
105 /**
89 * (根据套件ID)不带分页查询 106 * (根据套件ID)不带分页查询
90 * 107 *
91 * @param language 108 * @param language
......
lego-core/src/main/java/com/lego/core/service/impl/CourseServiceImpl.java
...@@ -110,6 +110,33 @@ public class CourseServiceImpl implements ICourseService { ...@@ -110,6 +110,33 @@ public class CourseServiceImpl implements ICourseService {
110 } 110 }
111 111
112 /** 112 /**
113 * 获取所有课程
114 * @return
115 */
116 @Override
117 public List<CourseVo> list() {
118 List<CourseVo> list = baseMapper.selectVoList(null);
119 for (CourseVo vo : list) {
120 if(StrUtil.isNotBlank(vo.getTwoDimensionalOssId())){
121 vo.setTwoDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getTwoDimensionalOssId()));
122 }
123 if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){
124 vo.setThreeDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getThreeDimensionalOssId()));
125 }
126 if(StrUtil.isNotBlank(vo.getCaseOssId())){
127 vo.setCaseOssUrl(ossUrlService.selectUrlByIds(vo.getCaseOssId()));
128 }
129 if(StrUtil.isNotBlank(vo.getTeachingOssId())){
130 vo.setTeachingOssUrl(ossUrlService.selectUrlByIds(vo.getTeachingOssId()));
131 }
132 if(StrUtil.isNotBlank(vo.getPptOssId())){
133 vo.setPptOssUrl(ossUrlService.selectUrlByIds(vo.getPptOssId()));
134 }
135 }
136 return list;
137 }
138
139 /**
113 * 课程详情 140 * 课程详情
114 * @param id 141 * @param id
115 * @return 142 * @return
......
lego-core/src/main/java/com/lego/core/service/impl/EntiretyServiceImpl.java
...@@ -101,6 +101,22 @@ public class EntiretyServiceImpl implements IEntiretyService { ...@@ -101,6 +101,22 @@ public class EntiretyServiceImpl implements IEntiretyService {
101 } 101 }
102 102
103 /** 103 /**
104 * 获取所有套件
105 *
106 * @return
107 */
108 @Override
109 public List<EntiretyVo> list() {
110 List<EntiretyVo> list = baseMapper.selectVoList(null);
111 for(EntiretyVo vo:list){
112 if(StrUtil.isNotBlank(vo.getOssId())){
113 vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
114 }
115 }
116 return list;
117 }
118
119 /**
104 * 新增 120 * 新增
105 * 121 *
106 * @param entiretyBo 122 * @param entiretyBo
......
lego-core/src/main/java/com/lego/core/service/impl/QuestionServiceImpl.java
...@@ -8,6 +8,7 @@ import com.lego.common.core.page.TableDataInfo; ...@@ -8,6 +8,7 @@ import com.lego.common.core.page.TableDataInfo;
8 import com.lego.common.core.service.OssService; 8 import com.lego.common.core.service.OssService;
9 import com.lego.common.utils.MessageUtils; 9 import com.lego.common.utils.MessageUtils;
10 import com.lego.core.annotation.LanguageAnnotation; 10 import com.lego.core.annotation.LanguageAnnotation;
11 import com.lego.core.domin.Course;
11 import com.lego.core.domin.Question; 12 import com.lego.core.domin.Question;
12 import com.lego.core.domin.bo.QuestionBo; 13 import com.lego.core.domin.bo.QuestionBo;
13 import com.lego.core.domin.bo.QuestionQueryBo; 14 import com.lego.core.domin.bo.QuestionQueryBo;
...@@ -71,6 +72,38 @@ public class QuestionServiceImpl implements IQuestionService { ...@@ -71,6 +72,38 @@ public class QuestionServiceImpl implements IQuestionService {
71 } 72 }
72 73
73 /** 74 /**
75 * 获取所有问题
76 * @return
77 */
78 @Override
79 public List<QuestionVo> list() {
80 List<QuestionVo> list = baseMapper.selectVoList(Wrappers.<Question>lambdaQuery().eq(Question::getStatus, "1"));
81 for (QuestionVo vo : list) {
82 StringBuilder sb = new StringBuilder();
83 if (StrUtil.equals(vo.getShowAndroid(), "1")) {
84 sb.append("android、");
85 }
86 if (StrUtil.equals(vo.getShowIos(), "1")) {
87 sb.append("IOS、");
88 }
89 if (StrUtil.equals(vo.getShowWindows(), "1")) {
90 sb.append("windows、");
91 }
92 if (StrUtil.isNotBlank(sb.toString())) {
93 vo.setShowStr(sb.substring(0, sb.length() - 1));
94 }
95 if(StrUtil.isNotBlank(vo.getCoverOssId())){
96 vo.setCoverOssUrl(ossService.selectUrlByIds(vo.getCoverOssId()));
97 }
98 if(StrUtil.isNotBlank(vo.getVideoOssId())){
99 vo.setVideoOssUrl(ossService.selectUrlByIds(vo.getVideoOssId()));
100 }
101 }
102 return list;
103 }
104
105
106 /**
74 * 新增 107 * 新增
75 * 108 *
76 * @param questionBo 109 * @param questionBo
......
lego-core/src/main/java/com/lego/core/service/impl/UpgradeServiceImpl.java
...@@ -10,13 +10,15 @@ import com.lego.common.core.service.OssService; ...@@ -10,13 +10,15 @@ import com.lego.common.core.service.OssService;
10 import com.lego.common.utils.DateUtils; 10 import com.lego.common.utils.DateUtils;
11 import com.lego.common.utils.MessageUtils; 11 import com.lego.common.utils.MessageUtils;
12 import com.lego.core.annotation.LanguageAnnotation; 12 import com.lego.core.annotation.LanguageAnnotation;
13 import com.lego.core.domin.Course;
13 import com.lego.core.domin.Upgrade; 14 import com.lego.core.domin.Upgrade;
15 import com.lego.core.domin.bo.QuestionQueryBo;
14 import com.lego.core.domin.bo.UpgradeBo; 16 import com.lego.core.domin.bo.UpgradeBo;
15 import com.lego.core.domin.bo.UpgradeQueryBo; 17 import com.lego.core.domin.bo.UpgradeQueryBo;
16 import com.lego.core.domin.vo.UpgradeVo; 18 import com.lego.core.domin.vo.*;
17 import com.lego.core.enums.StatusEnums; 19 import com.lego.core.enums.StatusEnums;
18 import com.lego.core.mapper.UpgradeMapper; 20 import com.lego.core.mapper.UpgradeMapper;
19 import com.lego.core.service.IUpgradeService; 21 import com.lego.core.service.*;
20 import lombok.RequiredArgsConstructor; 22 import lombok.RequiredArgsConstructor;
21 import org.springframework.stereotype.Service; 23 import org.springframework.stereotype.Service;
22 24
...@@ -34,6 +36,34 @@ import java.util.List; ...@@ -34,6 +36,34 @@ import java.util.List;
34 public class UpgradeServiceImpl implements IUpgradeService { 36 public class UpgradeServiceImpl implements IUpgradeService {
35 private final UpgradeMapper baseMapper; 37 private final UpgradeMapper baseMapper;
36 private final OssService ossService; 38 private final OssService ossService;
39 private final IAdvertService advertService;
40 private final IEntiretyService entiretyService;
41 private final IBuildingBlockService buildingBlockService;
42 private final ICourseService courseService;
43 private final IQuestionService questionService;
44
45 @Override
46 public ResourceVo list() {
47 ResourceVo resourceVo = new ResourceVo();
48
49 List<EntiretyVo> entiretys = entiretyService.list();
50 resourceVo.setEntiretys(entiretys);
51
52 List<BuildingBlockVo> buildingBlocks = buildingBlockService.list();
53 resourceVo.setBuildingBlocks(buildingBlocks);
54
55 List<CourseVo> courses = courseService.list();
56
57 List<QuestionVo> questions = questionService.list();
58 resourceVo.setQuestions(questions);
59
60 List<AdvertVo> adverts = advertService.list();
61 resourceVo.setAdverts(adverts);
62
63 resourceVo.setCourses(courses);
64
65 return resourceVo;
66 }
37 67
38 /** 68 /**
39 * 查询列表 69 * 查询列表
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!