Commit b9741b6b26d8ae3a6c830fe3324049f897df51d7
1 parent
bcb3b9bb
修改白名单和自动审核的修改者名字
Showing
2 changed files
with
6 additions
and
5 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
| @@ -89,7 +89,7 @@ public class VideosController { | @@ -89,7 +89,7 @@ public class VideosController { | ||
| 89 | return new ResponseBean(code, result.getString("msg")); | 89 | return new ResponseBean(code, result.getString("msg")); |
| 90 | } | 90 | } |
| 91 | state = state == 4 ? 2 : 1; | 91 | state = state == 4 ? 2 : 1; |
| 92 | - int i = videosService.updateVideo(id, userId, state, msg); | 92 | + int i = videosService.updateVideo(id, userId,null, state, msg); |
| 93 | if (i == 0) { | 93 | if (i == 0) { |
| 94 | return new ResponseBean(ErrorEnum.ERROR); | 94 | return new ResponseBean(ErrorEnum.ERROR); |
| 95 | } | 95 | } |
| @@ -433,7 +433,7 @@ public class VideosController { | @@ -433,7 +433,7 @@ public class VideosController { | ||
| 433 | showMsg = showMsg + "," + shyVideos.getVideo_title() + " " + result.getString("msg"); | 433 | showMsg = showMsg + "," + shyVideos.getVideo_title() + " " + result.getString("msg"); |
| 434 | break; | 434 | break; |
| 435 | } | 435 | } |
| 436 | - int i = videosService.updateVideo(Integer.parseInt(shyVideoId), userId, 2, msg); | 436 | + int i = videosService.updateVideo(Integer.parseInt(shyVideoId), userId,null, 2, msg); |
| 437 | if (i == 0) { | 437 | if (i == 0) { |
| 438 | showMsg = showMsg + "," + shyVideos.getVideo_title() + " 更新失败"; | 438 | showMsg = showMsg + "," + shyVideos.getVideo_title() + " 更新失败"; |
| 439 | break; | 439 | break; |
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
| @@ -93,11 +93,12 @@ public class VideosServiceImpl { | @@ -93,11 +93,12 @@ public class VideosServiceImpl { | ||
| 93 | return true; | 93 | return true; |
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | - public int updateVideo(Integer id, String auditor_id, Integer state, String msg) { | 96 | + public int updateVideo(Integer id, String auditor_id,String auditor, Integer state, String msg) { |
| 97 | ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(id); | 97 | ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(id); |
| 98 | shyVideos.setAuditor_id(auditor_id); | 98 | shyVideos.setAuditor_id(auditor_id); |
| 99 | shyVideos.setState(state); | 99 | shyVideos.setState(state); |
| 100 | shyVideos.setMsg(msg); | 100 | shyVideos.setMsg(msg); |
| 101 | + shyVideos.setAuditor(auditor); | ||
| 101 | return shyVideosMapper.updateByPrimaryKeySelective(shyVideos); | 102 | return shyVideosMapper.updateByPrimaryKeySelective(shyVideos); |
| 102 | } | 103 | } |
| 103 | 104 | ||
| @@ -342,13 +343,13 @@ public class VideosServiceImpl { | @@ -342,13 +343,13 @@ public class VideosServiceImpl { | ||
| 342 | shenheState=CommonConst.AUDIT_SUCCESS; | 343 | shenheState=CommonConst.AUDIT_SUCCESS; |
| 343 | } | 344 | } |
| 344 | //修改审核云的视频状态 | 345 | //修改审核云的视频状态 |
| 345 | - int i = videosService.updateVideo(video.getId(), null, shenheState, result.getString("msg")); | 346 | + int i = videosService.updateVideo(video.getId(), null,video.getAuditor(), shenheState, result.getString("msg")); |
| 346 | if (i != 1) { | 347 | if (i != 1) { |
| 347 | logger.error("点播视频更改失败,activity_id:{}", video.getVideo_id()); | 348 | logger.error("点播视频更改失败,activity_id:{}", video.getVideo_id()); |
| 348 | } | 349 | } |
| 349 | return i; | 350 | return i; |
| 350 | } else { | 351 | } else { |
| 351 | - videosService.updateVideo(video.getId(), null, CommonConst.AUDIT_CALLBACK_FAIL, result.getString("msg")); | 352 | + videosService.updateVideo(video.getId(), null,video.getAuditor(), CommonConst.AUDIT_CALLBACK_FAIL, result.getString("msg")); |
| 352 | logger.error("点播视频回调失败，activity_id:{},code:{},msg:{}", video.getVideo_id(), code, result.getString("msg")); | 353 | logger.error("点播视频回调失败，activity_id:{},code:{},msg:{}", video.getVideo_id(), code, result.getString("msg")); |
| 353 | } | 354 | } |
| 354 | 355 |