3e28d104 by chentao

新增课程的教案、ppt属性

1 parent ba669f40
...@@ -83,6 +83,26 @@ public class Course extends BaseEntity { ...@@ -83,6 +83,26 @@ public class Course extends BaseEntity {
83 private String caseName; 83 private String caseName;
84 84
85 /** 85 /**
86 * 教案OSS_id
87 */
88 private String teachingOssId;
89
90 /**
91 * 教案名称
92 */
93 private String teachingName;
94
95 /**
96 * pptOSS_id
97 */
98 private String pptOssId;
99
100 /**
101 * ppt名称
102 */
103 private String pptName;
104
105 /**
86 * 课程图片 106 * 课程图片
87 */ 107 */
88 private String ossId; 108 private String ossId;
......
...@@ -68,6 +68,16 @@ public class CourseBo extends BaseBO { ...@@ -68,6 +68,16 @@ public class CourseBo extends BaseBO {
68 private String caseOssId; 68 private String caseOssId;
69 69
70 /** 70 /**
71 * 教案OSS_id
72 */
73 private String teachingOssId;
74
75 /**
76 * ppt OSS_id
77 */
78 private String pptOssId;
79
80 /**
71 * 课程图片 81 * 课程图片
72 */ 82 */
73 private String ossId; 83 private String ossId;
......
...@@ -84,11 +84,45 @@ public class CourseVo { ...@@ -84,11 +84,45 @@ public class CourseVo {
84 private String caseOssId; 84 private String caseOssId;
85 85
86 /** 86 /**
87 * 案例oss_URL
88 */
89 private String caseOssUrl;
90
91 /**
87 * 案例名称 92 * 案例名称
88 */ 93 */
89 private String caseName; 94 private String caseName;
90 95
91 /** 96 /**
97 * 教案OSS_id
98 */
99 private String teachingOssId;
100
101 /**
102 * 教案 oss_URL
103 */
104 private String teachingOssUrl;
105
106 /**
107 * 教案名称
108 */
109 private String teachingName;
110 /**
111 * ppt OSS_id
112 */
113 private String pptOssId;
114
115 /**
116 * ppt oss_URL
117 */
118 private String pptOssUrl;
119
120 /**
121 * ppt名称
122 */
123 private String pptName;
124
125 /**
92 * 课程图片 126 * 课程图片
93 */ 127 */
94 private String ossId; 128 private String ossId;
......
...@@ -16,6 +16,7 @@ import com.lego.core.domin.bo.CourseQueryBo; ...@@ -16,6 +16,7 @@ import com.lego.core.domin.bo.CourseQueryBo;
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.CourseVo;
18 import com.lego.core.mapper.CourseMapper; 18 import com.lego.core.mapper.CourseMapper;
19 import com.lego.core.mapper.UpgradeMapper;
19 import com.lego.core.service.IBuildingBlockService; 20 import com.lego.core.service.IBuildingBlockService;
20 import com.lego.core.service.ICourseService; 21 import com.lego.core.service.ICourseService;
21 import com.lego.system.domain.vo.SysOssVo; 22 import com.lego.system.domain.vo.SysOssVo;
...@@ -66,6 +67,15 @@ public class CourseServiceImpl implements ICourseService { ...@@ -66,6 +67,15 @@ public class CourseServiceImpl implements ICourseService {
66 if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){ 67 if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){
67 vo.setThreeDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getThreeDimensionalOssId())); 68 vo.setThreeDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getThreeDimensionalOssId()));
68 } 69 }
70 if(StrUtil.isNotBlank(vo.getCaseOssId())){
71 vo.setCaseOssUrl(ossUrlService.selectUrlByIds(vo.getCaseOssId()));
72 }
73 if(StrUtil.isNotBlank(vo.getTeachingOssId())){
74 vo.setTeachingOssUrl(ossUrlService.selectUrlByIds(vo.getTeachingOssId()));
75 }
76 if(StrUtil.isNotBlank(vo.getPptOssId())){
77 vo.setPptOssUrl(ossUrlService.selectUrlByIds(vo.getPptOssId()));
78 }
69 } 79 }
70 } 80 }
71 return TableDataInfo.build(page); 81 return TableDataInfo.build(page);
...@@ -86,6 +96,15 @@ public class CourseServiceImpl implements ICourseService { ...@@ -86,6 +96,15 @@ public class CourseServiceImpl implements ICourseService {
86 if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){ 96 if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){
87 vo.setThreeDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getThreeDimensionalOssId())); 97 vo.setThreeDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getThreeDimensionalOssId()));
88 } 98 }
99 if(StrUtil.isNotBlank(vo.getCaseOssId())){
100 vo.setCaseOssUrl(ossUrlService.selectUrlByIds(vo.getCaseOssId()));
101 }
102 if(StrUtil.isNotBlank(vo.getTeachingOssId())){
103 vo.setTeachingOssUrl(ossUrlService.selectUrlByIds(vo.getTeachingOssId()));
104 }
105 if(StrUtil.isNotBlank(vo.getPptOssId())){
106 vo.setPptOssUrl(ossUrlService.selectUrlByIds(vo.getPptOssId()));
107 }
89 } 108 }
90 return list; 109 return list;
91 } 110 }
...@@ -111,6 +130,8 @@ public class CourseServiceImpl implements ICourseService { ...@@ -111,6 +130,8 @@ public class CourseServiceImpl implements ICourseService {
111 public boolean addCourse(CourseBo courseBo) { 130 public boolean addCourse(CourseBo courseBo) {
112 Course course = BeanUtil.toBean(courseBo, Course.class); 131 Course course = BeanUtil.toBean(courseBo, Course.class);
113 setCaseName(course); 132 setCaseName(course);
133 setTeachingName(course);
134 setPptName(course);
114 return baseMapper.insert(course) > 0; 135 return baseMapper.insert(course) > 0;
115 } 136 }
116 137
...@@ -127,6 +148,8 @@ public class CourseServiceImpl implements ICourseService { ...@@ -127,6 +148,8 @@ public class CourseServiceImpl implements ICourseService {
127 checkExists(courseBo.getId()); 148 checkExists(courseBo.getId());
128 Course course = BeanUtil.toBean(courseBo, Course.class); 149 Course course = BeanUtil.toBean(courseBo, Course.class);
129 setCaseName(course); 150 setCaseName(course);
151 setTeachingName(course);
152 setPptName(course);
130 return baseMapper.updateById(course) > 0; 153 return baseMapper.updateById(course) > 0;
131 } 154 }
132 155
...@@ -149,6 +172,40 @@ public class CourseServiceImpl implements ICourseService { ...@@ -149,6 +172,40 @@ public class CourseServiceImpl implements ICourseService {
149 } 172 }
150 173
151 /** 174 /**
175 * 从上传文件中获取教案名称
176 *
177 * @param course
178 */
179 private void setTeachingName(Course course) {
180 if (StrUtil.isNotBlank(course.getCaseOssId())) {
181 SysOssVo sysOssVo = ossService.getById(Long.valueOf(course.getCaseOssId()));
182 String suffix = sysOssVo.getFileSuffix();
183 if (sysOssVo.getOriginalName().endsWith(suffix)) {
184 course.setTeachingName(sysOssVo.getOriginalName().replace(suffix, ""));
185 } else {
186 course.setTeachingName(sysOssVo.getOriginalName());
187 }
188 }
189 }
190
191 /**
192 * 从上传文件中获取ppt名称
193 *
194 * @param course
195 */
196 private void setPptName(Course course) {
197 if (StrUtil.isNotBlank(course.getCaseOssId())) {
198 SysOssVo sysOssVo = ossService.getById(Long.valueOf(course.getCaseOssId()));
199 String suffix = sysOssVo.getFileSuffix();
200 if (sysOssVo.getOriginalName().endsWith(suffix)) {
201 course.setPptName(sysOssVo.getOriginalName().replace(suffix, ""));
202 } else {
203 course.setPptName(sysOssVo.getOriginalName());
204 }
205 }
206 }
207
208 /**
152 * 删除 209 * 删除
153 * 210 *
154 * @param id 211 * @param id
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!