开发点播service接口测试并优化代码

王言钊
1 parent 7831ad1e
Showing 8 changed files with 202 additions and 47 deletions
src/main/java/com/cnlive/shenhe/api/AvsampleCallBackControllerApi.java
src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java
src/main/java/com/cnlive/shenhe/controller/LiveController.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/job/VideosJob.java
src/main/java/com/cnlive/shenhe/service/VideosService.java
src/main/java/com/cnlive/shenhe/service/serviceImpl/ContentServiceImpl.java
src/main/java/com/cnlive/shenhe/service/serviceImpl/VideosServiceImpl.java
@@ -2,18 +2,22 @@ package com.cnlive.shenhe.api;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.entity.ShyVideos;
-import com.cnlive.shenhe.service.serviceImpl.VideosServiceImpl;
+import com.cnlive.shenhe.service.VideosService;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.List;
 /**
+ * @author Administrator
  * @Auther: 周伟鹏
  * @Date: 2018/12/21 13:43
  * @Description:抽帧回调接口
@@ -25,7 +29,7 @@ public class AvsampleCallBackControllerApi {
     private static Logger logger = LoggerFactory.getLogger(AvsampleCallBackControllerApi.class);
     @Autowired
-    VideosServiceImpl videosService;
+    VideosService videosService;
     /**
      * 接收抽帧结果
@@ -43,7 +47,7 @@ public class AvsampleCallBackControllerApi {
             if (CommonUtils.isNotEmpty(taskId)) {
                 ShyVideos shyVideo = new ShyVideos();
                 shyVideo.setTask_id(taskId);
-                List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideo);
+                List<ShyVideos> shyVideosList = videosService.findShyVideo(shyVideo);
                 if (!shyVideosList.isEmpty()) {
                     ShyVideos video = shyVideosList.get(0);
                     Integer code = json.getInteger("code");
@@ -58,7 +62,7 @@ public class AvsampleCallBackControllerApi {
                         video.setMsg("抽帧失败，改为人工审核，失败消息：" + json.getString("errorMsg"));
                     }
                     video.setAvsample_msg(json.toJSONString());
-                    boolean success = videosService.updateshyVideos(video);
+                    boolean success = videosService.updateShyVideos(video);
                     if (!success) {
                         result.put("code", -1);
                     }
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.entity.ShyVideos;
-import com.cnlive.shenhe.service.serviceImpl.VideosServiceImpl;
+import com.cnlive.shenhe.service.VideosService;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.cnlive.shenhe.utils.HttpUtil;
@@ -33,7 +33,7 @@ import java.util.Map;
 public class VideosControllerApi {
     private static Logger logger = LoggerFactory.getLogger(VideosControllerApi.class);
     @Autowired
-    VideosServiceImpl videosService;
+    VideosService videosService;
     @Value("${avsmple_appKey}")
     String appkey;
@@ -80,7 +80,7 @@ public class VideosControllerApi {
         //g得到id去查询是否已有
         String videoId = json.getString("videoId");
         shyVideos.setVideo_id(videoId);
-        List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideos);
+        List<ShyVideos> shyVideosList = videosService.findShyVideo(shyVideos);
         if (shyVideosList.size() > 0) {
             logger.info("点播入库更新开始............................");
             ShyVideos shyVideos1 = shyVideosList.get(0);
@@ -149,7 +149,7 @@ public class VideosControllerApi {
             return videosService.impotVideo(shyVideos);
         } else {
             logger.info("当前视频类型是：" + shyVideos.getShenhe_type());
-            return videosService.updateshyVideos(shyVideos);
+            return videosService.updateShyVideos(shyVideos);
         }
     }
@@ -12,7 +12,7 @@ import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.LiveService;
 import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.service.UsersService;
-import com.cnlive.shenhe.service.serviceImpl.VideosServiceImpl;
+import com.cnlive.shenhe.service.VideosService;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -51,7 +51,7 @@ public class LiveController extends BaseController {
     @Autowired
     AuditPass pass;
     @Autowired
-    VideosServiceImpl videosService;
+    VideosService videosService;
     @Autowired
     UsersService usersService;
     @Autowired
@@ -134,18 +134,23 @@ public class LiveController extends BaseController {
         } else if (CommonUtils.isEmpty(liveDTO.getSp_desc()) && liveDTO.getSpid() == 0) {
             liveDTO.setSpid(null);
         }
-        String orderByClause = "";
+        StringBuilder orderByClause = new StringBuilder();
+        //String orderByClause = "";
         //审核状态：全部待领
         if (liveDTO.getShenhe_state() != null && liveDTO.getShenhe_state() == 0) {
-            orderByClause = "field(activity_status,1,3,2,0,4), pre_start_time ";
-        } else if (liveDTO.getShenhe_state() != null && liveDTO.getShenhe_state() == 1) {//审核状态：待审核
-            orderByClause = "field(activity_status,1,3,2,0,4), pre_start_time ";
-        } else if (liveDTO.getShenhe_state() != null && liveDTO.getShenhe_state() == 2) {//审核状态：已审核
-            orderByClause = "pre_start_time desc";
-        } else {//审核状态：全部
-            orderByClause = "is_hot desc, pre_start_time ";
-            if (liveDTO.getActivity_status() != null && (liveDTO.getActivity_status() == 0 || liveDTO.getActivity_status() == 2 || liveDTO.getActivity_status() == 4)) {//直播状态：结束、撤销、下线
-                orderByClause = "is_hot desc, pre_start_time desc";
+            orderByClause.append("field(activity_status,1,3,2,0,4), pre_start_time");
+            //审核状态：待审核
+        } else if (liveDTO.getShenhe_state() != null && liveDTO.getShenhe_state() == 1) {
+            orderByClause.append("field(activity_status,1,3,2,0,4), pre_start_time");
+            //审核状态：已审核
+        } else if (liveDTO.getShenhe_state() != null && liveDTO.getShenhe_state() == 2) {
+            orderByClause.append("pre_start_time desc");
+            //审核状态：全部
+        } else {
+            orderByClause.append("is_hot desc, pre_start_time");
+            //直播状态：结束、撤销、下线
+            if (liveDTO.getActivity_status() != null && (liveDTO.getActivity_status() == 0 || liveDTO.getActivity_status() == 2 || liveDTO.getActivity_status() == 4)) {
+                orderByClause.append("is_hot desc, pre_start_time desc");
             }
         }
         if (CommonUtils.isNotNull(liveDTO.getContentId())) {
@@ -7,11 +7,7 @@ import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
 import com.cnlive.shenhe.dto.VideosDTO;
 import com.cnlive.shenhe.entity.*;
-import com.cnlive.shenhe.service.ShyActivityService;
-import com.cnlive.shenhe.service.ShyLogService;
-import com.cnlive.shenhe.service.SitesService;
-import com.cnlive.shenhe.service.UsersService;
-import com.cnlive.shenhe.service.serviceImpl.VideosServiceImpl;
+import com.cnlive.shenhe.service.*;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -51,7 +47,7 @@ public class VideosController extends BaseController {
     @Autowired
     private AuditPass pass;
     @Autowired
-    private VideosServiceImpl videosService;
+    private VideosService videosService;
     @Autowired
     private UsersService usersService;
     @Autowired
 package com.cnlive.shenhe.job;
 import com.cnlive.shenhe.entity.ShyVideos;
-import com.cnlive.shenhe.service.serviceImpl.VideosServiceImpl;
+import com.cnlive.shenhe.service.VideosService;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonConstStates;
 import org.slf4j.Logger;
@@ -20,7 +20,7 @@ public class VideosJob {
     private static Logger logger = LoggerFactory.getLogger(VideosJob.class);
     @Autowired
-    VideosServiceImpl videosService;
+    VideosService videosService;
     /**
      * 白名单sp视频通过
@@ -33,7 +33,7 @@ public class VideosJob {
         shyVideos.setShenhe_type(CommonConst.AUDIT_TYPE_FREE);
         // 审核状态为未审核
         shyVideos.setState(CommonConst.AUDIT_INTT);
-        List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideos);
+        List<ShyVideos> shyVideosList = videosService.findShyVideo(shyVideos);
         if (shyVideosList.size() > 0) {
             for (ShyVideos video : shyVideosList) {
                 logger.info("当前白名单通过的videos_id：" + video.getId());
@@ -50,7 +50,7 @@ public class VideosJob {
      * 每天8点到23点执行，每分钟一次
      */
     @Scheduled(cron = "0 0/1 8-23 * * ? ")
-    public void videofilter() {
+    public void videoFilter() {
         ShyVideos shyVideos = new ShyVideos();
         //审核类型为机审
         shyVideos.setShenhe_type(CommonConst.AUDIT_TYPE_MACHANE);
@@ -58,7 +58,7 @@ public class VideosJob {
         shyVideos.setState(CommonConst.AUDIT_INTT);
         //抽帧完成
         shyVideos.setAvsample(CommonConst.AVSAMPLE_SUCCESS);
-        List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideos);
+        List<ShyVideos> shyVideosList = videosService.findShyVideo(shyVideos);
         if (shyVideosList != null && shyVideosList.size() > 0) {
             for (ShyVideos video : shyVideosList) {
                 logger.info("定时向易盾发送检测视频的videos_id：{}", video.getId());
@@ -82,14 +82,14 @@ public class VideosJob {
         shyVideos.setState(CommonConst.AUDIT_INTT);
         //已领取
         shyVideos.setReceive(CommonConst.RECEIVE_AFTER);
-        List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideos);
+        List<ShyVideos> shyVideosList = videosService.findShyVideo(shyVideos);
         if (shyVideosList.size() > 0) {
             for (ShyVideos shyVideos2 : shyVideosList) {
                 logger.info("自动退领的videos_id：" + shyVideos2.getId());
                 //未领取
                 shyVideos2.setReceive(CommonConst.RECEIVE_BEFORE);
                 shyVideos2.setReceive_user_id(null);
-                videosService.updateshyVideos(shyVideos2);
+                videosService.updateShyVideos(shyVideos2);
             }
         }
     }
+package com.cnlive.shenhe.service;
+
+import com.cnlive.shenhe.bean.ResponseBean;
+import com.cnlive.shenhe.dto.VideosDTO;
+import com.cnlive.shenhe.entity.ShyVideos;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+/**
+ * @Author: yan-zhao-wang
+ * @DateTime: 2022-11-10 9:05
+ */
+public interface VideosService {
+    /**
+     * 导入点播视频 返回布尔类型
+     *
+     * @param shyVideos
+     * @return
+     */
+    boolean impotVideo(ShyVideos shyVideos);
+
+    /**
+     * 根据主键id查询video对象
+     *
+     * @param id
+     * @return
+     */
+    ShyVideos selectByPrimaryKey(Integer id);
+
+    /**
+     * 根据对象查询 返回video列表集合
+     *
+     * @param shyVideos
+     * @return
+     */
+    List<ShyVideos> findShyVideo(ShyVideos shyVideos);
+
+    /**
+     * 根据主键修改点播  返回布尔类型
+     *
+     * @param shyVideos
+     * @return
+     */
+    boolean updateShyVideos(ShyVideos shyVideos);
+
+    /**
+     * 根据条件修改video 返回int类型
+     *
+     * @param id
+     * @param auditorId
+     * @param updater
+     * @param attrTags
+     * @param state
+     * @param msg
+     * @return
+     */
+    int updateVideo(Integer id, String auditorId, String updater, String attrTags, Integer state, String msg);
+
+    /**
+     * video分页、条件查询 返回列表集合
+     *
+     * @param videosDTO
+     * @return
+     */
+    PageInfo<ShyVideos> getListVideo(VideosDTO videosDTO);
+
+    /**
+     * 获取video详情
+     *
+     * @param id
+     * @return
+     */
+    ShyVideos getDetailsVideo(Integer id);
+
+    /**
+     * 认领video
+     *
+     * @param ids
+     * @param num
+     * @param userId
+     * @param spid
+     * @return
+     */
+    Integer receive(String ids, Integer num, String userId, Integer spid);
+
+    /**
+     * 退领video
+     *
+     * @param ids
+     * @param userId
+     * @return
+     */
+    ResponseBean retReceive(String ids, String userId);
+
+    /**
+     * 根据条件导出数据excel
+     *
+     * @param videosDTO
+     * @return
+     */
+    List<ShyVideos> findByCondition(VideosDTO videosDTO);
+
+    /**
+     * 易盾视频（图片）过滤
+     * type:1:文本 2:图片 3.网页 4:点播音频
+     *
+     * @param cid 审核云中视频的id
+     */
+    void videoFilter(Integer cid);
+
+    /**
+     * 更新点播和审核的视频状态
+     *
+     * @param video
+     * @param dianboState 视频状态，1通过，2不通过
+     */
+    void updateDianboAndShenhe(ShyVideos video, int dianboState);
+
+    /**
+     * 根据sp、栏目、用户id来判断审核类型
+     *
+     * @param shyVideo
+     */
+    void getShenheType(ShyVideos shyVideo);
+
+    /**
+     * 人工审核拒绝方法
+     *
+     * @param shyVideoId
+     * @param msg
+     * @param userId
+     * @param
+     * @return
+     */
+    String repulse(String shyVideoId, String msg, String userId);
+}
@@ -8,6 +8,7 @@ import com.cnlive.shenhe.mapper.ShyContentMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.service.ContentService;
 import com.cnlive.shenhe.service.SitesService;
+import com.cnlive.shenhe.service.VideosService;
 import com.cnlive.shenhe.service.YiDunService;
 import com.cnlive.shenhe.utils.*;
 import com.github.pagehelper.PageHelper;
@@ -41,7 +42,7 @@ public class ContentServiceImpl implements ContentService {
     @Autowired
     SitesService sitesService;
     @Autowired
-    VideosServiceImpl videosService;
+    VideosService videosService;
     @Autowired
     YiDunService yiDunService;
@@ -286,9 +287,9 @@ public class ContentServiceImpl implements ContentService {
                     && state.equals(CommonConst.AUDIT_REFUSE)) {
                 ShyVideos shyVideos1 = new ShyVideos();
                 shyVideos1.setVideo_id(content.getVideo_id());
-                List<ShyVideos> listshyVideos = videosService.findshyVideo(shyVideos1);
-                if (listshyVideos.size() > 0) {
-                    ShyVideos shyVideos = listshyVideos.get(0);
+                List<ShyVideos> listShyVideos = videosService.findShyVideo(shyVideos1);
+                if (listShyVideos.size() > 0) {
+                    ShyVideos shyVideos = listShyVideos.get(0);
                     String showMsg = videosService.repulse(shyVideos.getId().toString(), msg, userId);
                     if (CommonUtils.isNotEmpty(showMsg)) {
                         success = false;
@@ -12,10 +12,7 @@ import com.cnlive.shenhe.entity.ShyVideos;
 import com.cnlive.shenhe.entity.ShyYidun;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.mapper.ShyVideosMapper;
-import com.cnlive.shenhe.service.ShyActivityService;
-import com.cnlive.shenhe.service.SitesService;
-import com.cnlive.shenhe.service.UsersfreeService;
-import com.cnlive.shenhe.service.YiDunService;
+import com.cnlive.shenhe.service.*;
 import com.cnlive.shenhe.utils.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -34,12 +31,13 @@ import java.util.List;
 import java.util.UUID;
 /**
+ * @author Administrator
  * @Auther: chenhao
  * @Date: 2018/11/30 14:23
  * @Description:
  */
 @Service
-public class VideosServiceImpl {
+public class VideosServiceImpl implements VideosService {
     private static Logger logger = LoggerFactory.getLogger(VideosServiceImpl.class);
     @Autowired
@@ -47,7 +45,7 @@ public class VideosServiceImpl {
     @Autowired
     private ShyUsersMapper shyUsersMapper;
     @Autowired
-    private VideosServiceImpl videosService;
+    private VideosService videosService;
     @Autowired
     private SitesService sitesService;
     @Autowired
@@ -69,6 +67,7 @@ public class VideosServiceImpl {
      * @param shyVideos
      * @return
      */
+    @Override
     public boolean impotVideo(ShyVideos shyVideos) {
         int result = shyVideosMapper.insertSelective(shyVideos);
         return result != 0;
@@ -80,6 +79,7 @@ public class VideosServiceImpl {
      * @param id
      * @return
      */
+    @Override
     public ShyVideos selectByPrimaryKey(Integer id) {
         return shyVideosMapper.selectByPrimaryKey(id);
     }
@@ -90,7 +90,8 @@ public class VideosServiceImpl {
      * @param shyVideos
      * @return
      */
-    public List<ShyVideos> findshyVideo(ShyVideos shyVideos) {
+    @Override
+    public List<ShyVideos> findShyVideo(ShyVideos shyVideos) {
         return shyVideosMapper.selectByRowBounds(shyVideos, new RowBounds(0, 100));
     }
@@ -100,7 +101,8 @@ public class VideosServiceImpl {
      * @param shyVideos
      * @return
      */
-    public boolean updateshyVideos(ShyVideos shyVideos) {
+    @Override
+    public boolean updateShyVideos(ShyVideos shyVideos) {
         int i = shyVideosMapper.updateByPrimaryKeySelective(shyVideos);
         return i != 0;
     }
@@ -116,6 +118,7 @@ public class VideosServiceImpl {
      * @param msg
      * @return
      */
+    @Override
     public int updateVideo(Integer id, String auditorId, String updater, String attrTags, Integer state, String msg) {
         ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(id);
         shyVideos.setAuditor_id(auditorId);
@@ -141,6 +144,7 @@ public class VideosServiceImpl {
      * @param videosDTO
      * @return
      */
+    @Override
     public PageInfo<ShyVideos> getListVideo(VideosDTO videosDTO) {
         logger.info("接受点播列表为，VideosDTO:{}", JSON.toJSONString(videosDTO));
         Example example = new Example(ShyVideos.class);
@@ -225,6 +229,7 @@ public class VideosServiceImpl {
      * @param id
      * @return
      */
+    @Override
     public ShyVideos getDetailsVideo(Integer id) {
         ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(id);
         if (!shyVideos.getState().equals(CommonConst.AUDIT_INTT)) {
@@ -251,6 +256,7 @@ public class VideosServiceImpl {
      * @param spid
      * @return
      */
+    @Override
     public Integer receive(String ids, Integer num, String userId, Integer spid) {
         Integer n = 0;
         if (CommonUtils.isNotEmpty(ids)) {
@@ -292,6 +298,7 @@ public class VideosServiceImpl {
      * @param userId
      * @return
      */
+    @Override
     public ResponseBean retReceive(String ids, String userId) {
         String[] cids = ids.split(",");
         for (String cid : cids) {
@@ -316,6 +323,7 @@ public class VideosServiceImpl {
      * @param videosDTO
      * @return
      */
+    @Override
     public List<ShyVideos> findByCondition(VideosDTO videosDTO) {
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
@@ -369,6 +377,7 @@ public class VideosServiceImpl {
      *
      * @param cid 审核云中视频的id
      */
+    @Override
     public void videoFilter(Integer cid) {
         ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(cid);
         shyVideos.setUpdater("自动审核");
@@ -410,7 +419,7 @@ public class VideosServiceImpl {
             shyVideos.setShenhe_type(CommonConst.AUDIT_TYPE_USER);
             //拒绝原因
             shyVideos.setMsg(desc);
-            boolean b = videosService.updateshyVideos(shyVideos);
+            boolean b = videosService.updateShyVideos(shyVideos);
             logger.info("进入拒绝方法：{},返回布尔类型{}", desc, b);
         }
         try {
@@ -435,6 +444,7 @@ public class VideosServiceImpl {
      * @param video
      * @param dianboState 视频状态，1通过，2不通过
      */
+    @Override
     public void updateDianboAndShenhe(ShyVideos video, int dianboState) {
         //修改点播云的视频状态
         JSONObject result = pass.auditPass(video.getVideo_id(), dianboState, video.getMsg(), video.getMsg(), video.getCallback());
@@ -482,6 +492,7 @@ public class VideosServiceImpl {
      *
      * @param shyVideo
      */
+    @Override
     public void getShenheType(ShyVideos shyVideo) {
         //获取点播免审sp
         List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_VIDEO);
@@ -536,6 +547,7 @@ public class VideosServiceImpl {
      * @param
      * @return
      */
+    @Override
     public String repulse(String shyVideoId, String msg, String userId) {
         StringBuilder showMsg = new StringBuilder();
         ShyVideos shyVideos = videosService.selectByPrimaryKey(Integer.parseInt(shyVideoId));