Merge commit 'bdf4576ae9f491f51b169cbed273bf1a65ceeb76'

sclass/src/main/java/com/xhkjedu/sclass/controller/classroom/ClassroomController.java

@@ -194,7 +194,7 @@ public class ClassroomController {
                 }
             });
         });
-        return classroomService.batchSaveClass(startclassList, stopclassList, savefileList
+        return classroomService.batchSaveClass(rooms,startclassList, stopclassList, savefileList
                 , askteacherList, askstudentList, signList
                 , paperList, nodename, stupaperList, paperFileList, paperQtypeList, paperScantronList, voteList, votestuList,profileList,profileStudentList);
     }
@@ -352,7 +352,7 @@ public class ClassroomController {
                 profileStudentList.add(stuProfile);
             }
         }
-        return classroomService.saveClass(startclass, stopclass, savefileList
+        return classroomService.saveClass(r,startclass, stopclass, savefileList
                 , askteacherList, askstudentList, signList
                 , paperList, nodename, stupaperList, paperFileList, paperQtypeList, paperScantronList, voteList, votestuList, profileList, profileStudentList);
     }

sclass/src/main/java/com/xhkjedu/sclass/service/classroom/ClassroomService.java

@@ -7,15 +7,14 @@ import com.xhkjedu.sclass.utils.ArithUtil;
 import com.xhkjedu.sclass.vo.classroom.*;
 import com.xhkjedu.sclass.vo.paper.CheckClassVo;
 import com.xhkjedu.sclass.vo.room.DirectorVo;
+import com.xhkjedu.sclass.vo.room.RoomPVo;
 import com.xhkjedu.sclass.vo.room.RoomParamVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -62,178 +61,6 @@ public class ClassroomService {
     @Resource
     private ClassroomProfileStudentMapper classroomProfileStudentMapper;
 
-    /**
-     * 开始课堂
-     *
-     * @return void
-     * @Param [room]
-     * @Author ywx
-     * @Date 2020/7/14 17:17
-     **/
-    @Transactional(rollbackFor = Exception.class)
-    public boolean startClass(TClassroom room) {
-        boolean rtn = false;//课堂是否重复请求
-        try {
-            room.setRoomstate(1);
-            Integer num = classroomMapper.getStudentNumById(room.getClassid());//根据班级id获取学生数量
-            room.setClassnum(num);
-            classroomMapper.save(room);
-            classroomActivestudentMapper.saveStuActive(room.getRoomid(), room.getClassid(), room.getSchoolid(), N_Utils.getSecondTimestamp());
-        } catch (Exception e) {
-            if (e instanceof DuplicateKeyException) {
-                rtn = true;
-                log.error("接口重复请求，课堂id：" + room.getRoomid() + ",课堂名称：" + room.getRoomname());
-            } else {
-                log.error("开始课堂失败：" + e.getMessage());
-            }
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-        }
-        return rtn;
-    }
-
-    /**
-     * 结束课堂
-     *
-     * @return void
-     * @Param [room]
-     * @Author ywx
-     * @Date 2020/7/14 17:17
-     **/
-    @Transactional(rollbackFor = Exception.class)
-    public void stopClass(TClassroom room) {
-        try {
-            Long roomid = room.getRoomid();
-            if (N_Utils.isEmptyInteger(room.getEndtime())) {//异常结束：结束时间=开始时间+45分钟
-                TClassroom tClassroom = classroomMapper.selectByPrimaryKey(roomid);
-                room.setEndtime(tClassroom.getCreatetime() + 60 * 45);
-            }
-            classroomMapper.endClass(room);//结束课堂
-            classroomActivestudentMapper.updateActiveRank(roomid);//更新活跃值排名
-        } catch (Exception e) {
-            log.error("结束课堂失败：" + e.getMessage());
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-        }
-    }
-
-    /**
-     * 保存学生签到信息
-     *
-     * @return void
-     * @Param [sign]
-     * @Author ywx
-     * @Date 2020/7/14 16:32
-     **/
-    @Transactional(rollbackFor = Exception.class)
-    public void saveStudentSign(TClassroomSign sign) {
-        try {
-            Long roomid = sign.getRoomid();
-            Integer userid = sign.getUserid();
-            List<Integer> studentids = classroomMapper.listStudentId(roomid);//获取班级学生id集合
-            if (N_Utils.numInList(userid, studentids)) {//签到学生是本课堂所在班级学生，添加签到信息
-                classroomSignMapper.save(sign);
-                //如果一个学生退出课堂再进来数据就不对了，最后计算
-                //classroomMapper.updateRealStuNum(sign.getRoomid());//更新班级实际签到学生数量
-                classroomActivestudentMapper.updateActiveNum(roomid, userid);//更新学生活跃值
-            }
-        } catch (Exception e) {
-            log.error("保存学生签到信息失败：" + e.getMessage());
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-        }
-    }
-
-    /**
-     * 功能描述 最后更新课堂名称
-     *
-     * @param * @param roomlist
-     * @return void
-     * @author WN
-     * @date 2020/8/14
-     */
-    public void updateBatchRoomRealStunum(List<Long> roomlist) {
-        classroomMapper.updateBatchRoomRealStunum(roomlist);
-    }
-
-    /**
-     * 互动发起
-     *
-     * @return void
-     * @Param [teacher]
-     * @Author ywx
-     * @Date 2020/6/15 9:58
-     **/
-    public void saveWork(TClassroomAskteacher teacher) {
-        try {
-            if (teacher.getPaperid() == null) {
-                teacher.setPaperid(0L);
-            }
-            if (teacher.getRadionum() == null) {
-                teacher.setRadionum(0);
-            }
-            classroomAskteacherMapper.save(teacher);
-        } catch (Exception e) {
-            log.error("互动发起失败：" + e.getMessage());
-        }
-    }
-
-    /**
-     * 保存学生作答情况
-     *
-     * @return void
-     * @Param [student]
-     * @Author ywx
-     * @Date 2020/7/14 16:34
-     **/
-    @Transactional(rollbackFor = Exception.class)
-    public void saveStuAnswer(TClassroomAskstudent student) {
-        try {
-            if (student.getStudentradio() == null) {
-                student.setStudentradio("");
-            }
-            if (student.getStudentpic() == null) {
-                student.setStudentpic("");
-            }
-            if (student.getRadiocorrect() == null) {
-                student.setRadiocorrect(0);
-            }
-            if (student.getStudentselected() == null) {
-                student.setStudentselected(0);
-            }
-            classroomAskstudentMapper.save(student);
-            //保存成功更新学生活跃值
-            classroomActivestudentMapper.updateActiveNum(student.getRoomid(), student.getStudentid());
-        } catch (Exception e) {
-            log.error("保存学生作答情况失败：" + e.getMessage());
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-        }
-    }
-
-    /**
-     * 保存课堂图片
-     *
-     * @return void
-     * @Param [file]
-     * @Author ywx
-     * @Date 2020/7/14 16:42
-     **/
-    public void saveFile(TClassroomFile file) {
-        try {
-            classroomFileMapper.save(file);
-        } catch (Exception e) {
-            log.error("批量保存课堂图片失败：" + e.getMessage());
-        }
-    }
-
-    /**
-     * 功能描述 批量结束班级之前的课堂
-     *
-     * @param * @param classidlist
-     * @return void
-     * @author WN
-     * @date 2020/8/14
-     */
-    public void updateBatchRoomState(List<Integer> classidlist) {
-        classroomMapper.updateBatchRoomState(classidlist);
-    }
 
     /**
      * 获取批阅信息
@@ -561,7 +388,7 @@ public class ClassroomService {
      * @Date 2022/6/28 16:51
      **/
     @Transactional(rollbackFor = Exception.class)
-    public ResultVo batchSaveClass(List<TClassroom> startclassList, List<TClassroom> stopclassList
+    public ResultVo batchSaveClass(List<RoomPVo> rooms,List<TClassroom> startclassList, List<TClassroom> stopclassList
             , List<TClassroomFile> savefileList
             , List<TClassroomAskteacher> askteacherList, List<TClassroomAskstudent> askstudentList
             , List<TClassroomSign> signList
@@ -629,8 +456,9 @@ public class ClassroomService {
             resultVo.setMsg("保存成功");
         } catch (Exception e) {
             log.error("批量保存课堂数据失败：" + e.getMessage());
+            log.error(JSON.toJSONString(rooms));
             resultVo.setMsg("保存失败");
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new RuntimeException(e.getMessage());
         }
         return resultVo;
     }
@@ -781,13 +609,13 @@ public class ClassroomService {
      * @Date 2022/6/30 11:12
      **/
     @Transactional(rollbackFor = Exception.class)
-    public ResultVo saveClass(TClassroom startclass, TClassroom stopclass, List<TClassroomFile> savefileList
+    public ResultVo saveClass(RoomPVo r,TClassroom startclass, TClassroom stopclass, List<TClassroomFile> savefileList
             , List<TClassroomAskteacher> askteacherList, List<TClassroomAskstudent> askstudentList, List<TClassroomSign> signList
             , List<TClassroomPaper> paperList, String nodename
             , List<TClassroomPaperStudent> stupaperList, List<TClassroomPaperFile> paperFileList
             , List<TClassroomPaperQtype> paperQtypeList, List<TClassroomPaperScantron> paperScantronList
-            ,List<TClassroomVote> voteList,List<TClassroomVoteStudent> votestuList
-            ,List<TClassroomProfile> profileList,List<TClassroomProfileStudent> profileStudentList) {
+            , List<TClassroomVote> voteList, List<TClassroomVoteStudent> votestuList
+            , List<TClassroomProfile> profileList, List<TClassroomProfileStudent> profileStudentList) {
 
         ResultVo resultVo = new ResultVo();
         resultVo.setCode(1);
@@ -847,9 +675,9 @@ public class ClassroomService {
             resultVo.setMsg("保存成功");
         } catch (Exception e) {
             log.error("批量保存课堂数据失败：" + e.getMessage());
+            log.error(JSON.toJSONString(r));
             resultVo.setMsg("保存失败");
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return resultVo;
+            throw new RuntimeException("保存失败");
         }
         return resultVo;
     }