新增课程的教案、ppt属性

@@ -83,6 +83,26 @@ public class Course extends BaseEntity {
     private String caseName;
 
     /**
+     * 教案OSS_id
+     */
+    private String teachingOssId;
+
+    /**
+     * 教案名称
+     */
+    private String teachingName;
+
+    /**
+     * pptOSS_id
+     */
+    private String pptOssId;
+
+    /**
+     * ppt名称
+     */
+    private String pptName;
+
+    /**
      * 课程图片
      */
     private String ossId;

@@ -68,6 +68,16 @@ public class CourseBo extends BaseBO {
     private String caseOssId;
 
     /**
+     * 教案OSS_id
+     */
+    private String teachingOssId;
+
+    /**
+     * ppt OSS_id
+     */
+    private String pptOssId;
+
+    /**
      * 课程图片
      */
     private String ossId;

@@ -84,11 +84,45 @@ public class CourseVo {
     private String caseOssId;
 
     /**
+     * 案例oss_URL
+     */
+    private String caseOssUrl;
+
+    /**
      * 案例名称
      */
     private String caseName;
 
     /**
+     * 教案OSS_id
+     */
+    private String teachingOssId;
+
+    /**
+     * 教案 oss_URL
+     */
+    private String teachingOssUrl;
+
+    /**
+     * 教案名称
+     */
+    private String teachingName;
+    /**
+     * ppt OSS_id
+     */
+    private String pptOssId;
+
+    /**
+     * ppt oss_URL
+     */
+    private String pptOssUrl;
+
+    /**
+     * ppt名称
+     */
+    private String pptName;
+
+    /**
      * 课程图片
      */
     private String ossId;

@@ -16,6 +16,7 @@ import com.lego.core.domin.bo.CourseQueryBo;
 import com.lego.core.domin.vo.BuildingBlockVo;
 import com.lego.core.domin.vo.CourseVo;
 import com.lego.core.mapper.CourseMapper;
+import com.lego.core.mapper.UpgradeMapper;
 import com.lego.core.service.IBuildingBlockService;
 import com.lego.core.service.ICourseService;
 import com.lego.system.domain.vo.SysOssVo;
@@ -66,6 +67,15 @@ public class CourseServiceImpl implements ICourseService {
                 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 TableDataInfo.build(page);
@@ -86,6 +96,15 @@ public class CourseServiceImpl implements ICourseService {
             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;
     }
@@ -111,6 +130,8 @@ public class CourseServiceImpl implements ICourseService {
     public boolean addCourse(CourseBo courseBo) {
         Course course = BeanUtil.toBean(courseBo, Course.class);
         setCaseName(course);
+        setTeachingName(course);
+        setPptName(course);
         return baseMapper.insert(course) > 0;
     }
 
@@ -127,6 +148,8 @@ public class CourseServiceImpl implements ICourseService {
         checkExists(courseBo.getId());
         Course course = BeanUtil.toBean(courseBo, Course.class);
         setCaseName(course);
+        setTeachingName(course);
+        setPptName(course);
         return baseMapper.updateById(course) > 0;
     }
 
@@ -149,6 +172,40 @@ public class CourseServiceImpl implements ICourseService {
     }
 
     /**
+     * 从上传文件中获取教案名称
+     *
+     * @param course
+     */
+    private void setTeachingName(Course course) {
+        if (StrUtil.isNotBlank(course.getCaseOssId())) {
+            SysOssVo sysOssVo = ossService.getById(Long.valueOf(course.getCaseOssId()));
+            String suffix = sysOssVo.getFileSuffix();
+            if (sysOssVo.getOriginalName().endsWith(suffix)) {
+                course.setTeachingName(sysOssVo.getOriginalName().replace(suffix, ""));
+            } else {
+                course.setTeachingName(sysOssVo.getOriginalName());
+            }
+        }
+    }
+
+    /**
+     * 从上传文件中获取ppt名称
+     *
+     * @param course
+     */
+    private void setPptName(Course course) {
+        if (StrUtil.isNotBlank(course.getCaseOssId())) {
+            SysOssVo sysOssVo = ossService.getById(Long.valueOf(course.getCaseOssId()));
+            String suffix = sysOssVo.getFileSuffix();
+            if (sysOssVo.getOriginalName().endsWith(suffix)) {
+                course.setPptName(sysOssVo.getOriginalName().replace(suffix, ""));
+            } else {
+                course.setPptName(sysOssVo.getOriginalName());
+            }
+        }
+    }
+
+    /**
      * 删除
      *
      * @param id