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

sclass/src/main/resources/mapper/classroom/ClassroomMapper.xml

@@ -356,8 +356,7 @@
         <if test="userVo.usertype!=0">
             and c.teacherid=#{room.teacherid}
         </if>
-
-        <if test="room.directorid!=null and room.directorid!='0'.toString() and room.directorid!=''">AND
+        <if test="room.directorid!=null and room.directorid!='0'.toString() and room.directorid!=''">
             AND c.directorid=#{room.directorid}
         </if>
         <if test="room.classid!=null and room.classid!=0">AND c.classid=#{room.classid}</if>

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

@@ -3,6 +3,7 @@ package com.xhkjedu.slive.controller.liveplay;
 import com.xhkjedu.slive.model.liveplay.LCourseSectionPlayback;
 import com.xhkjedu.slive.model.liveplay.LCourseSectionPlaybackSee;
 import com.xhkjedu.slive.service.liveplay.CourseSectionPlaybackService;
+import com.xhkjedu.slive.vo.liveplay.CSPlaybackVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -66,5 +67,24 @@ public class CourseSectionPlaybackController {
         return new ResultVo(0,"成功更新视频下载次数");
     }
 
+    /**
+     * @Description 根据课节名称删除回放地址
+     * @Date 2023/11/20 11:05
+     * @Author YWX
+     * @Param [pb]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/del_pb")
+    public ResultVo deletePb(@RequestBody CSPlaybackVo pb) {
+        if (!N_Utils.isTrueInteger(pb.getBatchnum())) return new ResultVo(1, "批处理数量不能为空");
+        List<String> sectionnames = pb.getSectionnames();
+        if (N_Utils.isListEmpty(sectionnames)) return new ResultVo(1, "课节名称不能为空");
+        for (String sectionname : sectionnames) {
+            if (N_Utils.isEmpty(sectionname)) return new ResultVo(1, "课节名称不能为空");
+        }
+        courseSectionPlaybackService.deletePb(pb);
+        return new ResultVo(0, "删除回放成功");
+    }
+
 
 }

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

@@ -29,4 +29,10 @@ public interface CourseSectionPlaybackMapper extends TkMapper<LCourseSectionPlay
 
     //修改视频下载次数
     void updateDownnum(@Param("pbid") Integer pbid);
+
+    //根据课节名称获取回放地址列表
+    List<Map> listPb(@Param("sectionnames") List<String> sectionnames);
+
+    //删除回放
+    void deletePb(@Param("pbs") List<String> pbs);
 }

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

@@ -1,16 +1,20 @@
 package com.xhkjedu.slive.service.liveplay;
 
+import com.alibaba.fastjson.JSON;
 import com.xhkjedu.slive.mapper.liveplay.CourseSectionPlaybackMapper;
 import com.xhkjedu.slive.mapper.liveplay.CourseSectionPlaybackSeeMapper;
 import com.xhkjedu.slive.model.liveplay.LCourseSectionPlayback;
 import com.xhkjedu.slive.model.liveplay.LCourseSectionPlaybackSee;
+import com.xhkjedu.slive.utils.LiveUtil;
+import com.xhkjedu.slive.vo.liveplay.*;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @ClassName CourseSectionPlaybackService
@@ -19,6 +23,7 @@ import java.util.Map;
  * Date 2021/6/16 10:20
  **/
 @Service
+@Slf4j
 public class CourseSectionPlaybackService {
 
     @Resource
@@ -75,4 +80,38 @@ public class CourseSectionPlaybackService {
     public void updateDownnum(LCourseSectionPlayback playback) {
         courseSectionPlaybackMapper.updateDownnum(playback.getPbid());//修改回放观看次数
     }
+
+    /**
+     * @Description 根据课节名称删除回放地址
+     * @Date 2023/11/20 16:36
+     * @Author YWX
+     * @Param [pb]
+     * @Return void
+     **/
+    public void deletePb(CSPlaybackVo pb) {
+        List<Map> list = courseSectionPlaybackMapper.listPb(pb.getSectionnames());
+        for (Map map : list) {
+            String rspath = map.get("rspath").toString();
+            List<String> pbs = (List<String>) map.get("pbs");
+            Map<String, Object> params = new HashMap<>();
+            Integer batchnum = pb.getBatchnum();
+            for (int i = 0; i < pbs.size(); i += batchnum) {
+                List<String> filelist = pbs.stream().skip(i).limit(batchnum).collect(Collectors.toList());
+                params.put("fileList", filelist);
+                params.put("sign", N_Utils.getMD5Pwd(JSON.toJSONString(filelist)));
+                ResultVo vo = LiveUtil.sendJsonPost(rspath + "/recorder/v1/delfiles", JSON.toJSONString(params));
+                if (vo.getCode() == 0) {
+                    Map<String, List<String>> result = (Map<String, List<String>>) vo.getObj();
+                    List<String> successList = result.get("successList");
+                    courseSectionPlaybackMapper.deletePb(successList);
+                    List<String> failList = result.get("failList");
+                    if (N_Utils.isListNotEmpty(failList)) {
+                        log.error("删除回放失败：{}", failList);
+                    }
+                } else {
+                    log.error("删除回放失败：{}", vo.getMsg());
+                }
+            }
+        }
+    }
 }

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

@@ -1,5 +1,8 @@
 package com.xhkjedu.slive.utils;
 
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
 
 import java.time.DayOfWeek;
@@ -189,4 +192,12 @@ public class LiveUtil {
         return rtnlst;
     }
 
+    //发送请求
+    public static ResultVo sendJsonPost(String url, String param) {
+        String result = N_Utils.sendJsonPost(url, param);
+        if (N_Utils.isEmpty(result)) return new ResultVo(1, "发送请求失败");
+        ResultVo vo = JSON.parseObject(result, ResultVo.class);
+        return vo;
+    }
+
 }

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

@@ -0,0 +1,19 @@
+package com.xhkjedu.slive.vo.liveplay;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description 删除回放vo
+ * @Author: YWX
+ * @Date 2023/11/20 16:53
+ **/
+@Data
+public class CSPlaybackVo {
+    //课节名称
+    private List<String> sectionnames;
+
+    //批处理数量
+    private Integer batchnum;
+}

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

@@ -26,5 +26,26 @@
     <update id="updateDownnum">
         update l_course_section_playback set dn = dn+1 where pbid=#{pbid};
     </update>
+    <!--根据课节名称获取回放地址列表-->
+    <resultMap id="pbResult" type="java.util.Map">
+        <result property="rspath" column="rspath"/>
+        <collection property="pbs" javaType="java.util.List" ofType="java.lang.String">
+            <result property="pb" column="pb"/>
+        </collection>
+    </resultMap>
+    <select id="listPb" resultMap="pbResult">
+        select p.pb,r.rspath
+        from l_course_section cs right join l_course_section_playback p on cs.sectionid=p.sectionid
+        left join l_recordserver r on p.rsid=r.rsid
+        where p.pb is not null and p.pb!=''
+        <foreach collection="sectionnames" item="sectionname" open=" and (" separator="or" close=")">
+            cs.sectionname LIKE '%${sectionname}%'
+        </foreach>
+    </select>
+    <!--删除回放-->
+    <update id="deletePb">
+        update l_course_section_playback set pb=null where pb in
+        <foreach collection="pbs" item="pb" open="(" separator="," close=")">'${pb}'</foreach>
+    </update>
 
 </mapper>