update

徐近程
1 parent 80c395c7
Showing 3 changed files with 36 additions and 8 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
@@ -115,7 +115,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, 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,Integer source, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if (CommonUtils.isNull(sessionUser)) {
             return "redirect:/users/login";
@@ -136,7 +136,7 @@ public class VideosController extends BaseController {
         } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
             spid = null;
         }
-        PageInfo<ShyVideos> videoPage = videosService.getListContent(video_title, start_date, end_date, state, receive, page, pageSize, video_priority, orderByClause, spid, userId,sp_Id);
+        PageInfo<ShyVideos> videoPage = videosService.getListContent(video_title, start_date, end_date, state, receive, page, pageSize, video_priority, orderByClause, spid, userId,sp_Id,source);
         List<ShyVideos> list = videoPage.getList();
         if (!list.isEmpty()) {
             for (ShyVideos videos : list) {
@@ -160,14 +160,14 @@ public class VideosController extends BaseController {
                 if (CommonUtils.isNotNull(shySites)) {
                     if (CommonUtils.isNotEmpty(videos.getCategory()) && videos.getCategory().equals(CommonConst.CATEGORY_WITNESS)) {
                         //0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 4-美食中国 5-老年大学
-                        String source = videos.getSource();
-                        if ("1".equals(source)) {
+                        String source1 = videos.getSource();
+                        if ("1".equals(source1)) {
                             videos.setSpid_desc("童声共济" + "(目击者)");
-                        } else if ("2".equals(source)) {
+                        } else if ("2".equals(source1)) {
                             videos.setSpid_desc("全民健身" + "(目击者)");
-                        } else if ("4".equals(source)) {
+                        } else if ("4".equals(source1)) {
                             videos.setSpid_desc("美食中国" + "(目击者)");
-                        } else if ("5".equals(source)) {
+                        } else if ("5".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) {
+    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) {
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
@@ -142,6 +142,11 @@ public class VideosServiceImpl {
             criteria2.andEqualTo("video_priority", video_priority);
         }
+        if (CommonUtils.isNotEmpty(video_priority)) {
+            criteria.andEqualTo("source", source);
+            criteria2.andEqualTo("source", source);
+        }
+
         if (CommonUtils.isNotNull(spid)) {
             criteria.andEqualTo("spid", spid);
             criteria2.andEqualTo("spid", spid);
@@ -100,6 +100,29 @@
                                     </div>
                                 </div>
+                                <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 10%;float: left;">
+                                    <div class="col-md-5" style="padding: 0;width: 100%;">
+                                        <label for="state" class="control-label cb-toolbar">目击者分类:</label>
+                                        <div class="col-sm-8" style="padding: 0;">
+                                            <select class="form-control" id="source" name="source">
+                                                <option value="">全部</option>
+                                                <option value="0">上传目击者视频</option>
+                                                <option value="1">童声共济视频</option>
+                                                <option value="2">全民健身视频</option>
+                                                <option value="3">问政监管视频</option>
+                                                <option value="4">中国网老年大学视频</option>
+                                                <option value="5">美食中国视频</option>
+                                                <option value="6">旅游摄影大赛视频</option>
+                                                <option value="7">全国老年大学公开课评选活动</option>
+                                                <option value="8">甲申同文</option>
+                                                <option value="9">中国老年大学艺术团万人同唱一首歌</option>
+                                                <option value="10">孩子声音上太空视频</option>
+                                            </select>
+                                            <!--<input class="form-control" name="video_priority" type="text" id="video_priority">-->
+                                        </div>
+                                    </div>
+                                </div>
+
                                 <div class="btn-group margin-bottom col-md-6 pull-right"
                                      style="position: relative;width: 75%;float: left !important;">
                                     <div class="col-md-18" style="width: 100%;padding: 0;">