Merge remote-tracking branch 'origin/master' into ywx

slive/src/main/java/com/xhkjedu/slive/controller/xz/XzController.java

@@ -163,4 +163,18 @@ public class XzController {
         return new ResultVo(0, "成功删除单个课程信息");
     }
 
+    /**
+     * @Description 修改课程表单个单元格数据
+     * @Param [kjTeaVo]
+     * @Return com.xhkjedu.vo.ResultVo
+     * @Author wn
+     * @Date 2022/4/2 17:11
+     **/
+    @PostMapping("/kcbup")
+    public ResultVo updateXzkjDyg(@RequestBody XzDateKjTeaVo kjTeaVo){
+        N_Utils.validation(new Object[]{kjTeaVo.getCourseid(),"课程id",1,kjTeaVo.getClassid(),"班级id",1,kjTeaVo.getCreateid(),"操作人id",1});
+        xzService.updateXzKjDyg(kjTeaVo);
+        return new ResultVo(0, "成功修改单个课程信息");
+    }
+
 }

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

@@ -19,4 +19,7 @@ public interface ClassStudentMapper extends TkMapper<TClassStudent> {
 
     //添加
     void save(@Param("student") TClassStudent student);
+
+    //保存班级学生到指定班级
+    void saveAllClassStu(@Param("student") TClassStudent student,@Param("zbclassid") Integer zbclassid);
 }

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

@@ -1,6 +1,7 @@
 package com.xhkjedu.slive.mapper.gradeclass;
 
 import com.xhkjedu.slive.base.TkMapper;
+import com.xhkjedu.slive.model.gradeclass.TClassStudent;
 import com.xhkjedu.slive.model.gradeclass.TGroup;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -9,4 +10,9 @@ import org.springframework.stereotype.Repository;
 public interface GroupMapper extends TkMapper<TGroup> {
     //更新分组人数
     void updateNum(@Param("groupid") Integer groupid);
+
+    //取班级对应的全班学生分组
+    Integer getGroupIdByClassid(@Param("classid") Integer classid);
+    //保存全班分组学生
+    void saveAllClassGroupStu(@Param("student") TClassStudent student, @Param("zbclassid") Integer zbclassid,@Param("zbgroupid") Integer zbgroupid);
 }

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

@@ -106,4 +106,8 @@ public interface CourseMapper extends TkMapper<LCourse> {
     void deleteCourseClassByCourseid(@Param("courseid") Integer courseid);
     //获取指定课节班级日期下的课程信息
     CourseVo getCourseByKjidAndClassid(@Param("kjid") Integer kjid,@Param("classid") Integer classid,@Param("seldate") String seldate);
+    //获取指定指定日期教师课节下教师的直播课
+    CourseVo getCourseByDateKjTeacher(@Param("kjid") Integer kjid,@Param("teacherid") Integer teacherid,@Param("seldate") String seldate);
+    //更改课程相关任课教师
+    void updateCourseSectionClassTeacher(@Param("courseid") Integer courseid,@Param("teacherid") Integer teacherid,@Param("subjectid") String subjectid);
 }

slive/src/main/java/com/xhkjedu/slive/mapper/xz/XzMapper.java

@@ -42,9 +42,6 @@ public interface XzMapper extends TkMapper<LXz> {
     //保存完行政直播后生成的课节基本信息
     List<Map> listXzKjsAfterSaveXz(@Param("xzid") Integer xzid);
 
-    //获取行政直播课程表
-    List<XzDateVo> listXzKjDetail(@Param("xz") LXz xz);
-
     //取指定课节指定日期所有班级的课程和教师
     List<XzDateKjVo> listXzDateKjDetail(@Param("selectdate") String selectdate,@Param("xzid") Integer xzid);
 

slive/src/main/java/com/xhkjedu/slive/model/gradeclass/TClassStudent.java

@@ -29,6 +29,9 @@ public class TClassStudent extends BaseBean {
     //学校id
     private Integer schoolid;
 
+    //是否是直播行政班学生0是1否（加入的非直播班级学生）
+    private Integer xzed;
+
     //学号
     @Transient
     private String studentno;

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

@@ -99,6 +99,7 @@ public class ClassService {
             cs.setCreateid(teacherid);
             cs.setSchoolid(schoolid);
             cs.setCreatetime(N_Utils.getSecondTimestamp());
+            cs.setXzed(0);//是否是直播行政班学生0是1否（加入的非直播班级学生）
             classStudentMapper.save(cs);
 
             //分组学生
@@ -134,6 +135,7 @@ public class ClassService {
         cs.setClassid(classid);
         cs.setCreateid(createid);
         cs.setSchoolid(schoolid);
+        cs.setXzed(0);
         cs.setCreatetime(N_Utils.getSecondTimestamp());
         //分组学生
         ClassVo classVo = getById(classid);

slive/src/main/java/com/xhkjedu/slive/service/xz/XzService.java

@@ -1,14 +1,13 @@
 package com.xhkjedu.slive.service.xz;
 
-import com.xhkjedu.slive.mapper.gradeclass.ClassMapper;
-import com.xhkjedu.slive.mapper.gradeclass.ClassTeacherMapper;
-import com.xhkjedu.slive.mapper.gradeclass.SchoolMapper;
+import com.xhkjedu.slive.mapper.gradeclass.*;
 import com.xhkjedu.slive.mapper.liveplay.CourseClassMapper;
 import com.xhkjedu.slive.mapper.liveplay.CourseMapper;
 import com.xhkjedu.slive.mapper.liveplay.CourseSectionMapper;
 import com.xhkjedu.slive.mapper.xz.XzKjMapper;
 import com.xhkjedu.slive.mapper.xz.XzMapper;
 import com.xhkjedu.slive.model.gradeclass.TClass;
+import com.xhkjedu.slive.model.gradeclass.TClassStudent;
 import com.xhkjedu.slive.model.gradeclass.TClassTeacher;
 import com.xhkjedu.slive.model.liveplay.LCourse;
 import com.xhkjedu.slive.model.liveplay.LCourseClass;
@@ -65,6 +64,10 @@ public class XzService {
     private ClassTeacherMapper classTeacherMapper;
     @Resource
     private ClassMapper classMapper;
+    @Resource
+    private ClassStudentMapper classStudentMapper;
+    @Resource
+    private GroupMapper groupMapper;
     /**
      * @Description 行政直播列表
      * @Param [schoolid]
@@ -437,4 +440,92 @@ public class XzService {
         }
     }
 
+    /**
+     * @Description 修改单个单元格
+     * @Param [kjTeaVo]
+     * @Return com.xhkjedu.vo.ResultVo
+     * @Author wn
+     * @Date 2022/4/2 15:19
+     **/
+    public ResultVo updateXzKjDyg(XzDateKjTeaVo kjTeaVo){
+        try {
+            //判断课程的状态，如果已经开始上课则不能修改
+            LCourse course = courseMapper.selectByPrimaryKey(kjTeaVo.getCourseid());
+            Integer kjid = course.getKjid();
+            Integer classid= kjTeaVo.getClassid();//行政班id
+            if(course.getCoursestate() > 0){
+                throw new Exception("选择的课程已经开始上课，不允许修改");
+            }else{
+                //先判断是修改当前课程还是后续日期的课
+                if(N_Utils.isEmptyInteger(kjTeaVo.getKfollow())){
+                    //kfollow为0或者空，则只需要修改当前选中的课程
+                    ((XzService) AopContext.currentProxy()).updateXzkjDygForDetail(kjTeaVo,course);
+                }else{
+                    //需要修改后续和当前日期相同的星期相同课节的课程
+                    //获取已生成课程的最后日期
+                    List<String> alldates = xzMapper.getAllDatesForKj(kjid,classid,course.getBegindate());
+                    if(alldates!=null && alldates.size()>0){
+                        //已经成课程中符合周的需要修改的日期
+                        List<String> deldates = LiveUtil.getMeetDayOfDates(alldates,course.getBegindate());
+                        if(deldates!=null && deldates.size()>0){
+                            for(int i=0;i<deldates.size();i++){
+                                //先获取指定日期对应的课程
+                                course.setBegintime(deldates.get(i));
+                                ((XzService) AopContext.currentProxy()).updateXzkjDygForDetail(kjTeaVo,course);
+                            }
+                        }
+                    }
+                }
+                return new ResultVo(0,"成功修改课程表单个课程");
+            }
+        }catch (Exception e){
+            log.error("修改课程表单个课程出错："+e.getMessage());
+            return new ResultVo(1,"修改课程表单个课程失败");
+        }
+    }
+
+    //修改单个课程
+    @Transactional(rollbackFor = Exception.class)
+    public void updateXzkjDygForDetail(XzDateKjTeaVo kjTeaVo,LCourse course) {
+        try {
+            //先看新选择的教师情况，先判断选中的同一日期课节教师是否还有其他直播课
+            CourseVo courseVo = courseMapper.getCourseByDateKjTeacher(course.getKjid(),kjTeaVo.getTeacherid(),course.getBegindate());
+            if(courseVo==null){
+                //说明该老师之前没有直播课，则直接修改课程任课教师，直播班关联教师以及科目
+                courseMapper.updateCourseSectionClassTeacher(course.getCourseid(),kjTeaVo.getTeacherid(),kjTeaVo.getSubjectid());
+            }else{
+                //说明该教师当前有其他直播课，则把班级加入课程，完成直播课学生数量
+                TClassStudent cs = new TClassStudent();
+                cs.setSchoolid(course.getSchoolid());
+                cs.setClassid(kjTeaVo.getClassid());
+                cs.setCreateid(kjTeaVo.getCreateid());
+                classStudentMapper.saveAllClassStu(cs,courseVo.getClassid());
+                //获取直播班对应全班学生分组id
+                Integer groupid = groupMapper.getGroupIdByClassid(courseVo.getClassid());
+                groupMapper.saveAllClassGroupStu(cs,courseVo.getClassid(),groupid);
+                classMapper.updateNum2(courseVo.getClassid());//更改直播班级以及班级分组人数
+                courseMapper.updateStuNum(courseVo.getCourseid());//更新直播课学生数量
+
+                //把指定的班级从原直播班中移除
+                //修改原单元格中设置的教师信息，先判断该单元格对应的课程是否有其他班级
+                Integer coursenum = courseClassMapper.getOtherClassnumByCourseid(kjTeaVo.getCourseid(), kjTeaVo.getClassid());
+                if (coursenum == 0) {
+                    //说明该课程仅关联一个班级,直接修改该课程以及该课程对应的直播班
+                    courseMapper.deleteCourseClassByCourseid(kjTeaVo.getCourseid());
+                } else {
+                    //说明关联的还有其他班级,修改该班级在直播班级中的学生，
+                    courseClassMapper.deleteByCourseidAndClassid(kjTeaVo.getCourseid(), kjTeaVo.getClassid());
+                    //处理对应直播班级中学生
+                    classMapper.deleteClassstu(course.getClassid(), kjTeaVo.getClassid());
+                    classMapper.updateNum2(course.getClassid());//更改班级以及班级分组人数
+                    courseMapper.updateStuNum(kjTeaVo.getCourseid());//更新直播课学生数量
+                }
+            }
+        }catch (Exception e){
+            log.error("修改单个课程出错："+e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+    }
+
+
 }

slive/src/main/java/com/xhkjedu/slive/vo/liveplay/CourseVo.java

@@ -111,6 +111,8 @@ public class CourseVo {
     //班级ids
     private String classids;
 
+    private Integer kjid;//行政直播课节id
+
     //课节列表
     private List<CourseSectionVo> sections;
 }

slive/src/main/java/com/xhkjedu/slive/vo/xz/XzDateKjTeaVo.java

@@ -22,6 +22,7 @@ public class XzDateKjTeaVo {
     private String subjectname;//科目名称
 
     private Integer kfollow;//区分是否处理指定日期后的课0不处理1处理
+    private Integer createid;//操作人id
 
     private List<XzDateKjTeaVo> xjclass;//存放层级用于保存时使用
 }

slive/src/main/resources/application.properties

@@ -3,9 +3,9 @@ server.port=8085
 
 spring.application.name=slive
 #注册到我们本地的eureka注册中心，端口8081
-#eureka.client.service-url.defaultZone=http://127.0.0.1:8081/eureka/
-eureka.client.register-with-eureka=false
-eureka.client.fetch-registry=false
+eureka.client.service-url.defaultZone=http://127.0.0.1:8081/eureka/
+#eureka.client.register-with-eureka=false
+#eureka.client.fetch-registry=false
 
 #设置eureka输出日志级别
 logging.level.com.netflix=error

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

@@ -17,4 +17,9 @@
         insert ignore into t_class_student (classid,studentid,createid,createtime,schoolid)
         values (#{student.classid},#{student.studentid},#{student.createid},#{student.createtime},#{student.schoolid})
     </insert>
+    <!--保存班级学生到指定班级-->
+    <insert id="saveAllClassStu">
+        insert ignore into t_class_student (classid,studentid,createid,createtime,schoolid)
+        SELECT #{zbclassid},studentid,#{student.createid}, UNIX_TIMESTAMP(),#{student.schoolid} FROM t_class_student WHERE classid=#{student.classid});
+    </insert>
 </mapper>

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

@@ -7,4 +7,14 @@
         (select count(*) from t_group_student gs where gs.groupid=#{groupid})
         where g.groupid=#{groupid}
     </update>
+
+    <!--获取班级对应的全班学生分组-->
+    <select id="getGroupIdByClassid" resultType="java.lang.Integer">
+        select groupid from t_group where classid=#{classid} and grouptype=1
+    </select>
+    <!--保存全部分组学生-->
+    <insert id="saveAllClassGroupStu">
+        insert ignore into t_group_student (classid,groupid,studentid,createid,createtime,schoolid)
+        SELECT #{zbclassid},#{zbgroupid},studentid,#{student.createid}, UNIX_TIMESTAMP(),#{student.schoolid} FROM t_class_student WHERE classid=#{student.classid});
+    </insert>
 </mapper>

slive/src/main/resources/mapper/liveplay/CourseMapper.xml

@@ -512,6 +512,17 @@
         select c.courseid,c.classid from l_course c
         left join l_course_class cc on c.courseid=cc.courseid
         WHERE c.kjid=#{kjid} and cc.classid=#{classid}	 and c.begindate=#{seldate}
+    </select>
 
+    <!--获取指定指定日期教师课节下教师的直播课-->
+    <select id="getCourseByDateKjTeacher" resultType="com.xhkjedu.slive.vo.liveplay.CourseVo">
+        select courseid,subjectid,classid,teacherid,kjid from l_course
+        where kjid=#{xkjid} and teacherid=#{teacherid} and begindate=#{seldate}
     </select>
+    <!--更改课程相关任课教师-->
+    <update id="updateCourseSectionClassTeacher">
+        update l_course c ,l_course_section s,t_class_teacher ct
+        set c.teacherid=#{teacherid},s.teacherid=#{teacherid},ct.teacherid=#{teacherid},c.subjectid=#{subjectid}
+        where c.courseid=s.courseid and ct.classid=c.classid and c.courseid=#{courseid}
+    </update>
 </mapper>