Commit 6d8aea1b2103998ed201e604db89d9f6cc283d80
1 parent
e66fbe59
添加点播分辨率、大小
Showing
4 changed files
with
73 additions
and
0 deletions
src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java
| ... | ... | @@ -125,6 +125,16 @@ public class VideosControllerApi { |
| 125 | 125 | } |
| 126 | 126 | shyVideos.setVideo_poster(poster); |
| 127 | 127 | } |
| 128 | + //添加点播尺寸和大小 | |
| 129 | + String resOrigin = json.getString("resOrigin"); | |
| 130 | + String sizeOrigin = json.getString("sizeOrigin"); | |
| 131 | + if (CommonUtils.isNotNull(resOrigin)){ | |
| 132 | + shyVideos.setRes_origin(resOrigin); | |
| 133 | + } | |
| 134 | + if (CommonUtils.isNotNull(sizeOrigin)){ | |
| 135 | + shyVideos.setSize_origin(sizeOrigin); | |
| 136 | + } | |
| 137 | + | |
| 128 | 138 | shyVideos.setVideo_desc(json.getString("videoIntro")); |
| 129 | 139 | shyVideos.setVideo_tags(json.getString("videoTag")); |
| 130 | 140 | shyVideos.setVideo_keyword(json.getString("videoKeyword")); | ... | ... |
src/main/java/com/cnlive/shenhe/controller/VideosController.java
| ... | ... | @@ -279,6 +279,7 @@ public class VideosController extends BaseController { |
| 279 | 279 | detailsContent.setSpid_desc(shySites.getName()); |
| 280 | 280 | } |
| 281 | 281 | } |
| 282 | + | |
| 282 | 283 | model.addAttribute("images", images); |
| 283 | 284 | model.addAttribute("avsampleImgs", avsampleImgs); |
| 284 | 285 | model.addAttribute("video", detailsContent); | ... | ... |
src/main/java/com/cnlive/shenhe/entity/ShyVideos.java
| ... | ... | @@ -164,6 +164,16 @@ public class ShyVideos { |
| 164 | 164 | private String avsample_msg; |
| 165 | 165 | |
| 166 | 166 | /** |
| 167 | + * 源视频分辨率 | |
| 168 | + */ | |
| 169 | + private String res_origin; | |
| 170 | + | |
| 171 | + /** | |
| 172 | + * 源视频大小 | |
| 173 | + */ | |
| 174 | + private String size_origin; | |
| 175 | + | |
| 176 | + /** | |
| 167 | 177 | * @return id |
| 168 | 178 | */ |
| 169 | 179 | public Integer getId() { |
| ... | ... | @@ -759,6 +769,42 @@ public class ShyVideos { |
| 759 | 769 | this.spid_desc = spid_desc; |
| 760 | 770 | } |
| 761 | 771 | |
| 772 | + /** | |
| 773 | + * 获取源视频分辨率 | |
| 774 | + * | |
| 775 | + * @return res_origin - 源视频分辨率 | |
| 776 | + */ | |
| 777 | + public String getRes_origin() { | |
| 778 | + return res_origin; | |
| 779 | + } | |
| 780 | + | |
| 781 | + /** | |
| 782 | + * 设置源视频分辨率 | |
| 783 | + * | |
| 784 | + * @param res_origin 源视频分辨率 | |
| 785 | + */ | |
| 786 | + public void setRes_origin(String res_origin) { | |
| 787 | + this.res_origin = res_origin; | |
| 788 | + } | |
| 789 | + | |
| 790 | + /** | |
| 791 | + * 获取抽源视频大小 | |
| 792 | + * | |
| 793 | + * @return size_origin - 源视频大小 | |
| 794 | + */ | |
| 795 | + public String getSize_origin() { | |
| 796 | + return size_origin; | |
| 797 | + } | |
| 798 | + | |
| 799 | + /** | |
| 800 | + * 设置源视频大小 | |
| 801 | + * | |
| 802 | + * @param size_origin 源视频大小 | |
| 803 | + */ | |
| 804 | + public void setSize_origin(String size_origin) { | |
| 805 | + this.size_origin = size_origin; | |
| 806 | + } | |
| 807 | + | |
| 762 | 808 | @Override |
| 763 | 809 | public String toString() { |
| 764 | 810 | return "ShyVideos{" + |
| ... | ... | @@ -797,6 +843,8 @@ public class ShyVideos { |
| 797 | 843 | ", video_md5='" + video_md5 + '\'' + |
| 798 | 844 | ", avsample_imgs='" + avsample_imgs + '\'' + |
| 799 | 845 | ", avsample_msg='" + avsample_msg + '\'' + |
| 846 | + ", res_origin='" + res_origin + '\'' + | |
| 847 | + ", size_origin='" + size_origin + '\'' + | |
| 800 | 848 | '}'; |
| 801 | 849 | } |
| 802 | 850 | } |
| 803 | 851 | \ No newline at end of file | ... | ... |
src/main/resources/templates/page/videoDetail.html
| ... | ... | @@ -94,6 +94,20 @@ |
| 94 | 94 | th:text="${video.spid_desc}">video_user_id</h5> |
| 95 | 95 | </div> |
| 96 | 96 | </div> |
| 97 | + <div class="form-group" th:if="${video.res_origin != null}"> | |
| 98 | + <label for="res_origin" class="control-label col-sm-4">点播分辨率:</label> | |
| 99 | + <div class="col-sm-8"> | |
| 100 | + <h5 style="font-size:1.5em; font-weight: bold;" | |
| 101 | + th:text="${video.res_origin}">video_user_id</h5> | |
| 102 | + </div> | |
| 103 | + </div> | |
| 104 | + <div class="form-group" th:if="${video.size_origin != null}"> | |
| 105 | + <label for="size_origin" class="control-label col-sm-4">点播大小:</label> | |
| 106 | + <div class="col-sm-8"> | |
| 107 | + <h5 style="font-size:1.5em; font-weight: bold;" | |
| 108 | + th:text="${video.size_origin}">video_user_id</h5> | |
| 109 | + </div> | |
| 110 | + </div> | |
| 97 | 111 | <hr> |
| 98 | 112 | <div class="form-group"> |
| 99 | 113 | <div class="col-sm-12"> | ... | ... |