周伟鹏 / cnlive_shenhe · Commits

Commit 5c4ef937a051b4f282acbe050d88265a300728dc

Authored by 徐近程
2 parents 27ba5497 572c76b7

Merge branch 'dev'

Inline Side-by-side
Showing 2 changed files with 74 additions and 1 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @5c4ef93
... ... @@ -291,11 +291,77 @@ public class VideosController extends BaseController {
291 291 yuming = ks_domain + "/";
292 292 }
293 293 detailsContent.setAttr_tags(CommonUtils.isEmpty(detailsContent.getAttr_tags())?"":detailsContent.getAttr_tags());
  294 +
  295 + ShySites shySites = sitesService.findspidDescByspid(detailsContent.getSpid());
  296 + if (CommonUtils.isNotNull(shySites)) {
  297 + if (CommonUtils.isNotEmpty(detailsContent.getCategory()) && detailsContent.getCategory().equals(CommonConst.CATEGORY_WITNESS)) {
  298 + //0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 4-美食中国 5-老年大学 6-旅游摄影大赛 7-老年大学公开课 8-甲申同文 9-万人同唱一首歌 10-上太空 11-芳华归来个人 12-芳华归来团体 13-小小表演家 100-追问发布会 33-万人同唱献给党-独唱 34-万人同唱献给党-合唱
  299 + String source1 = detailsContent.getSource();
  300 + if ("1".equals(source1)) {
  301 + detailsContent.setSpid_desc("童声共济" + "(目击者)");
  302 + } else if ("2".equals(source1)) {
  303 + detailsContent.setSpid_desc("全民健身" + "(目击者)");
  304 + } else if ("3".equals(source1)) {
  305 + detailsContent.setSpid_desc("政府监督" + "(目击者)");
  306 + } else if ("4".equals(source1)) {
  307 + detailsContent.setSpid_desc("美食中国" + "(目击者)");
  308 + } else if ("5".equals(source1)) {
  309 + detailsContent.setSpid_desc("老年大学" + "(目击者)");
  310 + } else if ("6".equals(source1)) {
  311 + detailsContent.setSpid_desc("旅游摄影大赛" + "(目击者)");
  312 + } else if ("7".equals(source1)) {
  313 + detailsContent.setSpid_desc("老年大学公开课" + "(目击者)");
  314 + } else if ("8".equals(source1)) {
  315 + detailsContent.setSpid_desc("甲申同文" + "(目击者)");
  316 + } else if ("9".equals(source1)) {
  317 + detailsContent.setSpid_desc("万人同唱一首歌" + "(目击者)");
  318 + } else if ("10".equals(source1)) {
  319 + detailsContent.setSpid_desc("上太空" + "(目击者)");
  320 + } else if ("11".equals(source1)) {
  321 + detailsContent.setSpid_desc("芳华归来个人" + "(目击者)");
  322 + } else if ("12".equals(source1)) {
  323 + detailsContent.setSpid_desc("芳华归来团体" + "(目击者)");
  324 + } else if ("13".equals(source1)) {
  325 + detailsContent.setSpid_desc("小小表演家" + "(目击者)");
  326 + } else if ("100".equals(source1)) {
  327 + detailsContent.setSpid_desc("追问发布会" + "(目击者)");
  328 + } else if ("14".equals(source1)) {
  329 + detailsContent.setSpid_desc("中国微电影" + "(目击者)");
  330 + } else if ("15".equals(source1)) {
  331 + detailsContent.setSpid_desc("幼儿闯关" + "(目击者)");
  332 + } else if ("16".equals(source1)) {
  333 + detailsContent.setSpid_desc("少儿闯关" + "(目击者)");
  334 + } else if ("101".equals(source1)) {
  335 + detailsContent.setSpid_desc("电商-cms" + "(目击者)");
  336 + } else if ("17".equals(source1)) {
  337 + detailsContent.setSpid_desc("青岛读书" + "(目击者)");
  338 + } else if ("18".equals(source1)) {
  339 + detailsContent.setSpid_desc("红色故事演讲" + "(目击者)");
  340 + } else if ("19".equals(source1)) {
  341 + detailsContent.setSpid_desc("红色诗词朗诵" + "(目击者)");
  342 + } else if ("20".equals(source1)) {
  343 + detailsContent.setSpid_desc("红色短剧展演" + "(目击者)");
  344 + } else if ("21".equals(source1)) {
  345 + detailsContent.setSpid_desc("视频号" + "(目击者)");
  346 + } else if ("33".equals(source1)) {
  347 + detailsContent.setSpid_desc("万人同唱献给党-独唱" + "(目击者)");
  348 + } else if ("34".equals(source1)) {
  349 + detailsContent.setSpid_desc("万人同唱献给党-合唱" + "(目击者)");
  350 + } else if ("29".equals(source1)) {
  351 + detailsContent.setSpid_desc("我们的声音上太空" + "(目击者)");
  352 + } else {
  353 + detailsContent.setSpid_desc(shySites.getName() + "(目击者)");
  354 + }
  355 + } else if (CommonUtils.isNotEmpty(detailsContent.getCategory()) && detailsContent.getCategory().equals(CommonConst.CATEGORY_MOMENT)) {
  356 + detailsContent.setSpid_desc(shySites.getName() + "(朋友圈)");
  357 + } else {
  358 + detailsContent.setSpid_desc(shySites.getName());
  359 + }
  360 + }
294 361 model.addAttribute("images", images);
295 362 model.addAttribute("avsampleImgs", avsampleImgs);
296 363 model.addAttribute("video", detailsContent);
297 364 model.addAttribute("yuming", yuming);
298   -
299 365 return "page/videoDetail.html";
300 366 }
301 367  
... ...
src/main/resources/templates/page/videoDetail.html
  View file @5c4ef93
... ... @@ -87,6 +87,13 @@
87 87 th:text="${video.video_user_id}">video_user_id</h5>
88 88 </div>
89 89 </div>
  90 + <div class="form-group">
  91 + <label for="spid_desc" class="control-label col-sm-4">sp简称:</label>
  92 + <div class="col-sm-8">
  93 + <h5 style="font-size:1.5em; font-weight: bold;"
  94 + th:text="${video.spid_desc}">video_user_id</h5>
  95 + </div>
  96 + </div>
90 97 <hr>
91 98 <div class="form-group">
92 99 <div class="col-sm-12">
... ...