行政直播操作加限制保存中的禁止操作

slive/src/main/java/com/xhkjedu/slive/config/CorsConfig.java

@@ -1,34 +0,0 @@
-package com.xhkjedu.slive.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
-
-/**
- * @ClassName CorsConfig
- * Description 请求跨域支持
- * Author WN
- * Date 2020/6/5 16:29
- **/
-@Configuration
-public class CorsConfig {
-    private CorsConfiguration corsConfiguration() {
-        CorsConfiguration corsConfiguration = new CorsConfiguration();
-        // 1允许任何域名使用
-        corsConfiguration.addAllowedOrigin("*");
-        // 2允许任何头
-        corsConfiguration.addAllowedHeader("*");
-        // 3允许任何方法（post、get等）
-        corsConfiguration.addAllowedMethod("*");
-        return corsConfiguration;
-    }
-
-    @Bean
-    public CorsFilter corsFilter() {
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        source.registerCorsConfiguration("/**", corsConfiguration());
-        return new CorsFilter(source);
-    }
-}

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

@@ -159,7 +159,8 @@ public class XzController {
      **/
     @PostMapping("/kcbd")
     public ResultVo delXzkjDyg(@RequestBody XzDateKjTeaVo kjTeaVo){
-        N_Utils.validation(new Object[]{kjTeaVo.getCourseid(),"课程id",1,kjTeaVo.getClassid(),"班级id",1});
+        N_Utils.validation(new Object[]{kjTeaVo.getCourseid(), "课程id", 1, kjTeaVo.getClassid(), "班级id", 1
+                , kjTeaVo.getXzid(), "行政直播id", 1});
         return xzService.delXzkjDyg(kjTeaVo);
     }
 
@@ -185,4 +186,24 @@ public class XzController {
         return xzService.importKb(file, xzid, createid);
     }
 
+    /**
+     * 获取保存状态
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [xz]
+     * @Author ywx
+     * @Date 2023/1/28 15:43
+     **/
+    @PostMapping("/get_savestate")
+    public ResultVo getSaveState(@RequestBody LXz xz) {
+        Integer xzid = xz.getXzid();
+        N_Utils.validation(new Object[]{xzid, "行政直播id", 1});
+        Integer savestate = xzService.getSaveStateById(xzid);
+        if (savestate == 1) {
+            return new ResultVo(1, "有课表在保存中禁止操作", savestate);
+        } else {
+            return new ResultVo(0, "获取保存状态成功", savestate);
+        }
+    }
+
 }

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

@@ -41,14 +41,22 @@ public interface XzMapper extends TkMapper<LXz> {
     List<Map> listXzKjsAfterSaveXz(@Param("xzid") Integer xzid);
 
     //取指定课节指定日期所有班级的课程和教师
-    List<Map> listXzDateKjDetail(@Param("selectdate") String selectdate,@Param("xzid") Integer xzid,@Param("classid")Integer classid);
+    List<Map> listXzDateKjDetail(@Param("selectdate") String selectdate, @Param("xzid") Integer xzid,
+                                 @Param("classid") Integer classid);
 
     //获取指定课节班级对应的课程的日期
-    List<String> getAllDatesForKj(@Param("kjid") Integer kjid,@Param("classid") Integer classid,@Param("seldate") String seldate);
+    List<String> getAllDatesForKj(@Param("kjid") Integer kjid, @Param("classid") Integer classid,
+                                  @Param("seldate") String seldate);
 
     //根据课节id获取行政直播详情
     LXz getXzByXzkjid(@Param("kjid") Integer kjid);
 
     //修改课程表操作步骤
-    void updateCurstepByXzid(@Param("curstep") Integer curstep,@Param("xzid") Integer xzid);
+    void updateCurstepByXzid(@Param("curstep") Integer curstep, @Param("xzid") Integer xzid);
+
+    //修改保存状态
+    void updateSaveState(@Param("xzid") Integer xzid, @Param("savestate") int savestate);
+
+    //获取保存状态
+    Integer getSaveStateById(@Param("xzid") Integer xzid);
 }

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

@@ -44,6 +44,9 @@ public class LXz extends BaseBean {
     //当前步骤：1基础信息2课程表3设置完成
     private Integer curstep;
 
+    //保存状态：1保存中
+    private Integer savestate;
+
     //创建人
     private Integer createid;
 

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

@@ -96,6 +96,7 @@ public class XzService {
             xz.setCreatetime(timestamp);
             xz.setDeleted(1);
             xz.setCurstep(2);
+            xz.setSavestate(0);
             xzMapper.insertUseGeneratedKeys(xz);//保存行政直播信息
             Integer xzid = xz.getId();
             //保存对应的课节信息
@@ -163,6 +164,8 @@ public class XzService {
     @Transactional(rollbackFor = Exception.class)
     public void deleteXz(Integer xzid) {
         try {
+            Integer savestate = xzMapper.getSaveStateById(xzid);
+            if (savestate != 0) throw new Exception("有课表在保存中禁止操作");
             //如果行政直播下所有的课都未开始，则可以直接删除，
             //如果有直播课已经开始则进行逻辑删除，并删除所有未开始上的直播课
             Integer sectionnum = xzMapper.getXzSectionKsNum(xzid);
@@ -191,25 +194,28 @@ public class XzService {
      * @Date 2022/3/31 21:46
      **/
     public ResultVo saveXzCourse(LXz xz) {
+        Integer xzid = xz.getXzid();
         try {
             //保存行政直播课程表,参数层级为日期--课节--班级和教师
             //根据同一个课节下根据班级和教师确认是否是同一个直播课，保存进course,section（单课节课程）
-            LXz x = xzMapper.selectByPrimaryKey(xz.getXzid());//行政直播课程
+            LXz x = xzMapper.selectByPrimaryKey(xzid);//行政直播课程
+            if (x.getSavestate() != 0) return new ResultVo(1, "有课表在保存中禁止操作");
+            xzMapper.updateSaveState(xzid, 1);//修改保存状态
             List<XzDateVo> xzDatelst = xz.getXzdatas();
             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());
+                TreeMap<String, TreeMap<Integer, List<XzDateKjTeaVo>>> datemap = listDateKjForSave(xzDatelst, x);
+                Map<Integer, XzDateKjVo> kjVoMap = setKjMap(xzid);
 
                 //开始保存
-                for(Map.Entry<String, TreeMap<Integer,List<XzDateKjTeaVo>>> entry : datemap.entrySet()){
-                    TreeMap<Integer,List<XzDateKjTeaVo>> kjmap = entry.getValue();
+                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()){
+                    for (Map.Entry<Integer, List<XzDateKjTeaVo>> entrykj : kjmap.entrySet()) {
                         Integer kjid = entrykj.getKey();
                         XzDateKjVo kjVo = kjVoMap.get(kjid);
                         List<XzDateKjTeaVo> xjTealst = entrykj.getValue();
@@ -257,12 +263,13 @@ public class XzService {
                 }
 
                 //保存完课程表之后修改当前步骤
-                xzMapper.updateCurstepByXzid(3,xz.getXzid());
+                xzMapper.updateCurstepByXzid(3, xzid);
 
                 return new ResultVo(0, "保存成功");
             }
         } catch (Exception e) {
             log.error("保存行政直播课程表出错：" + e.getMessage());
+            xzMapper.updateSaveState(xzid, 0);//修改保存状态
             return new ResultVo(1,"保存失败");
         }
 
@@ -508,6 +515,8 @@ public class XzService {
      **/
     public ResultVo delXzkjDyg(XzDateKjTeaVo kjTeaVo) {
         try {
+            Integer savestate = xzMapper.getSaveStateById(kjTeaVo.getXzid());
+            if (savestate != 0) return new ResultVo(1, "有课表在保存中禁止操作");
             //判断课程的状态，如果已经开始上课则不能删除
             LCourse course = courseMapper.selectByPrimaryKey(kjTeaVo.getCourseid());
             Integer kjid = course.getKjid();
@@ -576,8 +585,11 @@ public class XzService {
      * @Date 2022/4/2 15:19
      **/
     public ResultVo saveOneXzKjDyg(XzDateKjTeaVo kjTeaVo) {
+        LXz xz = xzMapper.getXzByXzkjid(kjTeaVo.getKjid());
+        Integer xzid = xz.getXzid();
         try {
-            LXz xz = xzMapper.getXzByXzkjid(kjTeaVo.getKjid());
+            if (xz.getSavestate() != 0) return new ResultVo(1, "有课表在保存中禁止操作");
+            xzMapper.updateSaveState(xzid, 1);//修改保存状态
             kjTeaVo.setGradeid(xz.getGradeid());
             kjTeaVo.setSchoolid(xz.getSchoolid());
 
@@ -612,14 +624,16 @@ public class XzService {
 
                 }
             }
-            return new ResultVo(0, "保存成功",courseid);
+            return new ResultVo(0, "保存成功", courseid);
         } catch (Exception e) {
             log.error("保存课程表单个课程出错：" + e.getMessage());
-            if(e.getMessage().equals("所选班级无学生")){
+            if (e.getMessage().equals("所选班级无学生")) {
                 return new ResultVo(1, "保存失败：所选班级无学生");
-            }else{
+            } else {
                 return new ResultVo(1, "保存失败");
             }
+        } finally {
+            xzMapper.updateSaveState(xzid, 0);//修改保存状态
         }
     }
 
@@ -721,6 +735,8 @@ public class XzService {
         try {
             //获取行政直播信息
             LXz xz = xzMapper.selectByPrimaryKey(xzid);
+            if (xz.getSavestate() != 0) return new ResultVo(1, "有课表在保存中禁止操作");
+            xzMapper.updateSaveState(xzid, 1);//修改保存状态
             List<XzKjVo> kjs = xzKjMapper.listXzKjByXzId(xzid);//获取行政直播课节详情
             Integer noTimeKjNum = kjs.stream().filter(k -> k.getBegintime() == null).collect(Collectors.toList()).size();
             if (noTimeKjNum != 0) return new ResultVo(1, "请设置课节时间");
@@ -730,22 +746,28 @@ public class XzService {
             Integer schoolid = xz.getSchoolid();
             Integer year = schoolMapper.getYearById(schoolid);
             List<XzClassVo> classlst = classMapper.listClassByXzid(schoolid, gradeid);
-            String classids = classlst.stream().map((XzClassVo::getClassid)).map(String::valueOf).collect(Collectors.joining(","));
+            String classids = classlst.stream().map((XzClassVo::getClassid)).map(String::valueOf).collect(Collectors.joining(","
+            ));
             List<CTeacherVo> teachers = classTeacherMapper.listTeacherByClassIds(classids);//获取班级教师
-            if(!N_Utils.isListNotEmpty(teachers)) return new ResultVo(1,"请设置班级任教老师");
+            if (!N_Utils.isListNotEmpty(teachers)) return new ResultVo(1, "请设置班级任教老师");
 
-            String teacherids = teachers.stream().map((CTeacherVo::getTeacherid)).map(String::valueOf).collect(Collectors.joining(","));
+            String teacherids =
+                    teachers.stream().map((CTeacherVo::getTeacherid)).map(String::valueOf).collect(Collectors.joining(","));
             List<CTeacherVo> subjects = classTeacherMapper.listSubjectByTeacherIds(teacherids);//获取教师科目
             String subjectids = subjects.stream().map(CTeacherVo::getSubjectid).distinct().collect(Collectors.joining("','"));
             List<CTeacherVo> subjects2 = classTeacherMapper.listSubjectBySubjectIds(subjectids);
-            Map<String, String> subjectNameMap = subjects2.stream().collect(Collectors.toMap(CTeacherVo::getSubjectid, CTeacherVo::getSubjectname));
-            Map<Integer, String> subjectMap = subjects.stream().collect(Collectors.toMap(CTeacherVo::getTeacherid, CTeacherVo::getSubjectid));
-            Map<Integer, String> classMap = classlst.stream().collect(Collectors.toMap(XzClassVo::getClassid, XzClassVo::getClassname));
+            Map<String, String> subjectNameMap = subjects2.stream().collect(Collectors.toMap(CTeacherVo::getSubjectid,
+                    CTeacherVo::getSubjectname));
+            Map<Integer, String> subjectMap = subjects.stream().collect(Collectors.toMap(CTeacherVo::getTeacherid,
+                    CTeacherVo::getSubjectid));
+            Map<Integer, String> classMap = classlst.stream().collect(Collectors.toMap(XzClassVo::getClassid,
+                    XzClassVo::getClassname));
             List<CTeacherVo> users = classTeacherMapper.listTeacherBySchoolId(schoolid);//获取学校所有教师
             Set<String> userNameSet = users.stream().map(CTeacherVo::getUsername).collect(Collectors.toCollection(TreeSet::new));
             Map<String, CTeacherVo> classTeacherMap = new HashMap<>();//班级教师map
             for (CTeacherVo teacher : teachers) {
-                CTeacherVo vo = users.stream().filter(u -> u.getTeacherid().equals(teacher.getTeacherid())).findFirst().orElse(null);
+                CTeacherVo vo =
+                        users.stream().filter(u -> u.getTeacherid().equals(teacher.getTeacherid())).findFirst().orElse(null);
                 if (vo != null) teacher.setUsername(vo.getUsername());
                 teacher.setClassname(classMap.get(teacher.getClassid()));
                 teacher.setSubjectid(subjectMap.get(teacher.getTeacherid()));
@@ -783,6 +805,7 @@ public class XzService {
         } catch (Exception e) {
             log.error("导入课表出错：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            xzMapper.updateSaveState(xzid, 0);//修改保存状态
             throw new MissingParametersException(e.getMessage());
         }
     }
@@ -907,4 +930,9 @@ public class XzService {
         classStudentMapper.insertList(classStudentList);//批量保存课程班级学生
         groupStudentMapper.insertList(groupStudentList);//批量保存课程分组学生
     }
+
+    //获取保存状态
+    public Integer getSaveStateById(Integer xzid) {
+        return xzMapper.getSaveStateById(xzid);
+    }
 }

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

@@ -28,6 +28,7 @@ public class XzDateKjTeaVo {
     private Integer gradeid;//年级id
     private Integer createid;//操作人id
     private Integer schoolid;//学校id
+    private Integer xzid;//行政直播id
 
     private List<XzDateKjTeaVo> xjclass;//存放层级用于保存时使用
 }

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

@@ -4,7 +4,7 @@
 
     <!--行政直播列表-->
     <select id="listXzs" resultType="java.util.Map">
-        select x.xzid,x.xzname,x.xzcomm,x.gradeid,x.daynum,x.begindate,x.enddate,x.createid,
+        select x.xzid,x.xzname,x.xzcomm,x.gradeid,x.daynum,x.begindate,x.enddate,x.createid,x.savestate,
         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">
@@ -96,6 +96,16 @@
 
     <!--修改课程表操作步骤-->
     <update id="updateCurstepByXzid">
-        update l_xz set curstep=#{curstep} where xzid=#{xzid}
+        update l_xz set curstep=#{curstep}
+        <if test="curstep==3">,savestate=0</if>
+        where xzid=#{xzid}
     </update>
+    <!--修改保存状态-->
+    <update id="updateSaveState">
+        update l_xz set savestate=#{savestate} where xzid=#{xzid}
+    </update>
+    <!--获取保存状态-->
+    <select id="getSaveStateById" resultType="java.lang.Integer">
+        select savestate from l_xz where xzid=#{xzid}
+    </select>
 </mapper>