update

徐近程
1 parent 2966ae9a
Showing 3 changed files with 28 additions and 4 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/resources/templates/page/video.html
@@ -126,7 +126,7 @@ public class VideosController extends BaseController {
      * @return
      */
     @GetMapping("/page")
-    public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id, Integer source, String video_user_id, String shen_auditor_id, Integer contentId, String video_id, HttpSession session) {
+    public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id, String source, String video_user_id, String shen_auditor_id, Integer contentId, String video_id, HttpSession session) {
         if (!StringUtils.isEmpty(shen_auditor_id)) {
             if ((!"自动审核".equals(shen_auditor_id)) && (!"白名单".equals(shen_auditor_id))) {
                 shen_auditor_id = usersService.findspidByName(shen_auditor_id);
@@ -191,16 +191,36 @@ public class VideosController extends BaseController {
                 ShySites shySites = sitesService.findspidDescByspid(videos.getSpid());
                 if (CommonUtils.isNotNull(shySites)) {
                     if (CommonUtils.isNotEmpty(videos.getCategory()) && videos.getCategory().equals(CommonConst.CATEGORY_WITNESS)) {
-                        //0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 4-美食中国 5-老年大学
+                        //0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 4-美食中国 5-老年大学 6-旅游摄影大赛 7-老年大学公开课 8-甲申同文 9-万人同唱一首歌 10-上太空 11-芳华归来个人 12-芳华归来团体 13-小小表演家 100-追问发布会
                         String source1 = videos.getSource();
                         if ("1".equals(source1)) {
                             videos.setSpid_desc("童声共济" + "(目击者)");
                         } else if ("2".equals(source1)) {
                             videos.setSpid_desc("全民健身" + "(目击者)");
+                        } else if ("3".equals(source1)) {
+                            videos.setSpid_desc("政府监督" + "(目击者)");
                         } else if ("4".equals(source1)) {
                             videos.setSpid_desc("美食中国" + "(目击者)");
                         } else if ("5".equals(source1)) {
                             videos.setSpid_desc("老年大学" + "(目击者)");
+                        } else if ("6".equals(source1)) {
+                            videos.setSpid_desc("旅游摄影大赛" + "(目击者)");
+                        } else if ("7".equals(source1)) {
+                            videos.setSpid_desc("老年大学公开课" + "(目击者)");
+                        } else if ("8".equals(source1)) {
+                            videos.setSpid_desc("甲申同文" + "(目击者)");
+                        } else if ("9".equals(source1)) {
+                            videos.setSpid_desc("万人同唱一首歌" + "(目击者)");
+                        } else if ("10".equals(source1)) {
+                            videos.setSpid_desc("上太空" + "(目击者)");
+                        } else if ("11".equals(source1)) {
+                            videos.setSpid_desc("芳华归来个人" + "(目击者)");
+                        } else if ("12".equals(source1)) {
+                            videos.setSpid_desc("芳华归来团体" + "(目击者)");
+                        } else if ("13".equals(source1)) {
+                            videos.setSpid_desc("小小表演家" + "(目击者)");
+                        } else if ("100".equals(source1)) {
+                            videos.setSpid_desc("追问发布会" + "(目击者)");
                         } else {
                             videos.setSpid_desc(shySites.getName() + "(目击者)");
                         }
@@ -109,7 +109,7 @@ public class VideosServiceImpl {
         return shyVideosMapper.updateByPrimaryKey(shyVideos);
     }
-    public PageInfo<ShyVideos> getListContent(String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, Integer spid, String userId, String sp_Id,Integer source,String video_user_id,String shen_auditor_id,String video_id) {
+    public PageInfo<ShyVideos> getListContent(String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, Integer spid, String userId, String sp_Id,String source,String video_user_id,String shen_auditor_id,String video_id) {
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
@@ -157,9 +157,12 @@ public class VideosServiceImpl {
             }
         }
-        if (source!=null) {
+        if (CommonUtils.isNotEmpty(source) && !"moment".equals(source)) {
             criteria.andEqualTo("source", source);
             criteria2.andEqualTo("source", source);
+        } else if (CommonUtils.isNotEmpty(source) && "moment".equals(source)) {
+            criteria.andEqualTo("category", source);
+            criteria2.andEqualTo("category", source);
         }
         if (CommonUtils.isNotEmpty(video_user_id)) {
@@ -137,6 +137,7 @@
                                             <div class="col-sm-10" style="padding: 0;">
                                                 <select class="form-control" id="source" name="source">
                                                     <option value="">全部</option>
+                                                    <option value="moment">朋友圈</option>
                                                     <option value="0">上传目击者视频</option>
                                                     <option value="1">童声共济视频</option>
                                                     <option value="2">全民健身视频</option>