课堂完善

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

@@ -118,7 +118,7 @@ public class ClassroomController {
                 } else if (rtype.equals("sign")) {//学生--签到
                     TClassroomSign sign = JSON.parseObject(jsonstr, TClassroomSign.class);
                     signList.add(sign);
-                } else if (rtype.equals("paper")) {//堂测--发布
+                } else if (rtype.equals("paperteacher") || "paper".equals(rtype)) {//堂测--发布
                     TClassroomPaper paper = JSON.parseObject(jsonstr, TClassroomPaper.class);
 
                     //堂测附件
@@ -164,13 +164,13 @@ public class ClassroomController {
                         }
                     }
                     paperList.add(paper);
-                } else if (rtype.equals("stupaper")) {//堂测--学生作答详情
+                } else if (rtype.equals("paperstudent") || "stupaper".equals(rtype)) {//堂测--学生作答详情
                     TClassroomPaperStudent student = JSON.parseObject(jsonstr, TClassroomPaperStudent.class);
                     stupaperList.add(student);
-                } else if (rtype.equals("vote")){//投票
+                } else if (rtype.equals("voteteacher")){//投票
                     TClassroomVote vote = JSON.parseObject(jsonstr,TClassroomVote.class);
                     voteList.add(vote);
-                } else if(rtype.equals("stuvote")){//投票--学生投票
+                } else if(rtype.equals("votestudent")){//投票--学生投票
                     TClassroomVoteStudent stuvote = JSON.parseObject(jsonstr,TClassroomVoteStudent.class);
                     votestuList.add(stuvote);
                 }
@@ -248,7 +248,7 @@ public class ClassroomController {
             } else if (rtype.equals("sign")) {//学生--签到
                 TClassroomSign sign = JSON.parseObject(jsonstr, TClassroomSign.class);
                 signList.add(sign);
-            } else if (rtype.equals("paper")) {//堂测--发布
+            } else if (rtype.equals("paperteacher") || "paper".equals(rtype)) {//堂测--发布
                 TClassroomPaper paper = JSON.parseObject(jsonstr, TClassroomPaper.class);
 
                 //堂测附件
@@ -294,13 +294,13 @@ public class ClassroomController {
                     }
                 }
                 paperList.add(paper);
-            } else if (rtype.equals("stupaper")) {//堂测--学生作答详情
+            } else if (rtype.equals("paperstudent") || "stupaper".equals(rtype)) {//堂测--学生作答详情
                 TClassroomPaperStudent student = JSON.parseObject(jsonstr, TClassroomPaperStudent.class);
                 stupaperList.add(student);
-            } else if (rtype.equals("vote")){//投票
+            } else if (rtype.equals("voteteacher")){//投票
                 TClassroomVote vote = JSON.parseObject(jsonstr,TClassroomVote.class);
                 voteList.add(vote);
-            } else if(rtype.equals("stuvote")){//投票--学生投票
+            } else if(rtype.equals("votestudent")){//投票--学生投票
                 TClassroomVoteStudent stuvote = JSON.parseObject(jsonstr,TClassroomVoteStudent.class);
                 votestuList.add(stuvote);
             }
@@ -561,7 +561,7 @@ public class ClassroomController {
      **/
     @PostMapping("/detail_vote")
     public ResultVo detailVote(@RequestBody TClassroomVote vote) {
-        Integer voteid = vote.getVoteid();
+        Long voteid = vote.getVoteid();
         N_Utils.validation(new Object[]{voteid, "投票id", 1});
         List<Map<String,Object>> votes = classroomService.getVoteDetail(voteid);
         return new ResultVo(0, "获取投票详情成功", votes);

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

@@ -14,7 +14,7 @@ public interface ClassroomVoteMapper extends TkMapper<TClassroomVote> {
     List<Map<String,Object>> listVoteByRoomid(@Param("roomid")Long roomid);
 
     //投票参与学生
-    List<TClassroomVoteStudent> listVoteStus(@Param("voteid")Integer voteid);
+    List<TClassroomVoteStudent> listVoteStus(@Param("voteid")Long voteid);
 
     //课堂信息投票
     List<Map> listVoteStuByRoomAndStuid(@Param("roomid")Long roomid,@Param("studentid")Integer studentid);

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

@@ -11,7 +11,7 @@ public class TClassroomVote {
      * 课堂投票表
      */
     @Id
-    private Integer voteid;
+    private Long voteid;
 
     /**
      * 课堂ID

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

@@ -23,7 +23,7 @@ public class TClassroomVoteStudent {
     /**
      * 课堂投票表ID
      */
-    private Integer voteid;
+    private Long voteid;
 
     /**
      * 学生id

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

@@ -900,7 +900,7 @@ public class ClassroomService {
      * @Param [voteid]
      * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      **/
-    public List<Map<String,Object>> getVoteDetail(Integer voteid){
+    public List<Map<String,Object>> getVoteDetail(Long voteid){
         List<Map<String,Object>> list = new ArrayList<>();
 
         List<TClassroomVoteStudent> stuList = classroomVoteMapper.listVoteStus(voteid);

sexam/src/main/resources/application.properties

@@ -11,6 +11,10 @@ spring.datasource.url=jdbc:mysql://dbtest.xhkjedu.com:3306/xhkjedu_school_test?c
 spring.datasource.username=root
 spring.datasource.password=HNxhkjedu!@#07
 
+#spring.datasource.url=jdbc:mysql://10.56.1.53:13306/xhkjedu_school?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true&allowMultiQueries=true
+#spring.datasource.username=root
+#spring.datasource.password=_xhkjedu!@#07
+
 spring.mvc.hiddenmethod.filter.enabled=true
 #数据库连接池配置
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

sstudy/src/main/java/com/xhkjedu/sstudy/model/bk/TBk.java

@@ -30,7 +30,7 @@ public class TBk extends BaseBean {
     private Integer bktype;
 
     /**
-     * 互动类型30判断题31选择题32简答题33画图题
+     * 互动类型30判断题31选择题32简答题33画图题50投票
      */
     private Integer asktype;
 
@@ -64,6 +64,11 @@ public class TBk extends BaseBean {
      */
     private Integer inforsize;
 
+    /**
+     * 资料后缀
+     */
+    private String inforsuffix;
+
     /**
      * 资料文件地址
      */

sstudy/src/main/resources/mapper/bk/TBkMapper.xml

@@ -1,32 +1,10 @@
 <?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.sstudy.mapper.bk.TBkMapper">
-  <resultMap id="BaseResultMap" type="com.xhkjedu.sstudy.model.bk.TBk">
-    <id column="bkid" jdbcType="INTEGER" property="bkid" />
-    <result column="lsbid" jdbcType="VARCHAR" property="lsbid" />
-    <result column="directorid" jdbcType="VARCHAR" property="directorid" />
-    <result column="bktype" jdbcType="INTEGER" property="bktype" />
-    <result column="asktype" jdbcType="INTEGER" property="asktype" />
-    <result column="bktitle" jdbcType="VARCHAR" property="bktitle" />
-    <result column="duration" jdbcType="INTEGER" property="duration" />
-    <result column="papernum" jdbcType="INTEGER" property="papernum" />
-    <result column="paperscore" jdbcType="DOUBLE" property="paperscore" />
-    <result column="votetype" jdbcType="VARCHAR" property="votetype" />
-    <result column="inforsize" jdbcType="INTEGER" property="inforsize" />
-    <result column="inforpath" jdbcType="VARCHAR" property="inforpath" />
-    <result column="inforpdf" jdbcType="VARCHAR" property="inforpdf" />
-    <result column="imgpath" jdbcType="VARCHAR" property="imgpath" />
-    <result column="createid" jdbcType="INTEGER" property="createid" />
-    <result column="createtime" jdbcType="INTEGER" property="createtime" />
-    <result column="updateid" jdbcType="INTEGER" property="updateid" />
-    <result column="updatetime" jdbcType="INTEGER" property="updatetime" />
-    <result column="schoolid" jdbcType="INTEGER" property="schoolid" />
-    <result column="bkjson" jdbcType="LONGVARCHAR" property="bkjson" />
-  </resultMap>
 
   <!--备课列表-->
   <select id="listBks" resultType="java.util.Map">
-    select bkid,lsbid,directorid,bktype,asktype,bktitle,duration,papernum,paperscore,votetype,inforsize,
+    select bkid,lsbid,directorid,bktype,asktype,bktitle,duration,papernum,paperscore,votetype,inforsize,inforsuffix,bkjson,
     inforpath,inforpdf,imgpath,updatetime from t_bk
     where createid=#{createid}
     <if test="bk.bktype!=null and bk.bktype!=0">