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

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

@@ -16,7 +16,6 @@ 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.liveplay.CourseVo;
 import com.xhkjedu.slive.vo.xz.XzClassVo;
 import com.xhkjedu.slive.vo.xz.XzDateVo;
@@ -25,7 +24,6 @@ import com.xhkjedu.slive.vo.xz.XzDateKjVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
@@ -33,11 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
-import javax.annotation.security.DenyAll;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -195,57 +189,68 @@ public class XzService {
         try {
             //保存行政直播课程表,参数层级为日期--课节--班级和教师
             //根据同一个课节下根据班级和教师确认是否是同一个直播课，保存进course,section（单课节课程）
-            LXz x = xzMapper.selectByPrimaryKey(xz.getXzid());
+            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.getSelectdate());//要保存日期对应的周
-                List<XzDateKjVo> dateKjlst = xzDateVo.getKjs();//指定日期下课节情况
-
-                for (int j = 0; j < dateKjlst.size(); j++) {
-                    //单课节情况
-                    XzDateKjVo dateKjVo = dateKjlst.get(j);
-                    List<XzDateKjTeaVo> xjTealst = dateKjVo.getKjteas();//单课节下各班级情况
-                    //处理成教师下班级形式，生成课程
-                    Map<Integer, List<XzDateKjTeaVo>> map = listChangeTeacherClass(xjTealst);
-                    LCourse course = new LCourse();
-                    course.setGradeid(x.getGradeid());
-                    course.setBegindate(xzDateVo.getSelectdate());
-                    course.setEnddate(xzDateVo.getSelectdate());
-                    course.setCoursenum(1);
-                    course.setCoursetype(1);
-                    course.setCourseclass(1);
-                    course.setCoursestate(0);
-                    course.setDeleted(1);
-                    course.setCourseselected(0);
-                    course.setCreateid(xz.getCreateid());
-                    course.setCreatetime(N_Utils.getSecondTimestamp());
-                    course.setSchoolid(x.getSchoolid());
-
-                    for (Map.Entry<Integer, List<XzDateKjTeaVo>> entry : map.entrySet()) {
-                        List<XzDateKjTeaVo> 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());
-                        //保存行政直播课程表,该方式解决事务不生效问题
-                        ((XzService)applicationContext.getBean("xzService")).saveCourseAll(xjTeas, course);
+            if (xzDatelst == null || xzDatelst.size() == 0) {
+                return new ResultVo(1, "未设置课节信息");
+            } else {
+                //日期转为map,先处理所有日期的数据
+                TreeMap<String,TreeMap<Integer,List<XzDateKjTeaVo>>> datemap = listDateKjForSave(xzDatelst, x);
+                Map<Integer,XzDateKjVo> kjVoMap = setKjMap(xz.getXzid());
+
+                //开始保存
+                for(Map.Entry<String, TreeMap<Integer,List<XzDateKjTeaVo>>> entry : datemap.entrySet()){
+                    TreeMap<Integer,List<XzDateKjTeaVo>> kjmap = entry.getValue();
+                    String seldate = entry.getKey();
+                    String datazhou = LiveUtil.getDateZhou(seldate);//要保存日期对应的周
+
+                    for(Map.Entry<Integer, List<XzDateKjTeaVo>> entrykj : kjmap.entrySet()){
+                        Integer kjid = entrykj.getKey();
+                        XzDateKjVo kjVo = kjVoMap.get(kjid);
+                        List<XzDateKjTeaVo> xjTealst = entrykj.getValue();
+
+                        //处理成教师下班级形式，生成课程
+                        Map<Integer, List<XzDateKjTeaVo>> map = listChangeTeacherClass(xjTealst);
+
+                        LCourse course = new LCourse();
+                        course.setGradeid(x.getGradeid());
+                        course.setBegindate(seldate);
+                        course.setEnddate(seldate);
+                        course.setCoursenum(1);
+                        course.setCoursetype(1);
+                        course.setCourseclass(1);
+                        course.setCoursestate(0);
+                        course.setDeleted(1);
+                        course.setCourseselected(0);
+                        course.setCreateid(xz.getCreateid());
+                        course.setCreatetime(N_Utils.getSecondTimestamp());
+                        course.setSchoolid(x.getSchoolid());
+
+                        for (Map.Entry<Integer, List<XzDateKjTeaVo>> entrytea : map.entrySet()) {
+                            List<XzDateKjTeaVo> xjTeas = entrytea.getValue();
+                            String teachername = xjTeas.get(0).getTeachername();
+                            //单个教师课程信息
+                            String coursename = datazhou + kjVo.getKjname() + xjTeas.get(0).getSubjectname() + "(" + teachername + ")";
+
+                            course.setCoursename(coursename);
+                            course.setSubjectid(xjTeas.get(0).getSubjectid());
+                            course.setTeacherid(entrytea.getKey());
+                            course.setBegintime(kjVo.getBegintime());
+                            course.setEndtime(kjVo.getEndtime());
+                            course.setKjid(kjVo.getKjid());
+                            //保存行政直播课程表,该方式解决事务不生效问题
+                            ((XzService)applicationContext.getBean("xzService")).saveCourseAll(xjTeas, course);
+                        }
                     }
                 }
+                return new ResultVo(0, "保存行政直播课程表成功");
             }
         } catch (Exception e) {
             log.error("保存行政直播课程表出错：" + e.getMessage());
+            return new ResultVo(1,"保存行政直播课程表失败");
         }
 
-        return new ResultVo(0, "保存行政直播课程表成功");
+
     }
 
     //指定天某天某节课下的教师班级层级关系
@@ -267,6 +272,92 @@ public class XzService {
         return map;
     }
 
+    //转换日期下课节为map
+    private TreeMap<String, TreeMap<Integer,List<XzDateKjTeaVo>>> listDateKjForSave(List<XzDateVo> xzDatelst, LXz x) {
+        TreeMap<String, TreeMap<Integer,List<XzDateKjTeaVo>>> datemap = new TreeMap<>();
+        for (int i = 0; i < xzDatelst.size(); i++) {
+            XzDateVo xzdate = xzDatelst.get(i);
+            List<XzDateKjVo> kjlst = xzdate.getKjs();
+            if(kjlst!=null && kjlst.size()>0){
+                TreeMap<Integer,List<XzDateKjTeaVo>> kjmap = new TreeMap<>();
+                for(int j=0;j<kjlst.size();j++){
+                    XzDateKjVo kjvo = kjlst.get(j);
+                    if(kjvo.getKjteas()!=null && kjvo.getKjteas().size()>0){
+                        kjmap.put(kjvo.getKjid(),kjvo.getKjteas());
+                    }
+                }
+                datemap.put(xzdate.getSelectdate(),kjmap);
+            }
+        }
+
+        TreeMap<String, TreeMap<Integer,List<XzDateKjTeaVo>>> rtnmap = new TreeMap<>();
+        rtnmap.putAll(datemap);
+
+        //开始处理所有日期的课程
+        for (Map.Entry<String, TreeMap<Integer,List<XzDateKjTeaVo>>> entry : datemap.entrySet()){
+            String datestr = entry.getKey();//日期
+            TreeMap<Integer,List<XzDateKjTeaVo>> kjmap = entry.getValue();
+            //遍历当前天的课节，判断是否有需要后续同步的
+            for (Map.Entry<Integer,List<XzDateKjTeaVo>> entrykj : kjmap.entrySet()){
+                List<XzDateKjTeaVo> kjTeaVolst = entrykj.getValue();
+                for (int i = 0; i < kjTeaVolst.size(); i++) {
+                    XzDateKjTeaVo xtvo = kjTeaVolst.get(i);
+                    if(!N_Utils.isEmptyInteger(xtvo.getKfollow())){
+                        //说明需要同步到后续日期(结束时间之前所有当前天所属的周几)
+                        List<String> dates  = LiveUtil.getDaysForMeetDates(datestr,x.getEnddate());
+                        if(dates!=null && dates.size()>1){
+                            //说明直接有日期（不包含当前天），复制数据,处理时舍弃当前天
+                            isSavechangeMapKj(dates,entrykj.getKey(),xtvo,rtnmap);
+                        }
+                    }
+                }
+            }
+        }
+
+        return rtnmap;
+    }
+
+    //保存整体数据
+    private void isSavechangeMapKj( List<String> dates,Integer kjid,XzDateKjTeaVo xtvo,TreeMap<String, TreeMap<Integer,List<XzDateKjTeaVo>>> datemap){
+        //说明直接有日期（不包含当前天），复制数据,处理时舍弃当前天
+        for (int i = 1; i < dates.size(); i++) {
+            String dateobj = dates.get(i);
+            if(datemap.containsKey(dateobj)){
+                //说明该日期数据已存在
+                TreeMap<Integer,List<XzDateKjTeaVo>> kjmap = datemap.get(dateobj);
+                if(kjmap.containsKey(kjid)){
+                    kjmap.get(kjid).add(xtvo);
+                }else{
+                    List<XzDateKjTeaVo> kjTeaVos = new ArrayList<>();
+                    kjTeaVos.add(xtvo);
+                    kjmap.put(kjid,kjTeaVos);
+                }
+            }else{
+                //新添加
+                TreeMap<Integer,List<XzDateKjTeaVo>> kjmap = new TreeMap<>();
+                List<XzDateKjTeaVo> kjTeaVos = new ArrayList<>();
+                kjTeaVos.add(xtvo);
+                kjmap.put(kjid,kjTeaVos);
+
+                datemap.put(dateobj,kjmap);
+            }
+        }
+    }
+
+    //处理课节格式
+    private Map<Integer,XzDateKjVo> setKjMap(Integer xzid){
+        List<XzDateKjVo> lst = xzKjMapper.listXzKjsByXzid(xzid);
+        Map<Integer, XzDateKjVo> map = new HashMap<>();
+
+        for (int i = 0; i < lst.size(); i++) {
+            XzDateKjVo kj = lst.get(i);
+            map.put(kj.getKjid(), kj);
+        }
+        return map;
+    }
+
+
+
     //保存行政直播课程表
     @Transactional(rollbackFor = Exception.class)
     public void saveCourseAll(List<XzDateKjTeaVo> xjTeas, LCourse course) {
@@ -372,7 +463,7 @@ public class XzService {
             XzClassVo classVo = classlst.get(i);
             List<XzDateVo> datelst = new ArrayList<>();//保存指定日期
             for (int j = 0; j < seldates.size(); j++) {
-                List<Map> kjlst = xzMapper.listXzDateKjDetail(seldates.get(j), xz.getXzid(),classVo.getClassid());//获取课节详情
+                List<Map> kjlst = xzMapper.listXzDateKjDetail(seldates.get(j), xz.getXzid(), classVo.getClassid());//获取课节详情
                 XzDateVo dateVo = new XzDateVo();
                 dateVo.setSelectdate(seldates.get(j));
                 dateVo.setKjsmap(kjlst);
@@ -399,12 +490,12 @@ public class XzService {
             Integer kjid = course.getKjid();
             Integer classid = kjTeaVo.getClassid();//行政班id
             if (course.getCoursestate() > 0) {
-                return new ResultVo(1,"选择的课程已经开始上课，不允许删除");
+                return new ResultVo(1, "选择的课程已经开始上课，不允许删除");
             } else {
                 //先判断是删除当前课程还是后续日期的课
                 if (N_Utils.isEmptyInteger(kjTeaVo.getKfollow())) {
                     //kfollow为0或者空，则只需要删除当前选中的课程
-                    ((XzService)applicationContext.getBean("xzService")).delXzkjDygForDetail(kjTeaVo, course.getClassid());
+                    ((XzService) applicationContext.getBean("xzService")).delXzkjDygForDetail(kjTeaVo, course.getClassid());
                 } else {
                     //需要删除后续和当前日期相同的星期相同课节的课程
                     //获取已生成课程从所选删除课程开始日期到结束日期内所有日期
@@ -417,7 +508,7 @@ public class XzService {
                                 //先获取指定日期对应的课程
                                 CourseVo courseVo = courseMapper.getCourseByKjidAndClassid(kjid, classid, deldates.get(i));
                                 kjTeaVo.setCourseid(courseVo.getCourseid());
-                                ((XzService)applicationContext.getBean("xzService")).delXzkjDygForDetail(kjTeaVo,courseVo.getClassid());
+                                ((XzService) applicationContext.getBean("xzService")).delXzkjDygForDetail(kjTeaVo, courseVo.getClassid());
                             }
                         }
                     }
@@ -435,7 +526,7 @@ public class XzService {
     public void delXzkjDygForDetail(XzDateKjTeaVo kjTeaVo, Integer zbclassid) {
         try {
             //删除单个单元格中设置的教师信息，先判断该单元格对应的课程是否有其他班级
-            Integer coursenum = courseClassMapper.getOtherClassnumByCourseid(kjTeaVo.getCourseid(),kjTeaVo.getClassid());
+            Integer coursenum = courseClassMapper.getOtherClassnumByCourseid(kjTeaVo.getCourseid(), kjTeaVo.getClassid());
             if (coursenum == 0) {
                 //说明该课程仅关联一个班级,直接删除该课程以及该课程对应的直播班
                 courseMapper.deleteCourseClassByCourseid(kjTeaVo.getCourseid());
@@ -469,20 +560,20 @@ public class XzService {
             //先判断是保存当前课程还是后续日期的课
             if (N_Utils.isEmptyInteger(kjTeaVo.getKfollow())) {
                 //kfollow为0或者空，则只需要保存当前选中的课程
-                ((XzService)applicationContext.getBean("xzService")).saveOneXzkjDygForDetail(kjTeaVo);
+                ((XzService) applicationContext.getBean("xzService")).saveOneXzkjDygForDetail(kjTeaVo);
             } else {
                 //需要保存后续和当前日期相同的星期相同课节的课程，判断后续日期是否有课程，如果有则提示先删除后再添加
                 //获取已生成课程的往后日期
                 List<String> alldates = xzMapper.getAllDatesForKj(kjTeaVo.getKjid(), kjTeaVo.getClassid(), kjTeaVo.getSeldate());
-                if(alldates != null && alldates.size() > 0){
+                if (alldates != null && alldates.size() > 0) {
                     //去匹配是否包含在当前选中日期后续周对应的日期
-                    List<String> afterlst = LiveUtil.getMeetDayOfDates(alldates,kjTeaVo.getSeldate());
-                    if(afterlst != null && afterlst.size() > 0){
-                        return new ResultVo(1,"同日期同班级同课节有数据，不能保存");
-                    }else{
+                    List<String> afterlst = LiveUtil.getMeetDayOfDates(alldates, kjTeaVo.getSeldate());
+                    if (afterlst != null && afterlst.size() > 0) {
+                        return new ResultVo(1, "同日期同班级同课节有数据，不能保存");
+                    } else {
 
                         //获取seldate至结束日期时端内符合条件的日期
-                        List<String> savedates = LiveUtil.getDaysForMeetDates(kjTeaVo.getSeldate(),xz.getEnddate());
+                        List<String> savedates = LiveUtil.getDaysForMeetDates(kjTeaVo.getSeldate(), xz.getEnddate());
                         for (int i = 0; i < savedates.size(); i++) {
                             kjTeaVo.setSeldate(savedates.get(i));
 //                            ((XzService)applicationContext.getBean("xzService")).saveOneXzkjDygForDetail(kjTeaVo);
@@ -534,7 +625,7 @@ public class XzService {
                 //保存行政直播课程表,调用保存整个课表时的方法
                 List<XzDateKjTeaVo> lst = new ArrayList<>();
                 lst.add(kjTeaVo);
-                ((XzService)applicationContext.getBean("xzService")).saveCourseAll(lst, course);
+                ((XzService) applicationContext.getBean("xzService")).saveCourseAll(lst, course);
             } else {
                 //说明该教师当前有其他直播课，则把班级加入课程，完成直播课学生数量
                 TClassStudent cs = new TClassStudent();