保存课节

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.slive.model.xz.LXz;
 import com.xhkjedu.slive.service.xz.XzService;
+import com.xhkjedu.slive.vo.xz.XzDateVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
@@ -38,9 +39,9 @@ public class XzController {
      **/
     @PostMapping("/list")
     public ResultVo list(@RequestBody LXz xz){
-        N_Utils.validation(new Object[]{xz.getSchoolid(),"学校id",1});
+        N_Utils.validation(new Object[]{xz.getSchoolid(),"学校id",1,xz.getGradeid(),"年级",1});
         PageHelper.startPage(xz.getPage(), xz.getPageSize());
-        List<Map> list = xzService.listXzs(xz.getSchoolid(),xz.getXzname());
+        List<Map> list = xzService.listXzs(xz);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0,"获取行政直播列表成功",pageResult);
     }
@@ -106,4 +107,11 @@ public class XzController {
         return new ResultVo(0, "删除成功");
     }
 
+    @PostMapping("/sxzk")
+    public ResultVo saveXzCourse(@RequestBody LXz xz){
+        N_Utils.validation(new Object[]{xz.getXzid(),"行政直播id",1});
+        xzService.saveXzCourse(xz);
+        return new ResultVo(0, "成功保存行政直播课程表");
+    }
+
 }

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 行政直播课节详情
@@ -23,17 +24,11 @@ public class XzKjController {
     @Resource
     private XzKjService xzKjService;
 
-    /**
-     * @Description 保存直播课课节信息
-     * @Param [kj]
-     * @Return com.xhkjedu.vo.ResultVo
-     * @Author wn
-     * @Date 2022/3/30 16:22
-     **/
-    @PostMapping("/save")
-    public ResultVo save(@RequestBody LXzKj kj){
-        N_Utils.validation(new Object[]{kj.getXzid(),"行政直播id",1,kj.getCreateid(),"创建人",1});
-        return xzKjService.save(kj);
+    @PostMapping("/kjs")
+    public ResultVo listKjsByXzid(@RequestBody LXzKj kj){
+        N_Utils.validation(new Object[]{kj.getXzid(),"行政直播id",1});
+        List<Map> map = xzKjService.listXzKjsByXzid(kj.getXzid());
+        return new ResultVo(0,"成功获取行政直播课节详情",map);
     }
 
     /**

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

@@ -17,7 +17,7 @@ import java.util.Map;
 public interface XzMapper extends TkMapper<LXz> {
 
     //行政直播列表
-    List<Map> listXzs(@Param("schoolid") Integer schoolid,@Param("xzname") String xzname);
+    List<Map> listXzs(@Param("xz") LXz xz);
 
     //行政直播下进行中或已结束的课节数量
     Integer getXzSectionKsNum(@Param("xzid") Integer xzid);
@@ -34,4 +34,7 @@ public interface XzMapper extends TkMapper<LXz> {
     //修改行政直播删除状态
     void updateXzDeleted(@Param("deleted") Integer deleted,@Param("xzid") Integer xzid);
 
+    //保存完行政直播后生成的课节基本信息
+    List<Map> listXzKjsAfterSaveXz(@Param("xzid") Integer xzid);
+
 }

slive/src/main/java/com/xhkjedu/slive/model/liveplay/LCourse.java

@@ -75,6 +75,12 @@ public class LCourse extends BaseBean {
     //所属课程分类
     private Integer ctypeid;
 
+    //课程类别0专题直播1行政直播
+    private Integer courseclass;
+
+    //直播课节详情id
+    private Integer kjid;
+
     //创建人id
     private Integer createid;
 

slive/src/main/java/com/xhkjedu/slive/model/xz/LXz.java

@@ -1,9 +1,12 @@
 package com.xhkjedu.slive.model.xz;
 import com.xhkjedu.slive.model.BaseBean;
+import com.xhkjedu.slive.vo.xz.XzDateVo;
 import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  *@Description 行政直播概要表
@@ -46,4 +49,8 @@ public class LXz extends BaseBean {
 
     //学校id
     private Integer schoolid;
+
+    //行政直播日期集合
+    @Transient
+    private List<XzDateVo> xzdatas;
 }

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

@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @Description
+ * @Description 行政直播课节
  * @Author WN
  * Date 2022/3/30 15:26
  **/
@@ -21,31 +21,14 @@ public class XzKjService {
     private XzKjMapper xzKjMapper;
 
     /**
-     * @Description 保存课节信息
-     * @Param [xzKj]
+     * @Description  获取行政直播课节基本信息
+     * @Param [xzid]
      * @Return com.xhkjedu.vo.ResultVo
      * @Author wn
-     * @Date 2022/3/30 16:19
+     * @Date 2022/3/31 14:07
      **/
-    public ResultVo save(LXzKj xzKj) {
-        Integer timestamp = N_Utils.getSecondTimestamp();
-        List<LXzKj> kjlst = xzKj.getXzkjs();
-        if (kjlst == null || kjlst.size() == 0) {
-            return new ResultVo(1, "未设置课节信息");
-        } else {
-            for (int i = 0; i < kjlst.size(); i++) {
-                LXzKj kj = kjlst.get(i);
-                kj.setXzid(xzKj.getXzid());
-                kj.setCreateid(xzKj.getCreateid());
-                kj.setCreatetime(timestamp);
-                kj.setKjorder(i + 1);
-            }
-
-            xzKjMapper.insertList(kjlst);
-            //获取保存课节信息集合
-            List<Map> rtnlst = xzKjMapper.listXzKjsByXzid(xzKj.getXzid());
-            return new ResultVo(0, "保存成功", rtnlst);
-        }
+    public List<Map> listXzKjsByXzid(Integer xzid) {
+        return xzKjMapper.listXzKjsByXzid(xzid);
     }
 
     /**
@@ -73,4 +56,5 @@ public class XzKjService {
         xzKjMapper.updateBatchXzKj(xzKjs);
         return new ResultVo(0,"修改课节信息成功");
     }
+
 }

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

@@ -1,14 +1,38 @@
 package com.xhkjedu.slive.service.xz;
 
+import com.xhkjedu.slive.mapper.gradeclass.ClassTeacherMapper;
+import com.xhkjedu.slive.mapper.gradeclass.SchoolMapper;
+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.TClassTeacher;
+import com.xhkjedu.slive.model.liveplay.LCourse;
+import com.xhkjedu.slive.model.liveplay.LCourseClass;
+import com.xhkjedu.slive.model.liveplay.LCourseSection;
 import com.xhkjedu.slive.model.xz.LXz;
+import com.xhkjedu.slive.model.xz.LXzKj;
+import com.xhkjedu.slive.service.gradeclass.ClassService;
+import com.xhkjedu.slive.utils.LiveUtil;
+import com.xhkjedu.slive.vo.gradeclass.ClassVo;
+import com.xhkjedu.slive.vo.xz.XzDateVo;
+import com.xhkjedu.slive.vo.xz.XzDateXjTeaVo;
+import com.xhkjedu.slive.vo.xz.XzDateXjVo;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description 行政直播概要
@@ -16,9 +40,24 @@ import java.util.Map;
  * Date 2022/3/30 13:42
  **/
 @Service
+@Slf4j
 public class XzService {
     @Resource
     private XzMapper xzMapper;
+    @Resource
+    private XzKjMapper xzKjMapper;
+    @Resource
+    private CourseMapper courseMapper;
+    @Resource
+    private CourseSectionMapper courseSectionMapper;
+    @Resource
+    private CourseClassMapper courseClassMapper;
+    @Resource
+    private SchoolMapper schoolMapper;
+    @Resource
+    private ClassService classService;
+    @Resource
+    private ClassTeacherMapper classTeacherMapper;
 
     /**
      * @Description 行政直播列表
@@ -27,8 +66,8 @@ public class XzService {
      * @Author wn
      * @Date 2022/3/30 14:03
      **/
-    public List<Map> listXzs(Integer schoolid, String xzname) {
-        return xzMapper.listXzs(schoolid, xzname);
+    public List<Map> listXzs(LXz xz) {
+        return xzMapper.listXzs(xz);
     }
 
     /**
@@ -38,11 +77,29 @@ public class XzService {
      * @Author wn
      * @Date 2022/3/30 14:07
      **/
+    @Transactional
     public Integer saveXz(LXz xz) {
-        xz.setCreatetime(N_Utils.getSecondTimestamp());
+        Integer timestamp = N_Utils.getSecondTimestamp();
+        xz.setCreatetime(timestamp);
         xz.setDeleted(1);
-        xzMapper.insertUseGeneratedKeys(xz);
-        return xz.getId();
+        xzMapper.insertUseGeneratedKeys(xz);//保存行政直播信息
+        Integer xzid = xz.getId();
+        //保存对应的课节信息
+        List<LXzKj> kjlst = new ArrayList<>();
+        for (int i = 0; i < xz.getDaynum(); i++) {
+            LXzKj kj = new LXzKj();
+            kj.setXzid(xzid);
+            String kjname = LiveUtil.getChineStrByNum(i);
+            kj.setKjname("第" + kjname + "节");
+            kj.setKjorder(i+1);
+            kj.setCreateid(xz.getCreateid());
+            kj.setCreatetime(timestamp);
+
+            kjlst.add(kj);
+        }
+        //批量保存行政直播对应的课节
+        xzKjMapper.insertList(kjlst);
+        return xzid;
     }
 
     /**
@@ -72,20 +129,186 @@ public class XzService {
      * @Author wn
      * @Date 2022/3/30 15:24
      **/
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void deleteXz(Integer xzid) {
-        //如果行政直播下所有的课都未开始，则可以直接删除，
-        //如果有直播课已经开始则进行逻辑删除，并删除所有未开始上的直播课
-        Integer sectionnum = xzMapper.getXzSectionKsNum(xzid);
-        if (sectionnum != null && sectionnum > 0) {
-            //说明直播下有开始或结束的课节，只能删除未开始的直播和直播班级信息
-            xzMapper.deleteCourseClassKjByXzid(xzid);
-            //修改行政直播的状态未已删除
-            xzMapper.updateXzDeleted(10, xzid);
-        } else {
-            //说明该行政直播课程可以直接删除
-            xzMapper.deleteCourseClassByXzid(xzid);
-            xzMapper.deleteXzAndKjByXzid(xzid);
+        try {
+            //如果行政直播下所有的课都未开始，则可以直接删除，
+            //如果有直播课已经开始则进行逻辑删除，并删除所有未开始上的直播课
+            Integer sectionnum = xzMapper.getXzSectionKsNum(xzid);
+            if (sectionnum != null && sectionnum > 0) {
+                //说明直播下有开始或结束的课节，只能删除未开始的直播和直播班级信息
+                xzMapper.deleteCourseClassKjByXzid(xzid);
+                //修改行政直播的状态未已删除
+                xzMapper.updateXzDeleted(10, xzid);
+            } else {
+                //说明该行政直播课程可以直接删除
+                xzMapper.deleteCourseClassByXzid(xzid);
+                xzMapper.deleteXzAndKjByXzid(xzid);
+            }
+        }catch (Exception e){
+            log.error("删除行政直播出错："+e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
+
+
     }
+    /**
+     * @Description 保存行政直播课程表
+     * @Param [xzDatelst]
+     * @Return com.xhkjedu.vo.ResultVo
+     * @Author wn
+     * @Date 2022/3/31 21:46
+     **/
+    public ResultVo saveXzCourse(LXz xz) {
+        //保存行政直播课程表,参数层级为日期--课节--班级和教师
+        //根据同一个课节下根据班级和教师确认是否是同一个直播课，保存进course,section（单课节课程）
+        LXz x = xzMapper.selectByPrimaryKey(xz.getXzid());
+        List<XzDateVo> xzDatelst = xz.getXzdatas();
+        for (int i = 0; i < xzDatelst.size(); i++) {
+            //日期下的课节情况
+            XzDateVo xzDateVo = xzDatelst.get(i);
+            String datazhou = LiveUtil.getDateZhou(xzDateVo.getCurrentdate());//要保存日期对应的周
+            List<XzDateXjVo> dateKjlst = xzDateVo.getKjs();//指定日期下课节情况
+
+            for (int j = 0; j < dateKjlst.size(); j++) {
+                //单课节情况
+                XzDateXjVo dateKjVo = dateKjlst.get(j);
+                List<XzDateXjTeaVo> xjTealst = dateKjVo.getKjteas();//单课节下各班级情况
+                //处理成教师下班级形式，生成课程
+                Map<Integer, List<XzDateXjTeaVo>> map = listChangeTeacherClass(xjTealst);
+                LCourse course = new LCourse();
+                course.setGradeid(x.getGradeid());
+                course.setBegindate(x.getBegindate());
+                course.setEnddate(x.getEnddate());
+                course.setCoursenum(1);
+                course.setCoursetype(1);
+                course.setCourseclass(1);
+                course.setCoursestate(0);
+                course.setDeleted(1);
+                course.setCreateid(xz.getCreateid());
+                course.setCreatetime(N_Utils.getSecondTimestamp());
+                course.setSchoolid(x.getSchoolid());
+
+                for(Map.Entry<Integer, List<XzDateXjTeaVo>> entry : map.entrySet()){
+                    List<XzDateXjTeaVo> xjTeas = entry.getValue();
+                    String teachername = xjTeas.get(0).getTeachername();
+                    //单个教师课程信息
+                    String coursename = datazhou + dateKjVo.getKjname() +xjTeas.get(0).getSubjectname()+ "("+ teachername +")";
+
+                    course.setCoursename(coursename);
+                    course.setSubjectid(xjTeas.get(0).getSubjectid());
+                    course.setTeacherid(entry.getKey());
+                    course.setBegintime(dateKjVo.getBegintime());
+                    course.setEndtime(dateKjVo.getEndtime());
+                    course.setKjid(dateKjVo.getKjid());
+                    //保存行政直播课程表
+                    saveCourseAll(xjTeas,course,xzDateVo.getCurrentdate());
+                }
+            }
+        }
+        return new ResultVo(0, "");
+    }
+
+    //指定天某天某节课下的教师班级层级关系
+    private Map<Integer, List<XzDateXjTeaVo>> listChangeTeacherClass(List<XzDateXjTeaVo> xjTealst) {
+        Map<Integer, List<XzDateXjTeaVo>> map = new HashMap<>();
+
+        for (int i = 0; i < xjTealst.size(); i++) {
+            XzDateXjTeaVo xzDateXjTeaVo = xjTealst.get(i);
+            if (map.containsKey(xzDateXjTeaVo.getTeacherid())) {
+                map.get(xzDateXjTeaVo.getTeacherid()).add(xzDateXjTeaVo);
+            } else {
+                List<XzDateXjTeaVo> classlst = new ArrayList<>();
+                classlst.add(xzDateXjTeaVo);
+                map.put(xzDateXjTeaVo.getTeacherid(), classlst);
+            }
+        }
+        return map;
+    }
+
+    //保存行政直播课程表
+    @Transactional(rollbackFor = Exception.class)
+    public void saveCourseAll(List<XzDateXjTeaVo> xjTeas,LCourse course,String currentdate){
+        try {
+            //获取集合中所有的班级id
+            List classidlst = xjTeas.stream().map(XzDateXjTeaVo::getClassid).collect(Collectors.toList());
+            List<Map> users = courseMapper.listUid(classidlst);//获取课班级下学生
+
+            //新生成直播班班级信息
+            TClass c = new TClass();
+            c.setClassname(course.getCoursename() + "班");
+            c.setCreateid(course.getCreateid());
+            c.setSchoolid(course.getSchoolid());
+            Integer year = schoolMapper.getYearById(course.getSchoolid());
+            c.setSchoolyear(year);
+            c.setYear(year);
+            c.setClassorder(999);
+            c.setGradeid(course.getGradeid());
+            c.setClasstype(99);//已直播班级
+
+            Integer classid = classService.save(c);//新生成直播班id
+            course.setClassid(classid);
+
+            //设置班级对应教师
+            //班级教师
+            TClassTeacher teacher = new TClassTeacher();
+            teacher.setClassid(classid);
+            teacher.setTeacherid(course.getTeacherid());
+            teacher.setCreateid(course.getCreateid());
+            teacher.setCreatetime(N_Utils.getSecondTimestamp());
+            teacher.setSchoolid(course.getSchoolid());
+            classTeacherMapper.insertSelective(teacher);
+
+            //保存课程信息
+            courseMapper.insertUseGeneratedKeys(course);
+            Integer courseid = course.getId();//课程id
+
+            List<Integer> studentids = new ArrayList<>();
+            users.forEach(userVo -> {
+                studentids.add((Integer) userVo.get("userid"));
+            });
+
+            classService.batchSaveStu(course.getCreateid(), course.getSchoolid(), classid, studentids);//批量添加报名学生
+            courseMapper.updateStuNum(courseid);//更新已报学生数量
+
+            //保存直播关联班级
+            List<LCourseClass> cclist = new ArrayList<>();
+            for(int i=0;i<classidlst.size();i++){
+                Integer cid = Integer.parseInt(classidlst.get(i).toString());
+                LCourseClass cc = new LCourseClass();
+                cc.setCourseid(courseid);
+                cc.setClassid(cid);
+                cc.setCreateid(course.getCreateid());
+                cc.setCreatetime(course.getCreatetime());
+                cclist.add(cc);
+                //通知班级
+                ClassVo classVo = new ClassVo();
+                classVo.setClassid(cid);
+            }
+            courseClassMapper.insertList(cclist);//保存原班级和直播的关联关系
+
+            //获取班级人数
+            ClassVo classVo = classService.getById(classid);
+
+            //保存课程课节关联关系
+            LCourseSection cs = new LCourseSection();
+            cs.setCourseid(courseid);
+            cs.setTeacherid(course.getTeacherid());
+            cs.setSectionname(course.getCoursename());
+            cs.setSectionorder(1);
+            cs.setSectiondate(currentdate);
+            cs.setPlanbegintime(course.getBegintime());
+            cs.setPlanendtime(course.getEndtime());
+            cs.setStunum(classVo.getClassnum());
+            cs.setSectionstate(0);
+            cs.setCreateid(course.getCreateid());
+            cs.setCreatetime(course.getCreatetime());
+            courseSectionMapper.insertUseGeneratedKeys(cs);//保存课程课节信息
+
+        }catch (Exception e){
+            log.info("保存行政直播课程表出错："+e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+    }
+
 }

slive/src/main/java/com/xhkjedu/slive/utils/LiveUtil.java

@@ -0,0 +1,61 @@
+package com.xhkjedu.slive.utils;
+
+import com.ctc.wstx.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description
+ * @Author WN
+ * Date 2022/3/31 10:53
+ **/
+@Slf4j
+public class LiveUtil {
+
+    /**
+     * @Description  获取指定日期星期
+     * @Param [datestr]
+     * @Return java.lang.String
+     * @Author wn
+     * @Date 2022/3/31 11:06
+     **/
+    public static String getDateZhou(String datestr){
+        LocalDate localDate=LocalDate.parse(datestr, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        String k = String.valueOf(localDate.getDayOfWeek());
+        Map<String,String> map = saveZhou();
+        String zhoustr = map.get(k);
+        return "星期"+zhoustr;
+    }
+
+    //存放周
+    private static Map<String,String> saveZhou(){
+        Map<String,String> map = new HashMap<>();
+        map.put("MONDAY", "一");
+        map.put("TUESDAY", "二");
+        map.put("WEDNESDAY", "三");
+        map.put("THURSDAY", "四");
+        map.put("FRIDAY", "五");
+        map.put("SATURDAY", "六");
+        map.put("SUNDAY", "日");
+        return map;
+    }
+
+    /**
+     * @Description 获取索引对应的数字
+     * @Param [indexnum]
+     * @Return java.lang.String
+     * @Author wn
+     * @Date 2022/3/31 12:45
+     **/
+    public static String getChineStrByNum(int indexnum){
+        String[] strnum = {"一","二","三","四","五","六","七","八","九","十","十一",
+                "十二","十三","十四","十五","十六","十七","十八","十九","二十"};
+
+        return strnum[indexnum];
+    }
+
+}

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

@@ -0,0 +1,19 @@
+package com.xhkjedu.slive.vo.xz;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 行政直播日期
+ * @Author WN
+ * Date 2022/3/31 10:02
+ **/
+@Data
+public class XzDateVo {
+    private String currentdate;//当前保存时间
+    private List<XzDateXjVo> kjs;//行政直播课节集合
+
+
+}

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

@@ -0,0 +1,24 @@
+package com.xhkjedu.slive.vo.xz;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description 行政直播课课节下班级和教师
+ * @Author WN
+ * Date 2022/3/31 10:04
+ **/
+@Data
+public class XzDateXjTeaVo {
+
+    private Integer classid;//班级id
+    private String classname;//班级名称
+    private Integer teacherid;//教师id
+    private String teachername;//教师姓名
+    private Integer courseid;//课程id
+    private String subjectid;//科目id
+    private String subjectname;//科目名称
+
+    private List<XzDateXjTeaVo> xjclass;//存放层级用于保存时使用
+}

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

@@ -0,0 +1,21 @@
+package com.xhkjedu.slive.vo.xz;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description 行政直播课节
+ * @Author WN
+ * Date 2022/3/31 10:04
+ **/
+@Data
+public class XzDateXjVo {
+    private Integer kjid;//行政课节id
+    private String kjname;//课节名称
+    private Integer kjorder;//课节排序
+    private String begintime;//开始时间
+    private String endtime;//结束时间
+    private List<XzDateXjTeaVo> kjteas;//指定日期下课节下所有的直播课
+
+}

slive/src/main/resources/application.properties

@@ -3,7 +3,10 @@ server.port=8085
 
 spring.application.name=slive
 #注册到我们本地的eureka注册中心，端口8081
-eureka.client.service-url.defaultZone=http://127.0.0.1:8081/eureka/
+#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/xz/XzKjMapper.xml

@@ -4,7 +4,7 @@
 
     <!--获取行政直播课节详情-->
     <select id="listXzKjsByXzid" resultType="java.util.Map">
-        select * from l_xz_kj where xzid=1 order by kjorder asc
+        select * from l_xz_kj where xzid=#{xzid} order by kjorder asc
     </select>
 
     <!--批量修改行政直播课节详情-->

slive/src/main/resources/mapper/xz/XzMapper.xml

@@ -5,28 +5,24 @@
     <!--行政直播列表-->
     <select id="listXzs" resultType="java.util.Map">
         select x.xzid,x.xzname,x.xzcomm,x.gradeid,x.daynum,x.begindate,x.enddate,x.createid,
-        x.createtime, u.username from l_xz x left join t_user u on x.createid=u.userid
-        where x.schoolid=#{schoolid} and x.deleted=1
-        <if test="xzname!='' and xzname!=null">
-            and x.xzname like '%${xzname}%'
+        x.createtime, u.username,u.headpic from l_xz x left join t_user u on x.createid=u.userid
+        where x.schoolid=#{xz.schoolid} and x.gradeid=#{xz.gradeid} and x.deleted=1
+        <if test="xz.xzname!='' and xz.xzname!=null">
+            and x.xzname like '%${xz.xzname}%'
         </if>
         order by x.begindate desc
     </select>
 
     <!--行政直播课对应的课节进行中或已结束数量-->
     <select id="getXzSectionKsNum" resultType="java.lang.Integer">
-        select count(*)
-        from l_course_section s
-                 left join l_course c on c.courseid = s.courseid
-                 left join l_xz_kj k on c.kjid = k.kjid
-        where k.xzid = #{xzid}
-          and s.sectionstate BETWEEN 2 and 3
+        select count(*) from l_course_section s left join l_course c on c.courseid = s.courseid
+        left join l_xz_kj k on c.kjid = k.kjid
+        where k.xzid = #{xzid} and s.sectionstate BETWEEN 2 and 3
     </select>
 
     <!--删除行政直播下所有的直播课程和直播班级-->
     <delete id="deleteCourseClassByXzid" parameterType="java.lang.Integer">
-        delete
-        c,lc from t_class as c left join l_course as lc on c.classid=lc.classid
+        delete c,lc from t_class as c left join l_course as lc on c.classid=lc.classid
         left join l_xz_kj k on k.kjid=lc.kjid where k.xzid=
         #{xzid}
     </delete>
@@ -41,20 +37,36 @@
         delete
         c,lc,k from t_class as c left join l_course as lc on c.classid=lc.classid
         left join l_course_section ls on ls.courseid=lc.courseid
-        left join l_xz_kj k on k.kjid=lc.kjid where k.xzid=
-        #{xzid}
-        and
-        ls
-        .
-        sectionstate
-        =
-        0
+        left join l_xz_kj k on k.kjid=lc.kjid where k.xzid=#{xzid}
+        and ls.sectionstate = 0
     </delete>
     <!--修改行政直播删除状态-->
     <update id="updateXzDeleted">
-        update l_xz
-        set deleted=#{deleted}
-        where xzid = #{xzid}
+        update l_xz set deleted=#{deleted} where xzid = #{xzid}
     </update>
 
+    <resultMap id="listXzKjsAfterSave" type="java.util.Map">
+        <result property="xzid" column="xzid"></result>
+        <result property="xzname" column="xzname"></result>
+        <result property="xzcomm" column="xzcomm"></result>
+        <result property="gradeid" column="gradeid"></result>
+        <result property="daynum" column="gradeid"></result>
+        <result property="begindate" column="begindate"></result>
+        <result property="enddate" column="enddate"></result>
+        <collection property="kjlist" ofType="java.util.Map" javaType="java.util.List">
+            <result property="kjid" column="kjid"></result>
+            <result property="kjname" column="kjname"></result>
+            <result property="kjorder" column="kjorder"></result>
+            <result property="begintime" column="begintime"></result>
+            <result property="endtime" column="endtime"></result>
+        </collection>
+    </resultMap>
+    <!--保存完行政直播后生成的课节基本信息-->
+    <select id="listXzKjsAfterSaveXz" resultMap="listXzKjsAfterSave">
+        select x.xzid,x.xzname,x.xzcomm,x.gradeid,x.daynum,x.begindate,x.enddate,
+        k.kjid,k.kjname,k.kjorder,k.begintime,k.endtime from l_xz x
+        left join l_xz_kj k on x.xzid=k.xzid where x.xzid=#{xzid} order by k.kjorder
+
+    </select>
+
 </mapper>

suser/src/main/java/com/xhkjedu/suser/vo/gradeclass/ClassTeacherParams.java

@@ -18,4 +18,6 @@ public class ClassTeacherParams {
     private Integer gradeid;//年级id
 
     private Integer year;//当前年费
+
+    private String username;//用户姓名
 }

suser/src/main/resources/mapper/gradeclass/ClassTeacherMapper.xml

@@ -172,6 +172,9 @@
     LEFT JOIN t_subject_book sb on tp.lsbid=sb.lsbid
     where c.schoolid=#{ctp.schoolid} and c.gradeid=#{ctp.gradeid} and c.year=#{ctp.year} and c.classstate=1
     and sb.subjectid=#{ctp.subjectid} and u.usertype=1 and u.userstate=1
+    <if test="ctp.username!=null and ctp.username!=''">
+        and u.username like '%${ctp.username}%'
+    </if>
     group by ct.teacherid
     </select>