课堂活跃度最后统一计算

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

@@ -3,28 +3,12 @@ package com.xhkjedu.sclass.controller.classroom;
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.xhkjedu.sclass.model.classroom.TClassroom;
-import com.xhkjedu.sclass.model.classroom.TClassroomActivestudent;
-import com.xhkjedu.sclass.model.classroom.TClassroomAskstudent;
-import com.xhkjedu.sclass.model.classroom.TClassroomAskteacher;
-import com.xhkjedu.sclass.model.classroom.TClassroomFile;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaper;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperFile;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperQtype;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperScantron;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudent;
-import com.xhkjedu.sclass.model.classroom.TClassroomSign;
+import com.xhkjedu.sclass.model.classroom.*;
 import com.xhkjedu.sclass.model.paperstudent.TPaperStudent;
 import com.xhkjedu.sclass.model.paperstudent.TPaperStudentScantron;
 import com.xhkjedu.sclass.service.classroom.ClassroomPaperService;
 import com.xhkjedu.sclass.service.classroom.ClassroomService;
-import com.xhkjedu.sclass.vo.classroom.ObjectiveVo;
-import com.xhkjedu.sclass.vo.classroom.ReportEQuestionVo;
-import com.xhkjedu.sclass.vo.classroom.RoomCorrectCallVo;
-import com.xhkjedu.sclass.vo.classroom.RoomCorrectExamVo;
-import com.xhkjedu.sclass.vo.classroom.RoomCorrectVo;
-import com.xhkjedu.sclass.vo.classroom.RoomVo;
-import com.xhkjedu.sclass.vo.classroom.SubjectiveVo;
+import com.xhkjedu.sclass.vo.classroom.*;
 import com.xhkjedu.sclass.vo.paper.CheckClassVo;
 import com.xhkjedu.sclass.vo.paperstudent.StudentVo;
 import com.xhkjedu.sclass.vo.room.RoomPVo;
@@ -71,7 +55,6 @@ public class ClassroomController {
         List<TClassroomAskteacher> askteacherList = new ArrayList<>();//结束课堂集合
         List<TClassroomAskstudent> askstudentList = new ArrayList<>();//结束课堂集合
         List<TClassroomSign> signList = new ArrayList<>();//结束课堂集合
-        List<TClassroomActivestudent> activestudentList = new ArrayList<>();//结束课堂集合
         List<TClassroomPaper> paperList = new ArrayList<>();//结束课堂集合
         List<TClassroomPaperStudent> stupaperList = new ArrayList<>();//结束课堂集合
         List<TClassroomPaperFile> paperFileList = new ArrayList<>();//堂测附件集合
@@ -98,17 +81,9 @@ public class ClassroomController {
                 } else if (rtype.equals("askstudent")) {//互动--保存学生作答情况
                     TClassroomAskstudent student = JSON.parseObject(jsonstr, TClassroomAskstudent.class);
                     askstudentList.add(student);
-                    TClassroomActivestudent as = new TClassroomActivestudent();
-                    as.setRoomid(student.getRoomid());
-                    as.setStudentid(student.getStudentid());
-                    activestudentList.add(as);
                 } else if (rtype.equals("sign")) {//学生--签到
                     TClassroomSign sign = JSON.parseObject(jsonstr, TClassroomSign.class);
                     signList.add(sign);
-                    TClassroomActivestudent as = new TClassroomActivestudent();
-                    as.setRoomid(sign.getRoomid());
-                    as.setStudentid(sign.getUserid());
-                    activestudentList.add(as);
                 } else if (rtype.equals("paper")) {//堂测--发布
                     TClassroomPaper paper = JSON.parseObject(jsonstr, TClassroomPaper.class);
 
@@ -159,7 +134,7 @@ public class ClassroomController {
             });
         });
         return classroomService.batchSaveClass(startclassList, stopclassList, savefileList
-                , askteacherList, askstudentList, signList, activestudentList
+                , askteacherList, askstudentList, signList
                 , paperList, stupaperList, paperFileList, paperQtypeList, paperScantronList);
     }
 
@@ -183,7 +158,6 @@ public class ClassroomController {
         List<TClassroomAskteacher> askteacherList = new ArrayList<>();//结束课堂集合
         List<TClassroomAskstudent> askstudentList = new ArrayList<>();//结束课堂集合
         List<TClassroomSign> signList = new ArrayList<>();//结束课堂集合
-        List<TClassroomActivestudent> activestudentList = new ArrayList<>();//结束课堂集合
         List<TClassroomPaper> paperList = new ArrayList<>();//结束课堂集合
         List<TClassroomPaperStudent> stupaperList = new ArrayList<>();//结束课堂集合
         List<TClassroomPaperFile> paperFileList = new ArrayList<>();//堂测附件集合
@@ -207,17 +181,9 @@ public class ClassroomController {
             } else if (rtype.equals("askstudent")) {//互动--保存学生作答情况
                 TClassroomAskstudent student = JSON.parseObject(jsonstr, TClassroomAskstudent.class);
                 askstudentList.add(student);
-                TClassroomActivestudent as = new TClassroomActivestudent();
-                as.setRoomid(student.getRoomid());
-                as.setStudentid(student.getStudentid());
-                activestudentList.add(as);
             } else if (rtype.equals("sign")) {//学生--签到
                 TClassroomSign sign = JSON.parseObject(jsonstr, TClassroomSign.class);
                 signList.add(sign);
-                TClassroomActivestudent as = new TClassroomActivestudent();
-                as.setRoomid(sign.getRoomid());
-                as.setStudentid(sign.getUserid());
-                activestudentList.add(as);
             } else if (rtype.equals("paper")) {//堂测--发布
                 TClassroomPaper paper = JSON.parseObject(jsonstr, TClassroomPaper.class);
 
@@ -267,7 +233,7 @@ public class ClassroomController {
             }
         }
         return classroomService.saveClass(startclass, stopclass, savefileList
-                , askteacherList, askstudentList, signList, activestudentList
+                , askteacherList, askstudentList, signList
                 , paperList, stupaperList, paperFileList, paperQtypeList, paperScantronList);
     }
 

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomActivestudentMapper.java

@@ -44,4 +44,11 @@ public interface ClassroomActivestudentMapper extends TkMapper<TClassroomActives
 
     //批量更新活跃值排名
     void updateBatchActiveRank(@Param("roomids") List<Long> roomids);
+
+    //根据课堂id获取互动ids
+    String getAsktidsByRoomId(@Param("roomid") Long roomid);
+
+    //课堂学生
+    List<TClassroomActivestudent> listRoomStu(@Param("roomid") Long roomid, @Param("classid") Integer classid
+            ,@Param("asktids") String asktids);
 }

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

@@ -1,40 +1,10 @@
 package com.xhkjedu.sclass.service.classroom;
 
 import com.alibaba.fastjson.JSON;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomActivestudentMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomAskstudentMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomAskteacherMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomFileMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperFileMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperQtypeMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperScantronMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperStudentMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperStudentScantronMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomSignMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroom;
-import com.xhkjedu.sclass.model.classroom.TClassroomActivestudent;
-import com.xhkjedu.sclass.model.classroom.TClassroomAskstudent;
-import com.xhkjedu.sclass.model.classroom.TClassroomAskteacher;
-import com.xhkjedu.sclass.model.classroom.TClassroomFile;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaper;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperFile;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperQtype;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperScantron;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudent;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudentScantron;
-import com.xhkjedu.sclass.model.classroom.TClassroomSign;
+import com.xhkjedu.sclass.mapper.classroom.*;
+import com.xhkjedu.sclass.model.classroom.*;
 import com.xhkjedu.sclass.utils.ArithUtil;
-import com.xhkjedu.sclass.vo.classroom.ObjectiveVo;
-import com.xhkjedu.sclass.vo.classroom.ReportEQuestionVo;
-import com.xhkjedu.sclass.vo.classroom.ReportExamVo;
-import com.xhkjedu.sclass.vo.classroom.ReportRoomVo;
-import com.xhkjedu.sclass.vo.classroom.RoomAskTeacherVo;
-import com.xhkjedu.sclass.vo.classroom.RoomCorrectCallVo;
-import com.xhkjedu.sclass.vo.classroom.RoomCorrectExamVo;
-import com.xhkjedu.sclass.vo.classroom.RoomCorrectVo;
-import com.xhkjedu.sclass.vo.classroom.SubjectiveVo;
+import com.xhkjedu.sclass.vo.classroom.*;
 import com.xhkjedu.sclass.vo.paper.CheckClassVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
@@ -46,10 +16,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -556,7 +523,7 @@ public class ClassroomService {
      *
      * @return com.xhkjedu.vo.ResultVo
      * @Param [startclassList, stopclassList, savefileList, askteacherList, askstudentList, signList
-     * , activestudentList, paperList, stupaperList, paperFileList, paperQtypeList, paperScantronList]
+     * , paperList, stupaperList, paperFileList, paperQtypeList, paperScantronList]
      * @Author ywx
      * @Date 2022/6/28 16:51
      **/
@@ -564,7 +531,7 @@ public class ClassroomService {
     public ResultVo batchSaveClass(List<TClassroom> startclassList, List<TClassroom> stopclassList
             , List<TClassroomFile> savefileList
             , List<TClassroomAskteacher> askteacherList, List<TClassroomAskstudent> askstudentList
-            , List<TClassroomSign> signList, List<TClassroomActivestudent> activestudentList
+            , List<TClassroomSign> signList
             , List<TClassroomPaper> paperList, List<TClassroomPaperStudent> stupaperList
             , List<TClassroomPaperFile> paperFileList, List<TClassroomPaperQtype> paperQtypeList
             , List<TClassroomPaperScantron> paperScantronList) {
@@ -577,16 +544,12 @@ public class ClassroomService {
             Map<Integer, Integer> classMap = classList.stream().collect(Collectors.toMap(TClassroom::getClassid, TClassroom::getClassnum));
             startclassList.forEach(r -> r.setClassnum(classMap.get(r.getClassid())));
             classroomMapper.batchSave(startclassList);//批量保存课堂
-            classroomActivestudentMapper.batchSaveStuActive(startclassList);//批量添加学生课堂活跃度
             if (N_Utils.isListNotEmpty(signList)) classroomSignMapper.insertList(signList);//批量保存学生签到
 
             if (N_Utils.isListNotEmpty(askteacherList)) classroomAskteacherMapper.batchSave(askteacherList);//批量保存教师互动信息
             if (N_Utils.isListNotEmpty(askstudentList))
                 classroomAskstudentMapper.insertList(askstudentList);//批量保存学生互动信息
 
-            if (N_Utils.isListNotEmpty(activestudentList))
-                classroomActivestudentMapper.batchUpdateActiveNum(activestudentList);//批量更新学生活跃值
-
             if (N_Utils.isListNotEmpty(savefileList)) classroomFileMapper.insertList(savefileList);//批量保存课堂图片
 
             if (N_Utils.isListNotEmpty(paperList)) classroomPaperMapper.batchSave(paperList);//批量保存堂测
@@ -608,7 +571,9 @@ public class ClassroomService {
 
             List<Long> roomids = startclassList.stream().map(TClassroom::getRoomid).collect(Collectors.toList());
             classroomMapper.updateBatchRoomRealStunum(roomids);//批量更新班级实际签到学生数量
-            classroomActivestudentMapper.updateBatchActiveRank(roomids);//批量更新活跃值排名
+            for (TClassroom c : startclassList) {
+                saveStuActive(c.getRoomid(), c.getClassid(), c.getSchoolid());
+            }
 
             classroomMapper.updateBatchRoomState(classids);//批量结束之前班级的课堂状态
             resultVo.setCode(0);
@@ -735,14 +700,14 @@ public class ClassroomService {
      * 保存单个课堂数据
      *
      * @return com.xhkjedu.vo.ResultVo
-     * @Param [startclass, stopclass, savefileList, askteacherList, askstudentList, signList, activestudentList
+     * @Param [startclass, stopclass, savefileList, askteacherList, askstudentList, signList
      * , paperList, stupaperList, paperFileList, paperQtypeList, paperScantronList]
      * @Author ywx
      * @Date 2022/6/30 11:12
      **/
     public ResultVo saveClass(TClassroom startclass, TClassroom stopclass, List<TClassroomFile> savefileList
             , List<TClassroomAskteacher> askteacherList, List<TClassroomAskstudent> askstudentList, List<TClassroomSign> signList
-            , List<TClassroomActivestudent> activestudentList, List<TClassroomPaper> paperList
+            , List<TClassroomPaper> paperList
             , List<TClassroomPaperStudent> stupaperList, List<TClassroomPaperFile> paperFileList
             , List<TClassroomPaperQtype> paperQtypeList, List<TClassroomPaperScantron> paperScantronList) {
         ResultVo resultVo = new ResultVo();
@@ -755,16 +720,12 @@ public class ClassroomService {
             Integer num = classroomMapper.getStudentNumById(classid);//根据班级id获取学生数量
             startclass.setClassnum(num);
             classroomMapper.save(startclass);//批量保存课堂
-            classroomActivestudentMapper.saveStuActive(roomid, classid, schoolid);//批量添加学生课堂活跃度
             if (N_Utils.isListNotEmpty(signList)) classroomSignMapper.insertList(signList);//批量保存学生签到
 
             if (N_Utils.isListNotEmpty(askteacherList)) classroomAskteacherMapper.batchSave(askteacherList);//批量保存教师互动信息
             if (N_Utils.isListNotEmpty(askstudentList))
                 classroomAskstudentMapper.insertList(askstudentList);//批量保存学生互动信息
 
-            if (N_Utils.isListNotEmpty(activestudentList))
-                classroomActivestudentMapper.batchUpdateActiveNum(activestudentList);//批量更新学生活跃值
-
             if (N_Utils.isListNotEmpty(savefileList)) classroomFileMapper.insertList(savefileList);//批量保存课堂图片
 
             if (N_Utils.isListNotEmpty(paperList)) classroomPaperMapper.batchSave(paperList);//批量保存堂测
@@ -785,7 +746,7 @@ public class ClassroomService {
             if (stopclass != null) classroomMapper.endClass(stopclass);//批量结束课堂
 
             classroomMapper.updateBatchRoomRealStunum(Arrays.asList(roomid));//批量更新班级实际签到学生数量
-            classroomActivestudentMapper.updateActiveRank(roomid);//批量更新活跃值排名
+            classroomActivestudentMapper.saveStuActive(roomid, classid, schoolid);//更新学生活跃度
 
             classroomMapper.updateBatchRoomState(Arrays.asList(classid));//批量结束之前班级的课堂状态
             resultVo.setCode(0);
@@ -798,6 +759,37 @@ public class ClassroomService {
         return resultVo;
     }
 
+    //更新学生活跃度 2022/10/17 课堂活跃度最后统一计算
+    public void saveStuActive(Long roomid, Integer classid, Integer schoolid) {
+        String asktids = classroomActivestudentMapper.getAsktidsByRoomId(roomid);
+        List<TClassroomActivestudent> students = classroomActivestudentMapper.listRoomStu(roomid, classid, asktids);
+        if(N_Utils.isListEmpty(students)) return;
+        Map<Integer, Integer> rank=new HashMap<>();
+        setRank(students,rank);//计算排名
+        int timestamp = N_Utils.getSecondTimestamp();
+        students.forEach(s -> {
+            s.setRoomid(roomid);
+            s.setSchoolid(schoolid);
+            s.setActiverank(rank.get(s.getActivenum()));
+            s.setCreatetime(timestamp);
+        });
+        classroomActivestudentMapper.insertList(students);
+    }
+
+    //计算排名
+    private void setRank(List<TClassroomActivestudent> students, Map<Integer, Integer> rank) {
+        List<Map.Entry<Integer, List<TClassroomActivestudent>>> gslist2 = students.stream()
+                .collect(Collectors.groupingBy(TClassroomActivestudent::getActivenum)).entrySet()
+                .stream().sorted((s1, s2) -> -Double.compare(s1.getKey(), s2.getKey())).collect(Collectors.toList());
+        Integer index = 1;
+        for (Map.Entry<Integer, List<TClassroomActivestudent>> entry : gslist2) {
+            for (TClassroomActivestudent cs : entry.getValue()) {
+                rank.put(cs.getActivenum(), index);
+            }
+            index = index + entry.getValue().size();
+        }
+    }
+
     /**
      * 根据课堂id获取课堂名称
      *

sclass/src/main/resources/mapper/classroom/ClassroomActivestudentMapper.xml

@@ -43,4 +43,18 @@
             s.classid=${r.classid}
         </foreach>
     </insert>
+    <!--根据课堂id获取互动ids-->
+    <select id="getAsktidsByRoomId" resultType="java.lang.String">
+        select group_concat(asktid) from t_classroom_askteacher where roomid=#{roomid}
+    </select>
+    <!--课堂学生-->
+    <select id="listRoomStu" resultType="com.xhkjedu.sclass.model.classroom.TClassroomActivestudent">
+        select cs.studentid,(
+            (select count(distinct s.userid) from t_classroom_sign s where s.roomid=#{roomid} and s.userid=cs.studentid)
+        <if test="asktids!=null and asktids!=''">
+            +(select count(*) from t_classroom_askstudent s where s.asktid in(${asktids}) and s.studentid=cs.studentid)
+        </if>
+        )activenum
+        from t_class_student cs where cs.classid=#{classid}
+    </select>
 </mapper>