预习，课堂资料系列接口

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

@@ -69,6 +69,8 @@ public class ClassroomController {
         List<TClassroomPaperScantron> paperScantronList = new ArrayList<>();//堂测答题卡--题型试题集合
         List<TClassroomVote> voteList = new ArrayList<>();//课堂投票集合
         List<TClassroomVoteStudent> votestuList = new ArrayList<>();//课堂投票--学生投票
+        List<TClassroomProfile> profileList = new ArrayList<>();//资料
+        List<TClassroomProfileStudent> profileStudentList = new ArrayList<>();//资料--学生
 
         if(N_Utils.isListEmpty(rooms)) return new ResultVo(0,"保存成功");
         String nodename = rooms.get(0).getNodename();
@@ -173,12 +175,18 @@ public class ClassroomController {
                 } else if(rtype.equals("votestudent")){//投票--学生投票
                     TClassroomVoteStudent stuvote = JSON.parseObject(jsonstr,TClassroomVoteStudent.class);
                     votestuList.add(stuvote);
+                } else if("profileteacher".equals(rtype)){//资料
+                    TClassroomProfile profile = JSON.parseObject(jsonstr,TClassroomProfile.class);
+                    profileList.add(profile);
+                } else if("profilestudent".equals(rtype)){//资料--学生
+                    TClassroomProfileStudent stuProfile = JSON.parseObject(jsonstr,TClassroomProfileStudent.class);
+                    profileStudentList.add(stuProfile);
                 }
             });
         });
         return classroomService.batchSaveClass(startclassList, stopclassList, savefileList
                 , askteacherList, askstudentList, signList
-                , paperList, nodename, stupaperList, paperFileList, paperQtypeList, paperScantronList, voteList, votestuList);
+                , paperList, nodename, stupaperList, paperFileList, paperQtypeList, paperScantronList, voteList, votestuList,profileList,profileStudentList);
     }
 
     /**
@@ -211,19 +219,21 @@ public class ClassroomController {
         List<TClassroomPaperScantron> paperScantronList = new ArrayList<>();//堂测答题卡--题型试题集合
         List<TClassroomVote> voteList = new ArrayList<>();//课堂投票
         List<TClassroomVoteStudent> votestuList = new ArrayList<>();//课堂投票--学生投票
+        List<TClassroomProfile> profileList = new ArrayList<>();//资料
+        List<TClassroomProfileStudent> profileStudentList = new ArrayList<>();//资料--学生
 
         String nodename = r.getNodename();
         for (RoomParamVo param : params) {
             String rtype = param.getRtype();
             String jsonstr = param.getJsonstr();
             N_Utils.validation(new Object[]{rtype, "请求类型", 2, jsonstr, "请求json", 2});
-            if (rtype.equals("startclass")) {//课堂--开始
+            if ("startclass".equals(rtype)) {//课堂--开始
                 startclass = JSON.parseObject(jsonstr, TClassroom.class);
                 int schoolyear = classroomService.getSchoolYearBySchoolid(startclass.getSchoolid());
                 startclass.setYear(schoolyear);
-            } else if (rtype.equals("stopclass")) {//课堂--结束
+            } else if ("stopclass".equals(rtype)) {//课堂--结束
                 stopclass = JSON.parseObject(jsonstr, TClassroom.class);
-            } else if (rtype.equals("savefile")) {//课堂--保存图片
+            } else if ("savefile".equals(rtype)) {//课堂--保存图片
                 TClassroomFile file = JSON.parseObject(jsonstr, TClassroomFile.class);
                 if (N_Utils.isNotEmpty(file.getRfpath())) {
                     if(N_Utils.isNotEmpty(nodename)) {
@@ -231,24 +241,24 @@ public class ClassroomController {
                     }
                     savefileList.add(file);
                 }
-            } else if (rtype.equals("askteacher")) {//互动--发起
+            } else if ("askteacher".equals(rtype)) {//互动--发起
                 TClassroomAskteacher teacher = JSON.parseObject(jsonstr, TClassroomAskteacher.class);
                 String teacherpic = teacher.getTeacherpic();
                 if (N_Utils.isNotEmpty(nodename) && N_Utils.isNotEmpty(teacherpic)) {
                     teacher.setTeacherpic(nodename + "/" + teacherpic);
                 }
                 askteacherList.add(teacher);
-            } else if (rtype.equals("askstudent")) {//互动--保存学生作答情况
+            } else if ("askstudent".equals(rtype)) {//互动--保存学生作答情况
                 TClassroomAskstudent student = JSON.parseObject(jsonstr, TClassroomAskstudent.class);
                 String studentpic = student.getStudentpic();
                 if (N_Utils.isNotEmpty(nodename) && N_Utils.isNotEmpty(studentpic)) {
                     student.setStudentpic(nodename + "/" + studentpic);
                 }
                 askstudentList.add(student);
-            } else if (rtype.equals("sign")) {//学生--签到
+            } else if ("sign".equals(rtype)) {//学生--签到
                 TClassroomSign sign = JSON.parseObject(jsonstr, TClassroomSign.class);
                 signList.add(sign);
-            } else if (rtype.equals("paperteacher") || "paper".equals(rtype)) {//堂测--发布
+            } else if ("paperteacher".equals(rtype) || "paper".equals(rtype)) {//堂测--发布
                 TClassroomPaper paper = JSON.parseObject(jsonstr, TClassroomPaper.class);
 
                 //堂测附件
@@ -294,20 +304,26 @@ public class ClassroomController {
                     }
                 }
                 paperList.add(paper);
-            } else if (rtype.equals("paperstudent") || "stupaper".equals(rtype)) {//堂测--学生作答详情
+            } else if ("paperstudent".equals(rtype) || "stupaper".equals(rtype)) {//堂测--学生作答详情
                 TClassroomPaperStudent student = JSON.parseObject(jsonstr, TClassroomPaperStudent.class);
                 stupaperList.add(student);
-            } else if (rtype.equals("voteteacher")){//投票
+            } else if ("voteteacher".equals(rtype)){//投票
                 TClassroomVote vote = JSON.parseObject(jsonstr,TClassroomVote.class);
                 voteList.add(vote);
-            } else if(rtype.equals("votestudent")){//投票--学生投票
+            } else if("votestudent".equals(rtype)){//投票--学生投票
                 TClassroomVoteStudent stuvote = JSON.parseObject(jsonstr,TClassroomVoteStudent.class);
                 votestuList.add(stuvote);
+            } else if("profileteacher".equals(rtype)){//资料
+                TClassroomProfile profile = JSON.parseObject(jsonstr,TClassroomProfile.class);
+                profileList.add(profile);
+            } else if("profilestudent".equals(rtype)){//资料--学生
+                TClassroomProfileStudent stuProfile = JSON.parseObject(jsonstr,TClassroomProfileStudent.class);
+                profileStudentList.add(stuProfile);
             }
         }
         return classroomService.saveClass(startclass, stopclass, savefileList
                 , askteacherList, askstudentList, signList
-                , paperList, nodename, stupaperList, paperFileList, paperQtypeList, paperScantronList, voteList, votestuList);
+                , paperList, nodename, stupaperList, paperFileList, paperQtypeList, paperScantronList, voteList, votestuList, profileList, profileStudentList);
     }
 
     @PostMapping("/list_correct")

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

@@ -0,0 +1,21 @@
+package com.xhkjedu.sclass.mapper.classroom;
+
+import com.xhkjedu.base.TkMapper;
+import com.xhkjedu.sclass.model.classroom.TClassroomProfile;
+import com.xhkjedu.sclass.model.classroom.TClassroomVoteStudent;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ClassroomProfileMapper extends TkMapper<TClassroomProfile> {
+
+    //获取课堂资料
+    List<Map<String,Object>> listProfileByRoomid(@Param("roomid")Long roomid);
+
+    //资料查看学生
+    List<TClassroomVoteStudent> listProfileStus(@Param("profileid")Long profileid);
+
+    //资料信息投票
+    List<Map> listProfileStuByRoomAndStuid(@Param("roomid")Long roomid,@Param("studentid")Integer studentid);
+}

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

@@ -0,0 +1,7 @@
+package com.xhkjedu.sclass.mapper.classroom;
+
+import com.xhkjedu.base.TkMapper;
+import com.xhkjedu.sclass.model.classroom.TClassroomProfileStudent;
+
+public interface ClassroomProfileStudentMapper extends TkMapper<TClassroomProfileStudent> {
+}

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomProfile.java

@@ -0,0 +1,56 @@
+package com.xhkjedu.sclass.model.classroom;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_classroom_profile")
+@Data
+public class TClassroomProfile {
+    /**
+     * 课堂资料表
+     */
+    @Id
+    private Long profileid;
+
+    /**
+     * 课堂ID
+     */
+    private Long roomid;
+
+    /**
+     * 资料名称
+     */
+    private String profilename;
+
+    //资料预览地址
+    private String profileurl;
+
+    //资料后缀
+    private String profilesuffix;
+
+    //资料地址
+    private String profilepath;
+
+    /**
+     * 时长（秒）
+     */
+    private Integer profilesec;
+
+    /**
+     * 创建人ID
+     */
+    private Integer createid;
+
+    /**
+     * 创建时间
+     */
+    private Integer createtime;
+
+    /**
+     * 学校ID
+     */
+    private Integer schoolid;
+
+}

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomProfileStudent.java

@@ -0,0 +1,46 @@
+package com.xhkjedu.sclass.model.classroom;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+@Table(name = "t_classroom_profile_student")
+@Data
+public class TClassroomProfileStudent {
+    /**
+     * 课堂资料学生查看表
+     */
+    @Id
+    private Integer pfsid;
+
+    /**
+     * 课堂ID
+     */
+    private Long roomid;
+
+    /**
+     * 课堂资料表ID
+     */
+    private Long profileid;
+
+    /**
+     * 学生id
+     */
+    private Integer studentid;
+
+    /**
+     * 学生查看时长（秒）
+     */
+    private Integer stusec;
+
+    /**
+     * 创建时间
+     */
+    private Integer createtime;
+
+    @Transient
+    private String username;
+
+}

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

@@ -56,6 +56,10 @@ public class ClassroomService {
     private ClassroomVoteMapper classroomVoteMapper;
     @Resource
     private ClassroomVoteStudentMapper classroomVoteStudentMapper;
+    @Resource
+    private ClassroomProfileMapper classroomProfileMapper;
+    @Resource
+    private ClassroomProfileStudentMapper classroomProfileStudentMapper;
 
     /**
      * 开始课堂
@@ -531,6 +535,11 @@ public class ClassroomService {
         List<Map<String,Object>> votes = classroomVoteMapper.listVoteByRoomid(roomid);
         room.setVotes(votes);
 
+        //课堂资料
+        List<Map<String,Object>> profiles = classroomProfileMapper.listProfileByRoomid(roomid);
+        room.setProfiles(profiles);
+
+
         return new ResultVo(0, "获取课堂回顾详情成功", room);
     }
 
@@ -561,7 +570,8 @@ public class ClassroomService {
             , List<TClassroomPaper> paperList,String nodename, List<TClassroomPaperStudent> stupaperList
             , List<TClassroomPaperFile> paperFileList, List<TClassroomPaperQtype> paperQtypeList
             , List<TClassroomPaperScantron> paperScantronList
-            ,List<TClassroomVote> voteList,List<TClassroomVoteStudent> votestuList) {
+            ,List<TClassroomVote> voteList,List<TClassroomVoteStudent> votestuList
+            ,List<TClassroomProfile> profileList,List<TClassroomProfileStudent> profileStudentList) {
         ResultVo resultVo = new ResultVo();
         resultVo.setCode(1);
         try {
@@ -600,6 +610,13 @@ public class ClassroomService {
             if(N_Utils.isListNotEmpty(votestuList)){
                 classroomVoteStudentMapper.insertList(votestuList);//投票--学生投票结果
             }
+            if(N_Utils.isListNotEmpty(profileList)){
+                classroomProfileMapper.insertList(profileList);
+            }
+
+            if(N_Utils.isListNotEmpty(profileStudentList)){
+                classroomProfileStudentMapper.insertList(profileStudentList);
+            }
 
             if (N_Utils.isListNotEmpty(stopclassList)) classroomMapper.batchEndClass(stopclassList);//批量结束课堂
 
@@ -750,7 +767,9 @@ public class ClassroomService {
             , List<TClassroomPaper> paperList, String nodename
             , List<TClassroomPaperStudent> stupaperList, List<TClassroomPaperFile> paperFileList
             , List<TClassroomPaperQtype> paperQtypeList, List<TClassroomPaperScantron> paperScantronList
-            ,List<TClassroomVote> voteList,List<TClassroomVoteStudent> votestuList) {
+            ,List<TClassroomVote> voteList,List<TClassroomVoteStudent> votestuList
+            ,List<TClassroomProfile> profileList,List<TClassroomProfileStudent> profileStudentList) {
+
         ResultVo resultVo = new ResultVo();
         resultVo.setCode(1);
         try {
@@ -791,6 +810,14 @@ public class ClassroomService {
                 classroomVoteStudentMapper.insertList(votestuList);//投票--学生投票结果
             }
 
+            if(N_Utils.isListNotEmpty(profileList)){
+                classroomProfileMapper.insertList(profileList);
+            }
+
+            if(N_Utils.isListNotEmpty(profileStudentList)){
+                classroomProfileStudentMapper.insertList(profileStudentList);
+            }
+
             if (stopclass != null) classroomMapper.endClass(stopclass);//批量结束课堂
 
             classroomMapper.updateBatchRoomRealStunum(Arrays.asList(roomid));//批量更新班级实际签到学生数量

sclass/src/main/java/com/xhkjedu/sclass/vo/classroom/ReportRoomVo.java

@@ -63,4 +63,6 @@ public class ReportRoomVo {
 
     //投票
     private List<Map<String,Object>> votes;
+    //资料
+    private List<Map<String,Object>> profiles;
 }

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

@@ -180,6 +180,8 @@
         ,g.gradeid,g.classname,(select count(*) from t_classroom_sign s where s.userid=#{room.studentid}
         and s.roomid=r.roomid) signstate
         ,(select count(*) from t_classroom_video rv where rv.roomid=r.roomid)videonum
+        ,(select count(*) from t_classroom_vote vt where vt.roomid=c.roomid)votenum
+        ,(select count(*) from t_classroom_profile p where p.roomid=c.roomid)profilenum
         from t_classroom r left join t_user u on r.teacherid=u.userid
         left join t_subject_book sb on r.lsbid=sb.lsbid
         left join t_class_student cs on r.classid=cs.classid
@@ -347,6 +349,7 @@
         where rt.roomid=c.roomid and rt.asktype between 32 and 40)wpynum
         ,(select count(*) from t_classroom_video rv where rv.roomid=c.roomid)videonum
         ,(select count(*) from t_classroom_vote vt where vt.roomid=c.roomid)votenum
+        ,(select count(*) from t_classroom_profile p where p.roomid=c.roomid)profilenum
         FROM t_classroom c LEFT JOIN t_class g ON c.classid=g.classid
         left join t_user u on c.teacherid=u.userid
         left join t_director d on c.directorid=d.directorid

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sclass.mapper.classroom.ClassroomProfileMapper">
+
+  <!--获取课堂资料-->
+  <select id="listProfileByRoomid" resultType="java.util.Map">
+    select profileid,profilename,profileurl,profilesuffix,profilepath,profilesec
+    from t_classroom_profile where roomid=#{roomid} order by createtime desc
+  </select>
+
+  <!--资料产看学生-->
+  <select id="listProfileStus" resultType="com.xhkjedu.sclass.model.classroom.TClassroomVoteStudent">
+    select s.stuvote,s.createtime,s.studentid,u.username from t_classroom_profile_student s
+    left join t_user u on s.studentid=u.userid
+    where s.profileid=#{profileid} order by s.createtime
+  </select>
+
+  <!--资料信息投票-->
+  <select id="listProfileStuByRoomAndStuid" resultType="java.util.Map">
+    select v.profileid,v.profilename,v.profileurl,v.profilesuffix,v.profilepath,
+    v.profilesec,vs.stusec,vs.createtime from t_classroom_profile v
+    left join t_classroom_profile_student vs on vs.voteid=v.voteid
+    where v.roomid=#{roomid} and vs.studentid=#{studentid}
+  </select>
+</mapper>

sstudy/src/main/java/com/xhkjedu/sstudy/model/resource/TGuide.java

@@ -30,6 +30,8 @@ public class TGuide extends BaseBean {
 
     private String directorid;//章节id
 
+    private String comm;//预习要求
+
     private Integer createid;//创建人id
 
     private Integer createtime;//创建时间

sstudy/src/main/java/com/xhkjedu/sstudy/vo/resource/GuideVo.java

@@ -32,6 +32,8 @@ public class GuideVo {
 
     private Integer schoolid;//学校id
 
+    private String comm;//预习要求
+
     //是否有伙伴学校：0没有1有
     private Integer hashb;
 

sstudy/src/main/resources/mapper/resource/GuideMapper.xml

@@ -11,6 +11,7 @@
         <result column="subjectname" property="subjectname"/>
         <result column="createid" property="createid"/>
         <result column="hashb" property="hashb"/>
+        <result column="comm" property="comm"/>
         <collection property="resources" ofType="java.util.Map"
                     javaType="java.util.List" select="listResourcesByGuideid" column="guideid">
         </collection>
@@ -18,7 +19,7 @@
 
     <!--学生预习列表教师网页端-->
     <select id="listGuidesForTeacherWeb" resultMap="guidesForMap">
-        select distinct g.guideid,g.guidename,g.createtime,g.schoolid,g.createid,g.hashb
+        select distinct g.guideid,g.guidename,g.createtime,g.schoolid,g.createid,g.hashb,g.comm
         ,(select u.username from t_user u where g.createid=u.userid)createname
         from t_guide g left join t_guide_resource gr on g.guideid=gr.guideid
         left join t_guide_group gg on g.guideid = gg.guideid
@@ -44,7 +45,7 @@
     </select>
     <!--学生预习列表教师网页端-我的-->
     <select id="listGuidesForTeacherWebMy" resultMap="guidesForMap">
-        select distinct g.guideid,g.guidename,g.createtime,g.schoolid,g.createid,g.hashb
+        select distinct g.guideid,g.guidename,g.createtime,g.schoolid,g.createid,g.hashb,g.comm
         ,(select u.username from t_user u where g.createid=u.userid)createname
         from t_guide g left join t_guide_resource gr on g.guideid=gr.guideid
         left join t_guide_group gg on g.guideid = gg.guideid
@@ -70,7 +71,7 @@
 
     <!--学生预习列表教师app-->
     <select id="listGuidesForTeacherApp" resultType="java.util.Map">
-        select g.guideid,g.guidename,g.createtime,
+        select g.guideid,g.guidename,g.createtime,g.comm,
         g.schoolid,(select u.username from t_user u where g.createid=u.userid)createname,
         count(DISTINCT gr.resourceid)as filenum,r.suffix,r.resourcecover,r.resourceclass,r.converted,
         sum(r.resourcesize) as resourcesize
@@ -95,7 +96,7 @@
 
     <!--学生预习列表学生网页端-->
     <select id="listGuidesForStuWeb" resultMap="guidesForMap">
-        select g.guideid,g.guidename,g.createtime,g.schoolid,u.username as createname,ggs.costtime,
+        select g.guideid,g.guidename,g.createtime,g.schoolid,g.comm,u.username as createname,ggs.costtime,
         s.subjectname,count(DISTINCT gr.resourceid)as filenum
         from t_guide_group_student ggs
         left join t_guide g on ggs.guideid=g.guideid
@@ -126,7 +127,7 @@
 
     <!--学生预习列表学生app-->
     <select id="listGuidesForStuApp" resultType="java.util.Map">
-        select g.guideid,g.guidename,g.createtime,g.schoolid,ggs.costtime,
+        select g.guideid,g.guidename,g.createtime,g.schoolid,g.comm,ggs.costtime,
         count(DISTINCT gr.resourceid)as filenum,r.suffix,r.resourcesize,r.resourcecover,r.resourceclass,r.converted,
         u.username as createname,ggs.costtime from t_guide_group_student ggs
         left join t_guide g on ggs.guideid=g.guideid
@@ -161,7 +162,7 @@
 
     <!--根据预习id获取预习详情-->
     <select id="getGuideByGuideid" resultMap="guidesForMap">
-      select g.guideid,g.guidename,g.createtime,g.schoolid,g.createid,u.username as createname
+      select g.guideid,g.guidename,g.createtime,g.schoolid,g.createid,g.comm,u.username as createname
         from t_guide g
         left join t_user u on g.createid=u.userid
         where g.guideid=#{guideid}