Merge branch 'dev'

周伟鹏
2 parents 9bf26a05 71f75bd5
Showing 3 changed files with 34 additions and 8 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/serviceImpl/SitesServiceImpl.java
src/main/resources/templates/page/video.html
@@ -112,13 +112,17 @@ public class VideosController {
      * @return
      */
     @GetMapping("/page")
-    public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Boolean receive, Integer page, Integer pageSize, String video_priority, String orderByClause, HttpSession session) {
+    public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Boolean receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer spid = sessionUser.getSpid();
         String userId = sessionUser.getUserId();
         if (CommonUtils.isNull(page)) page = 1;
         if (CommonUtils.isNull(pageSize)) pageSize = 10;
-        if (spid == 0) spid = null;
+        if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
+            spid = sitesService.findspidBySpdesc(sp_desc).getSpid();
+        } 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);
         List<ShyVideos> list = videoPage.getList();
         if (!list.isEmpty()) {
@@ -132,7 +136,7 @@ public class VideosController {
                         user = usersService.select(user);
                         if (CommonUtils.isNotNull(user)) {
                             String userName = CommonUtils.isEmpty(user.getUsername()) ? "" : user.getUsername();
-                            String email = CommonUtils.isEmpty(user.getEmail())||"null".equals(user.getEmail()) ? "" : user.getEmail();
+                            String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
                             auditor = userName + email;
                         }
                     }
@@ -318,7 +322,7 @@ public class VideosController {
                         user = usersService.select(user);
                         if (CommonUtils.isNotNull(user)) {
                             String userName = CommonUtils.isEmpty(user.getUsername()) ? "" : user.getUsername();
-                            String email = CommonUtils.isEmpty(user.getEmail())||"null".equals(user.getEmail()) ? "" : user.getEmail();
+                            String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
                             auditor = userName + email;
                         }
                     }
@@ -61,4 +61,13 @@ public class SitesServiceImpl {
         List<ShySites> shySites = shySitesMapper.selectByExample(example);
         return shySites.get(0);
     }
+
+    public ShySites findspidBySpdesc(String sp_desc) {
+        Example example = new Example(ShySites.class);
+        Example.Criteria criteria = example.createCriteria();
+        if (CommonUtils.isNotEmpty(sp_desc))
+            criteria.andEqualTo("name", sp_desc);
+        List<ShySites> shySites = shySitesMapper.selectByExample(example);
+        return shySites.get(0);
+    }
 }
@@ -84,8 +84,17 @@
                                         </div>
                                     </div>
                                 </div>
+                                <div th:if="${session.sessionUser.spid==0}" class="btn-group margin-bottom col-md-6"
+                                     style="padding: 0;width: 20%;">
+                                    <div class="col-md-5" style="padding: 0;width: 100%;margin-left: -148%;">
+                                        <label for="video_title" class="control-label cb-toolbar">sp简称:</label>
+                                        <div class="col-sm-9" style="padding: 0;">
+                                            <input class="form-control" type="text" value="" id="sp_desc">
+                                        </div>
+                                    </div>
+                                </div>
                                 <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 17%;">
-                                    <div class="col-md-5" style="padding: 0;width: 100%;">
+                                    <div class="col-md-5" style="padding: 0;width: 100%;margin-left: -118%;">
                                         <label for="video_title" class="control-label cb-toolbar">热点:</label>
                                         <div class="col-sm-9" style="padding: 0;">
                                             <select class="form-control" id="video_priority" name="video_priority">
@@ -133,7 +142,8 @@
  
                             <div class="fixed-table-container" style="padding-bottom: 0px;">
                                 <div class="fixed-table-body">
-                                    <table id="table" data-toggle="table" class="table table-hover table-striped" style="margin-bottom: 0; ">
+                                    <table id="table" data-toggle="table" class="table table-hover table-striped"
+                                           style="margin-bottom: 0; ">
                                         <thead>
                                         <tr>
                                             <th class="bs-checkbox " style="width: 5%; " data-field="state"
@@ -368,7 +378,8 @@
             var video_title = $("#video_titleID").val();
             var start_date = $("#start_date").val();
             var end_date = $("#end_date").val();
-            window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=&video_priority=" + video_priority;
+            var sp_desc = $("#sp_desc").val();
+            window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=&video_priority=" + video_priority + "&sp_desc=" + sp_desc;
         });
         /*全选的操作*/
         $('#select_all').click(function () {
@@ -459,6 +470,7 @@
                 }
             })
         }
+
         //拒绝(打回)
         function repulse() {
             var rows = $("[name=btSelectItem]:checkbox:checked");
@@ -471,6 +483,7 @@
                 alert("没有选中的数据！");
             }
         }
+
         //提交打回
         function repulseSubmit() {
             var rows = $("[name=btSelectItem]:checkbox:checked");
@@ -480,7 +493,7 @@
             })
             ids = ids.substring(1);
             var msg = $("#reviewMsg").val();
-            $.post("/videos/repulse?ids=" + ids+"&msg="+msg, function (data) {
+            $.post("/videos/repulse?ids=" + ids + "&msg=" + msg, function (data) {
                 if (data.errorCode == 0) {
                     alert(data.errorMessage);
                     location.href = location.href;