Skip to content

legobackend / lego-manage

Go to a project
Toggle navigation
Toggle navigation pinning
080e28c4 by chentao
Options

no message

1 parent 8240b127
Inline Side-by-side
Showing 1 changed file with 34 additions and 13 deletions
lego-core/src/main/java/com/lego/core/service/impl/CourseServiceImpl.java
...@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service; ...@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
27 import java.rmi.ServerException; 27 import java.rmi.ServerException;
28 import java.util.List; 28 import java.util.List;
29 import java.util.Map; 29 import java.util.Map;
30 import java.util.Objects;
30 import java.util.Set; 31 import java.util.Set;
31 32
32 /** 33 /**
...@@ -136,47 +137,67 @@ public class CourseServiceImpl implements ICourseService { ...@@ -136,47 +137,67 @@ public class CourseServiceImpl implements ICourseService {
136 for (CourseVo vo : list) { 137 for (CourseVo vo : list) {
137 if(StrUtil.isNotBlank(vo.getTwoDimensionalOssId())){ 138 if(StrUtil.isNotBlank(vo.getTwoDimensionalOssId())){
138 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTwoDimensionalOssId())); 139 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTwoDimensionalOssId()));
139 vo.setTwoDimensionalOssUrl(oss.getUrl()); 140 if(Objects.nonNull(oss)) {
141 vo.setTwoDimensionalOssUrl(oss.getUrl());
142 }
140 } 143 }
141 if(StrUtil.isNotBlank(vo.getTwoDimensionalUrl())){ 144 if(StrUtil.isNotBlank(vo.getTwoDimensionalUrl())){
142 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTwoDimensionalUrl())); 145 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTwoDimensionalUrl()));
143 vo.setTwoDimensionalUrl(oss.getUrl()); 146 if(Objects.nonNull(oss)) {
147 vo.setTwoDimensionalUrl(oss.getUrl());
148 }
144 } 149 }
145 if(StrUtil.isNotBlank(vo.getTwoDimensionalType())){ 150 if(StrUtil.isNotBlank(vo.getTwoDimensionalType())){
146 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTwoDimensionalType())); 151 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTwoDimensionalType()));
147 vo.setTwoDimensionalType(oss.getUrl()); 152 if(Objects.nonNull(oss)) {
153 vo.setTwoDimensionalType(oss.getUrl());
154 }
148 } 155 }
149 if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){ 156 if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){
150 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getThreeDimensionalOssId())); 157 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getThreeDimensionalOssId()));
151 vo.setThreeDimensionalOssUrl(oss.getUrl()); 158 if(Objects.nonNull(oss)) {
159 vo.setThreeDimensionalOssUrl(oss.getUrl());
160 }
152 } 161 }
153 if(StrUtil.isNotBlank(vo.getThreeDimensionalUrl())){ 162 if(StrUtil.isNotBlank(vo.getThreeDimensionalUrl())){
154 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getThreeDimensionalUrl())); 163 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getThreeDimensionalUrl()));
155 vo.setThreeDimensionalUrl(oss.getUrl()); 164 if(Objects.nonNull(oss)) {
165 vo.setThreeDimensionalUrl(oss.getUrl());
166 }
156 } 167 }
157 if(StrUtil.isNotBlank(vo.getThreeDimensionalType())){ 168 if(StrUtil.isNotBlank(vo.getThreeDimensionalType())){
158 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getThreeDimensionalType())); 169 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getThreeDimensionalType()));
159 vo.setThreeDimensionalType(oss.getUrl()); 170 if(Objects.nonNull(oss)) {
171 vo.setThreeDimensionalType(oss.getUrl());
172 }
160 } 173 }
161 if(StrUtil.isNotBlank(vo.getCaseOssId())){ 174 if(StrUtil.isNotBlank(vo.getCaseOssId())){
162 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getCaseOssId())); 175 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getCaseOssId()));
163 vo.setCaseOssUrl(oss.getUrl()); 176 if(Objects.nonNull(oss)) {
164 vo.setCaseFileVoList(ossUrlService.selectFileVoByIds(vo.getCaseOssId())); 177 vo.setCaseOssUrl(oss.getUrl());
178 vo.setCaseFileVoList(ossUrlService.selectFileVoByIds(vo.getCaseOssId()));
179 }
165 } 180 }
166 if(StrUtil.isNotBlank(vo.getTeachingOssId())){ 181 if(StrUtil.isNotBlank(vo.getTeachingOssId())){
167 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTeachingOssId())); 182 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTeachingOssId()));
168 vo.setTeachingOssUrl(oss.getUrl()); 183 if(Objects.nonNull(oss)) {
169 vo.setTeachingFileVoList(ossUrlService.selectFileVoByIds(vo.getTeachingOssId())); 184 vo.setTeachingOssUrl(oss.getUrl());
185 vo.setTeachingFileVoList(ossUrlService.selectFileVoByIds(vo.getTeachingOssId()));
186 }
170 } 187 }
171 if(StrUtil.isNotBlank(vo.getPptOssId())){ 188 if(StrUtil.isNotBlank(vo.getPptOssId())){
172 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getPptOssId())); 189 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getPptOssId()));
173 vo.setPptOssUrl(oss.getUrl()); 190 if(Objects.nonNull(oss)) {
174 vo.setPptFileVoList(ossUrlService.selectFileVoByIds(vo.getPptOssId())); 191 vo.setPptOssUrl(oss.getUrl());
192 vo.setPptFileVoList(ossUrlService.selectFileVoByIds(vo.getPptOssId()));
193 }
175 } 194 }
176 195
177 if(StrUtil.isNotBlank(vo.getOssId())){ 196 if(StrUtil.isNotBlank(vo.getOssId())){
178 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getOssId())); 197 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getOssId()));
179 vo.setOssUrl(oss.getUrl()); 198 if(Objects.nonNull(oss)) {
199 vo.setOssUrl(oss.getUrl());
200 }
180 } 201 }
181 } 202 }
182 return list; 203 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!