szx-1282 修改失败提示语

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java

@@ -10,7 +10,6 @@ import javax.servlet.http.HttpServletRequest;
 import com.xboe.api.ThirdApi;
 import com.xboe.module.course.dto.CourseParam;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -322,7 +321,6 @@ public class CourseAuditApi  extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/hrbp-submit-audit")
-    @Transactional(rollbackFor = Exception.class)
 	public JsonResponse<Boolean> hrbpAudit(String auditId,String courseId,String title,Boolean pass,String remark, HttpServletRequest request){
 		if(StringUtils.isBlank(auditId)){
 			return badRequest("参数错误");
@@ -352,6 +350,7 @@ public class CourseAuditApi  extends ApiBaseController{
 			}
 		}
 		
+		try {
 			CurrentUser cu=getCurrent();
 			service.hrbpSubmitAudit(auditId, courseId,open, pass,cu.getAccountId(),cu.getName(), remark);
 
@@ -359,12 +358,16 @@ public class CourseAuditApi  extends ApiBaseController{
 				//修改在线课开课状态=已开课
 				String token = request.getHeader("Xboe-Access-Token");
 				CourseParam param = new CourseParam();
-            param.setId(courseId);
+				param.setId(c.getId());
                 param.setOrgId(c.getOrgId());
                 param.setOrgName(c.getOrgName());
 				thirdApi.updateOrSaveCourse(param,token);
 			}
 			return success(true);
+		} catch (Exception e) {
+			log.error("HRBP审核提交处理错误",e);
+			return error("审核处理失败",e.getMessage(),false);
+		}
 	}
 	
 	@PostMapping("/last-audit-list")
@@ -389,7 +392,6 @@ public class CourseAuditApi  extends ApiBaseController{
 	 * @param dto
 	 * @return
 	 */
-    @Transactional(rollbackFor = Exception.class)
 	@PostMapping("/submit-publish")
 	@AutoLog(module = "课程",action = "默认管理员提交发布",info = "")
 	public JsonResponse<Boolean> submitAndPublish(@RequestBody CourseFullDto dto, HttpServletRequest request){
@@ -423,6 +425,7 @@ public class CourseAuditApi  extends ApiBaseController{
 		dto.getCourse().setStatus(Course.STATUS_AUDIT_FINISH);//设置为审核通过状态
 		dto.getCourse().setEnabled(true);//设置启用状态问题
 		dto.getCourse().setPublished(false);//重新提交审核设置为未发布状态
+		try {
 
 			courseService.submitAndPublish(dto,cuser.getAccountId(),cuser.getName());
 			log.info("---------------在线课开始同步到讲师管理 ------- token = " + token);
@@ -433,6 +436,12 @@ public class CourseAuditApi  extends ApiBaseController{
 			thirdApi.updateOrSaveCourse(param,token);
 			log.info("---------------在线课同步到讲师管理完毕 -------");
 			return success(true);
+		} catch (Exception e) {
+			log.error("默认管理员提交直接发布处理失败",e);
+			e.printStackTrace();
+			return error("发布课程失败",e.getMessage());
+		}
+		
 	}
 
 	

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java

@@ -15,6 +15,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import it.sauronsoftware.jave.Encoder;
+import it.sauronsoftware.jave.MultimediaInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.orm.ObjectOptimisticLockingFailureException;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -46,8 +48,6 @@ import com.xboe.module.scorm.SCORMParser;
 import com.xboe.standard.BaseConstant;
 import com.xboe.standard.enums.BoedxCourseFileType;
 
-import it.sauronsoftware.jave.Encoder;
-import it.sauronsoftware.jave.MultimediaInfo;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -278,8 +278,8 @@ public class CourseFileApi extends ApiBaseController {
                     }
                 }
             } catch (Exception e) {
-                log.error("读取视频时长错误");
-//                e.printStackTrace();
+                log.error("读取视频时长错误", e);
+                return error("视频解析失败，尝试重新上传或联系管理员", "视频解析失败，尝试重新上传或联系管理员");
             }
         }
 

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java

@@ -14,7 +14,6 @@ import com.xboe.api.ThirdApi;
 import com.xboe.module.course.dto.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -301,7 +300,6 @@ public class CourseManageApi extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/save")
-    @Transactional(rollbackFor = Exception.class)
 	@AutoLog(module = "课程",action = "保存课程基本信息",info = "")
 	public JsonResponse<CourseFullDto> saveCourseFull(@RequestBody CourseFullDto dto, HttpServletRequest request){
 		if(dto.getCourse()==null){
@@ -323,6 +321,7 @@ public class CourseManageApi extends ApiBaseController{
 		}
 		
 		//填充必要的信息
+		try {
 			if(StringUtils.isBlank(dto.getCourse().getId())) {
 				//只有在第一次添加保存时才会这样
 				fillCourseData(dto.getCourse());
@@ -342,6 +341,10 @@ public class CourseManageApi extends ApiBaseController{
 			thirdApi.updateOrSaveCourse(param,token);
 			log.info("---------------在线课同步到讲师管理完毕 -------");
 			return success(dto);
+		} catch (Exception e) {
+			log.error("整体保存课程信息错误",e);
+			return error("保存失败",e.getMessage());
+		}
 	}
 	
 	/***
@@ -440,7 +443,6 @@ public class CourseManageApi extends ApiBaseController{
 	
 
 	@PostMapping("/submit")
-    @Transactional(rollbackFor = Exception.class)
 	@AutoLog(module = "课程",action = "提交课程",info = "")
 	public JsonResponse<CourseFullDto> submitCourseFull(@RequestBody CourseFullDto dto){
 		if(dto.getCourse()==null){
@@ -518,6 +520,7 @@ public class CourseManageApi extends ApiBaseController{
 		//检查课程内容的完整性	
 		//填充必要的信息
 		//fillCourseData(dto.getCourse());
+		try {
 			CourseHRBPAudit hrbpAudit = hrbpAuditService.hasAuditing(dto.getCourse().getId());
 			if(hrbpAudit!=null) {
 				return badRequest("此课程中已有审核，不能再提交审核，如修改请先撤回");
@@ -575,6 +578,10 @@ public class CourseManageApi extends ApiBaseController{
 	            return error("课程已提交，但邮件发送失败",ex.getMessage());
 	        }
 			return success(dto);
+		} catch (Exception e) {
+			log.error("提交保存课程信息错误",e);
+			return error("提交课程处理失败",e.getMessage());
+		}
 	}
 	
 	private String createEmailHtml(String name,String orgId, String orgName,String createBy,String courseName) throws Exception {
@@ -608,7 +615,6 @@ public class CourseManageApi extends ApiBaseController{
 	}
 
 	@PostMapping("/sumbits")
-    @Transactional(rollbackFor = Exception.class)
 	public JsonResponse<Boolean> sumbitId(HttpServletRequest request,CourseHRBPAudit audit,String ucode,String ukid,String email,String orgName){
 		if(StringUtils.isBlank(audit.getCourseId())){
 			return badRequest("参数错误");
@@ -631,6 +637,7 @@ public class CourseManageApi extends ApiBaseController{
 			return badRequest(error);
 		}
 
+		try {
 			CourseHRBPAudit hrbpAudit = hrbpAuditService.hasAuditing(audit.getCourseId());
 			if(hrbpAudit!=null) {
 				return badRequest("此课程中已有审核，不能再提交审核，如修改请先撤回");
@@ -696,6 +703,10 @@ public class CourseManageApi extends ApiBaseController{
 	        }
 			
 			return success(true);
+		}catch(Exception e) {
+			log.error("提交保存课程信息错误",e);
+			return error("提交课程处理失败",e.getMessage());
+		}
 	}
 
 	@PostMapping("/revoke")

servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseTeacherDeletedRecordDao.java

@@ -0,0 +1,9 @@
+package com.xboe.module.course.dao;
+
+import com.xboe.core.orm.BaseDao;
+import com.xboe.module.course.entity.CourseTeacherDeletedRecord;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class CourseTeacherDeletedRecordDao extends BaseDao<CourseTeacherDeletedRecord> {
+}

servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacherDeletedRecord.java

@@ -0,0 +1,43 @@
+package com.xboe.module.course.entity;
+
+import com.xboe.core.SysConstant;
+import com.xboe.core.orm.IdBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * 课程任课教师删除记录
+ */
+@Data
+@Entity
+@EqualsAndHashCode(callSuper = false)
+@Table(name = SysConstant.TABLE_PRE + "course_teacher_deleted_record")
+public class CourseTeacherDeletedRecord extends IdBaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 课程id
+     */
+    @Column(name = "course_id", nullable = false, length = 20)
+    private String courseId;
+
+    /**
+     * 教师id，实际上就是aid
+     *
+     */
+    @Column(name = "teacher_id", nullable = false, length = 20)
+    private String teacherId;
+
+    /**
+     * 教师姓名
+     *
+     */
+    @Column(name = "teacher_name", length = 30)
+    private String teacherName;
+
+}

servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java

@@ -161,14 +161,14 @@ public interface ICourseService {
      * 课程信息的整体更新,用于对课程的编辑处理
      * @param full
      */
-    void update(CourseFullDto full);
+    void update(CourseFullDto full)throws Exception;
     
     /**
      * 提交课程，提交进入课程审核，独立的方法处理
      * @param full
      * @throws Exception
      */
-    void submit(CourseFullDto full);
+    void submit(CourseFullDto full)throws Exception;
     
     /**
      * 用于默认管理员，直接提交发布，不走审核流程
@@ -177,14 +177,14 @@ public interface ICourseService {
      * @param aname 姓名
      * @throws Exception
      */
-    void submitAndPublish(CourseFullDto full,String aid,String aname);
+    void submitAndPublish(CourseFullDto full,String aid,String aname)throws Exception;
     
     /**
      * 提交一个课程
      * @param audit
      * @throws Exception
      */
-    void submit(CourseHRBPAudit audit);
+    void submit(CourseHRBPAudit audit) throws Exception;
 
     /**
      * update 传一个id直接改值

servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java

@@ -15,9 +15,12 @@ import java.util.stream.Stream;
 import javax.annotation.Resource;
 import javax.management.Query;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.xboe.api.ThirdApi;
 import com.xboe.core.orm.*;
+import com.xboe.module.course.dao.*;
+import com.xboe.module.course.entity.*;
 import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.entity.StudyCourse;
 import org.apache.commons.lang3.StringUtils;
@@ -41,24 +44,9 @@ import com.xboe.common.beans.KeyValue;
 import com.xboe.common.utils.IDGenerator;
 import com.xboe.common.utils.StringUtil;
 import com.xboe.core.event.IEventDataSender;
-import com.xboe.module.course.dao.CourseContentDao;
-import com.xboe.module.course.dao.CourseCrowdDao;
-import com.xboe.module.course.dao.CourseDao;
-import com.xboe.module.course.dao.CourseExamDao;
-import com.xboe.module.course.dao.CourseHRBPAuditDao;
-import com.xboe.module.course.dao.CourseHomeWorkDao;
-import com.xboe.module.course.dao.CourseSectionDao;
-import com.xboe.module.course.dao.CourseTeacherDao;
-import com.xboe.module.course.dao.CourseUpdateLogDao;
 import com.xboe.module.course.dto.CourseFullDto;
 import com.xboe.module.course.dto.CourseQueryDto;
 import com.xboe.module.course.dto.RankingDto;
-import com.xboe.module.course.entity.Course;
-import com.xboe.module.course.entity.CourseCrowd;
-import com.xboe.module.course.entity.CourseHRBPAudit;
-import com.xboe.module.course.entity.CourseSection;
-import com.xboe.module.course.entity.CourseTeacher;
-import com.xboe.module.course.entity.CourseUpdateLog;
 import com.xboe.module.course.service.ICourseFullTextSearch;
 import com.xboe.module.course.service.ICourseService;
 import com.xboe.module.interaction.service.ICourseGradeService;
@@ -125,7 +113,8 @@ public class CourseServiceImpl implements ICourseService {
     @Resource
     RestHighLevelClient restHighLevelClient;
 
-
+    @Resource
+    private CourseTeacherDeletedRecordDao courseTeacherDeletedRecordDao;
 
     /**
      * 生成过滤条件
@@ -367,6 +356,7 @@ public class CourseServiceImpl implements ICourseService {
 //				// 使用distinct()配合自定义的去重条件
 //				.filter(distinctByKey(c -> c.getId()))
 //				.collect(Collectors.toList());
+
     /// /		PageList<Course> rs=courseDao.findPage(pageIndex, pageSize, filters, oc);
     /// /		long endTime = System.nanoTime();
 //		//log.info("查询出的条数:"+rs.getCount());
@@ -976,7 +966,7 @@ public class CourseServiceImpl implements ICourseService {
     }
 
     @Override
-    public void update(CourseFullDto full) {
+    public void update(CourseFullDto full) throws Exception {
 
         Course c = full.getCourse();//当前的课程信息
         Course nowCourse = courseDao.get(c.getId());//修改之前的课程信息
@@ -1002,6 +992,8 @@ public class CourseServiceImpl implements ICourseService {
         c.setSysVersion(courseDao.getVersion(c.getId()));
         full.getCourse().setSysVersion(c.getSysVersion());
 
+        // 兼容处理，记录下删除的关联数据
+        createCourseTeacherDeletedRecord(c.getId());
         //先清空教师信息， 教师信息如果不一样了，也要加入到日志中
         courseTeacherDao.deleteByField("courseId", c.getId());
         if (full.getTeachers() != null && !full.getTeachers().isEmpty()) {
@@ -1028,7 +1020,7 @@ public class CourseServiceImpl implements ICourseService {
     }
 
     @Override
-    public void submit(CourseFullDto full) {
+    public void submit(CourseFullDto full) throws Exception {
 
         Course c = full.getCourse();//当前的课程信息
         if (c.getVisible() == null) {
@@ -1056,6 +1048,8 @@ public class CourseServiceImpl implements ICourseService {
         c.setSysVersion(courseDao.getVersion(c.getId()));
         full.getCourse().setSysVersion(c.getSysVersion());
 
+        // 兼容处理，记录下删除的关联数据
+        createCourseTeacherDeletedRecord(c.getId());
         //先清空教师信息， 教师信息如果不一样了，也要加入到日志中
         courseTeacherDao.deleteByField("courseId", c.getId());
         if (full.getTeachers() != null && !full.getTeachers().isEmpty()) {
@@ -1084,13 +1078,15 @@ public class CourseServiceImpl implements ICourseService {
     }
 
     @Override
-    public void submitAndPublish(CourseFullDto full, String aid, String aname) {
+    public void submitAndPublish(CourseFullDto full, String aid, String aname) throws Exception {
 
         Course c = full.getCourse();//当前的课程信息
         c.setPublished(true);
         c.setPublishTime(LocalDateTime.now());
         courseDao.update(c);
 
+        // 兼容处理，记录下删除的关联数据
+        createCourseTeacherDeletedRecord(c.getId());
         //先清空教师信息， 教师信息如果不一样了，也要加入到日志中
         courseTeacherDao.deleteByField("courseId", c.getId());
         if (full.getTeachers() != null && !full.getTeachers().isEmpty()) {
@@ -1131,7 +1127,7 @@ public class CourseServiceImpl implements ICourseService {
     }
 
     @Override
-    public void submit(CourseHRBPAudit hrbpAudit) {
+    public void submit(CourseHRBPAudit hrbpAudit) throws Exception {
 
         courseDao.updateMultiFieldById(hrbpAudit.getCourseId(), UpdateBuilder.create("status", Course.STATUS_SUBMIT),
                 UpdateBuilder.create("published", false), UpdateBuilder.create("publishTime", LocalDateTime.now()));
@@ -2013,4 +2009,25 @@ public class CourseServiceImpl implements ICourseService {
             e.printStackTrace();
         }
     }
+
+    /**
+     * 删除boe_course_teacher数据时把删除的数据储存到boe_course_teacher_deleted_record表
+     * boe_course_teacher表没有deleted字段，兼容处理
+     *
+     * @param courseId 课程ID
+     */
+    private void createCourseTeacherDeletedRecord(String courseId) {
+        List<CourseTeacherDeletedRecord> courseTeacherList = courseTeacherDao.findList(FieldFilters.eq("courseId", courseId)).stream().map(ct -> {
+            CourseTeacherDeletedRecord courseTeacherDeletedRecord = new CourseTeacherDeletedRecord();
+            courseTeacherDeletedRecord.setCourseId(ct.getCourseId());
+            courseTeacherDeletedRecord.setTeacherId(ct.getTeacherId());
+            courseTeacherDeletedRecord.setTeacherName(ct.getTeacherName());
+            return courseTeacherDeletedRecord;
+        }).collect(Collectors.toList());
+
+        if (CollUtil.isNotEmpty(courseTeacherList)) {
+            courseTeacherDeletedRecordDao.saveList(courseTeacherList);
+        }
+    }
+
 }