Skip to content

legobackend / lego-manage

Go to a project
Toggle navigation
Toggle navigation pinning
91d4561d by chentao
Options

no message

1 parent 13a25c60
Inline Side-by-side
Showing 1 changed file with 8 additions and 26 deletions
lego-core/src/main/java/com/lego/core/service/impl/CourseServiceImpl.java
...@@ -11,7 +11,6 @@ import com.lego.common.core.service.OssService; ...@@ -11,7 +11,6 @@ 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.common.utils.StreamUtils; 12 import com.lego.common.utils.StreamUtils;
13 import com.lego.core.annotation.LanguageAnnotation; 13 import com.lego.core.annotation.LanguageAnnotation;
14 import com.lego.core.domin.Advert;
15 import com.lego.core.domin.Course; 14 import com.lego.core.domin.Course;
16 import com.lego.core.domin.bo.CourseBo; 15 import com.lego.core.domin.bo.CourseBo;
17 import com.lego.core.domin.bo.CourseQueryBo; 16 import com.lego.core.domin.bo.CourseQueryBo;
...@@ -28,7 +27,6 @@ import org.springframework.stereotype.Service; ...@@ -28,7 +27,6 @@ import org.springframework.stereotype.Service;
28 import java.rmi.ServerException; 27 import java.rmi.ServerException;
29 import java.util.List; 28 import java.util.List;
30 import java.util.Map; 29 import java.util.Map;
31 import java.util.Objects;
32 import java.util.Set; 30 import java.util.Set;
33 31
34 /** 32 /**
...@@ -64,23 +62,19 @@ public class CourseServiceImpl implements ICourseService { ...@@ -64,23 +62,19 @@ public class CourseServiceImpl implements ICourseService {
64 for (CourseVo vo : list) { 62 for (CourseVo vo : list) {
65 vo.setBuildingBlockName(blockMap.getOrDefault(vo.getBuildingBlockId(), new BuildingBlockVo()).getName()); 63 vo.setBuildingBlockName(blockMap.getOrDefault(vo.getBuildingBlockId(), new BuildingBlockVo()).getName());
66 if(StrUtil.isNotBlank(vo.getTwoDimensionalOssId())){ 64 if(StrUtil.isNotBlank(vo.getTwoDimensionalOssId())){
67 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTwoDimensionalOssId())); 65 vo.setTwoDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getTwoDimensionalOssId()));
68 vo.setTwoDimensionalOssUrl(oss.getUrl());
69 } 66 }
70 if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){ 67 if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){
71 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getThreeDimensionalOssId())); 68 vo.setThreeDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getThreeDimensionalOssId()));
72 vo.setThreeDimensionalOssUrl(oss.getUrl());
73 } 69 }
74 if(StrUtil.isNotBlank(vo.getCaseOssId())){ 70 if(StrUtil.isNotBlank(vo.getCaseOssId())){
75 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getCaseOssId())); 71 vo.setCaseOssUrl(ossUrlService.selectUrlByIds(vo.getCaseOssId()));
76 vo.setCaseOssUrl(oss.getUrl());
77 } 72 }
78 if(StrUtil.isNotBlank(vo.getTeachingOssId())){ 73 if(StrUtil.isNotBlank(vo.getTeachingOssId())){
79 vo.setTeachingOssUrl(ossUrlService.selectUrlByIds(vo.getTeachingOssId())); 74 vo.setTeachingOssUrl(ossUrlService.selectUrlByIds(vo.getTeachingOssId()));
80 } 75 }
81 if(StrUtil.isNotBlank(vo.getPptOssId())){ 76 if(StrUtil.isNotBlank(vo.getPptOssId())){
82 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getPptOssId())); 77 vo.setPptOssUrl(ossUrlService.selectUrlByIds(vo.getPptOssId()));
83 vo.setPptOssUrl(oss.getUrl());
84 } 78 }
85 } 79 }
86 } 80 }
...@@ -97,31 +91,19 @@ public class CourseServiceImpl implements ICourseService { ...@@ -97,31 +91,19 @@ public class CourseServiceImpl implements ICourseService {
97 List<CourseVo> list = baseMapper.selectVoList(Wrappers.<Course>lambdaQuery().eq(Course::getBuildingBlockId, buildingBlockId).orderByAsc(Course::getSort)); 91 List<CourseVo> list = baseMapper.selectVoList(Wrappers.<Course>lambdaQuery().eq(Course::getBuildingBlockId, buildingBlockId).orderByAsc(Course::getSort));
98 for (CourseVo vo : list) { 92 for (CourseVo vo : list) {
99 if(StrUtil.isNotBlank(vo.getTwoDimensionalOssId())){ 93 if(StrUtil.isNotBlank(vo.getTwoDimensionalOssId())){
100 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTwoDimensionalOssId())); 94 vo.setTwoDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getTwoDimensionalOssId()));
101 if(Objects.nonNull(oss)) {
102 vo.setTwoDimensionalOssUrl(oss.getUrl());
103 }
104 } 95 }
105 if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){ 96 if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){
106 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getThreeDimensionalOssId())); 97 vo.setThreeDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getThreeDimensionalOssId()));
107 if(Objects.nonNull(oss)) {
108 vo.setThreeDimensionalOssUrl(oss.getUrl());
109 }
110 } 98 }
111 if(StrUtil.isNotBlank(vo.getCaseOssId())){ 99 if(StrUtil.isNotBlank(vo.getCaseOssId())){
112 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getCaseOssId())); 100 vo.setCaseOssUrl(ossUrlService.selectUrlByIds(vo.getCaseOssId()));
113 if(Objects.nonNull(oss)) {
114 vo.setCaseOssUrl(oss.getUrl());
115 }
116 } 101 }
117 if(StrUtil.isNotBlank(vo.getTeachingOssId())){ 102 if(StrUtil.isNotBlank(vo.getTeachingOssId())){
118 vo.setTeachingOssUrl(ossUrlService.selectUrlByIds(vo.getTeachingOssId())); 103 vo.setTeachingOssUrl(ossUrlService.selectUrlByIds(vo.getTeachingOssId()));
119 } 104 }
120 if(StrUtil.isNotBlank(vo.getPptOssId())){ 105 if(StrUtil.isNotBlank(vo.getPptOssId())){
121 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getPptOssId())); 106 vo.setPptOssUrl(ossUrlService.selectUrlByIds(vo.getPptOssId()));
122 if(Objects.nonNull(oss)) {
123 vo.setPptOssUrl(oss.getUrl());
124 }
125 } 107 }
126 } 108 }
127 return list; 109 return list;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!