Commit 489efa9e9fe7453c3df39036c719e4451575bc9f

Authored by 王言钊
1 parent 7275c1fc

修复点播导出数据方法中的错误条件判断并测试

src/main/java/com/cnlive/shenhe/controller/LiveController.java
@@ -118,7 +118,6 @@ public class LiveController extends BaseController { @@ -118,7 +118,6 @@ public class LiveController extends BaseController {
118 @GetMapping("/page") 118 @GetMapping("/page")
119 public Object getListLives(Model model, LiveDTO liveDTO, HttpSession session) { 119 public Object getListLives(Model model, LiveDTO liveDTO, HttpSession session) {
120 logger.info("列表请求参数:{}", JSON.toJSONString(liveDTO)); 120 logger.info("列表请求参数:{}", JSON.toJSONString(liveDTO));
121 - System.out.println("进入直播内容页");  
122 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); 121 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
123 Integer spid = sessionUser.getSpid(); 122 Integer spid = sessionUser.getSpid();
124 String userId = sessionUser.getUserId(); 123 String userId = sessionUser.getUserId();
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
@@ -350,7 +350,7 @@ public class VideosServiceImpl { @@ -350,7 +350,7 @@ public class VideosServiceImpl {
350 criteria.andEqualTo("video_user_id", videosDTO.getVideo_user_id()); 350 criteria.andEqualTo("video_user_id", videosDTO.getVideo_user_id());
351 } 351 }
352 352
353 - if (videosDTO.getSource() != null) { 353 + if (CommonUtils.isNotEmpty(videosDTO.getSource())) {
354 criteria.andEqualTo("source", videosDTO.getSource()); 354 criteria.andEqualTo("source", videosDTO.getSource());
355 } 355 }
356 356
@@ -445,7 +445,7 @@ public class VideosServiceImpl { @@ -445,7 +445,7 @@ public class VideosServiceImpl {
445 public void updateDianboAndShenhe(ShyVideos video, int dianboState) { 445 public void updateDianboAndShenhe(ShyVideos video, int dianboState) {
446 //修改点播云的视频状态 446 //修改点播云的视频状态
447 JSONObject result = pass.auditPass(video.getVideo_id(), dianboState, video.getMsg(), video.getMsg(), video.getCallback()); 447 JSONObject result = pass.auditPass(video.getVideo_id(), dianboState, video.getMsg(), video.getMsg(), video.getCallback());
448 - logger.error("点播回调result:{}", result); 448 + logger.info("点播回调result:{}", result);
449 Integer code = result.getInteger("code"); 449 Integer code = result.getInteger("code");
450 String errorCode = result.getString("errorCode"); 450 String errorCode = result.getString("errorCode");
451 Integer shenheState = CommonConst.AUDIT_REFUSE; 451 Integer shenheState = CommonConst.AUDIT_REFUSE;