直播模块优化

slive/src/main/java/com/xhkjedu/slive/controller/liveplay/CourseController.java

@@ -69,7 +69,7 @@ public class CourseController {
         N_Utils.validation(new Object[]{course.getPage(),"显示页码",1
                 ,course.getPageSize(),"显示条数",1,course.getSchoolid(),"学校id",1});
         PageHelper.startPage(course.getPage(), course.getPageSize());
-        List<LCourse> list = courseService.listAll(course);
+        List<CourseVo> list = courseService.listAll(course);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0,"获取课程列表成功",pageResult);
     }
@@ -91,7 +91,7 @@ public class CourseController {
         N_Utils.validation(new Object[]{course.getPage(),"显示页码",1
                 ,course.getPageSize(),"显示条数",1,course.getCreateid(),"学生id",1});
         PageHelper.startPage(course.getPage(), course.getPageSize());
-        List<LCourse> list = courseService.listStu(course);
+        List<CourseVo> list = courseService.listStu(course);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0,"获取学生课程列表成功",pageResult);
     }

slive/src/main/java/com/xhkjedu/slive/mapper/gradeclass/ClassStudentMapper.java

@@ -9,13 +9,13 @@ public interface ClassStudentMapper extends TkMapper<TClassStudent> {
     void deleteById(@Param("classid") Integer classid,@Param("studentid") Integer studentid);
 
     /**
-     * 根据班级id和学生id获取班级学生信息
+     * 获取班级学生id
      * @Param [classid, studentid]
      * @Author ywx
-     * @Date 2020/6/19 10:08
-     * @return com.xhkjedu.model.gradeclass.TClassStudent
+     * @Date 2022/2/24 9:09
+     * @return java.lang.Integer
      **/
-    TClassStudent getByClassIdStudentId(@Param("classid") Integer classid,@Param("studentid") Integer studentid);
+    Integer getByClassIdStudentId(@Param("classid") Integer classid,@Param("studentid") Integer studentid);
 
     //添加
     void save(@Param("student") TClassStudent student);

slive/src/main/java/com/xhkjedu/slive/mapper/liveplay/CourseMapper.java

@@ -18,7 +18,7 @@ public interface CourseMapper extends TkMapper<LCourse> {
     void updateStuNum(@Param("courseid") Integer courseid);
 
     //课程列表
-    List<LCourse> listAll(@Param("course") LCourse course);
+    List<CourseVo> listAll(@Param("course") LCourse course);
 
     //课程详情
     CourseVo findById(@Param("course") LCourse course);
@@ -27,7 +27,7 @@ public interface CourseMapper extends TkMapper<LCourse> {
     Integer findOnSection(Integer courseid);
 
     //获取学生课程列表
-    List<LCourse> listStu(@Param("course") LCourse course);
+    List<CourseVo> listStu(@Param("course") LCourse course);
 
     //修改课程状态
     void updateState(@Param("course") LCourse course);

slive/src/main/java/com/xhkjedu/slive/service/gradeclass/ClassService.java

@@ -90,7 +90,7 @@ public class ClassService {
 
     //学生选课
     public void saveSelection(Integer classid, Integer studentid, Integer teacherid, Integer schoolid) {
-        TClassStudent student = classStudentMapper.getByClassIdStudentId(classid, studentid);
+        Integer student = classStudentMapper.getByClassIdStudentId(classid, studentid);
         if (student == null) {
             //班级学生
             TClassStudent cs = new TClassStudent();

slive/src/main/java/com/xhkjedu/slive/service/liveplay/CourseService.java

@@ -251,7 +251,7 @@ public class CourseService {
     }
 
     //获取列表
-    public List<LCourse> listAll(LCourse course) {
+    public List<CourseVo> listAll(LCourse course) {
         return courseMapper.listAll(course);
     }
 
@@ -298,7 +298,7 @@ public class CourseService {
     }
 
     //获取学生课程列表
-    public List<LCourse> listStu(LCourse course) {
+    public List<CourseVo> listStu(LCourse course) {
         return courseMapper.listStu(course);
     }
 

slive/src/main/resources/application.properties

@@ -94,7 +94,7 @@ cron.updateLicense=0 0 0 * * ?
 #每隔1小时修改license状态
 cron.updateLicenseState=0 0 0/1 * * ?
 #默认为false，不开启定时任务
-enable.scheduled=true
+enable.scheduled=false
 
 #版本号
 versionname=Test_v3.2.0

slive/src/main/resources/mapper/gradeclass/ClassStudentMapper.xml

@@ -8,6 +8,10 @@
         left join t_group_student gs on g.groupid = gs.groupid AND gs.studentid=cs.studentid
         where cs.classid=#{classid} and cs.studentid=#{studentid}
     </delete>
+    <!--获取班级学生id-->
+    <select id="getByClassIdStudentId" resultType="java.lang.Integer">
+        select csid from t_class_student where classid=#{classid} and studentid=#{studentid} limit 1
+    </select>
     <!--添加-->
     <insert id="save">
         insert ignore into t_class_student (classid,studentid,createid,createtime,schoolid)

slive/src/main/resources/mapper/system/UserMapper.xml

@@ -10,7 +10,7 @@
         select userid from t_user where <if test="schoolid!=null">schoolid=#{schoolid} and </if>loginname=#{loginname}
     </select>
     <!--根据用户id获取姓名-->
-    <select id="getUserNameById" resultType="java.lang.Integer">
+    <select id="getUserNameById" resultType="java.lang.String">
         select username from t_user where userid=#{userid}
     </select>
     <!--根据登录名获取学生信息-->