搜索优化

liwei2917
1 parent ec6893bd
Showing 6 changed files with 34 additions and 26 deletions
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/resources/templates/common/frame.html
src/main/resources/templates/page/comment.html
src/main/resources/templates/page/content.html
src/main/resources/templates/page/video.html
@@ -132,6 +132,9 @@ public class CommentsController {
                 }
             }
         }
+        /* 获取参数值给前台 用来判断是否需要把查看显示出来 state recive*/
+        String state1 = state == null ? "" : state.toString();
+        model.addAttribute("state1", state1);
         model.addAttribute("commentPage", commentPage);
         return "page/comment.html";
     }
@@ -158,10 +158,10 @@ public class VideosServiceImpl {
                 criteria2.andEqualTo("receive_user_id", userId);
             }
         }
-        if (CommonUtils.isNotNull(state) && state == 0) {
-            criteria.andEqualTo("state", state);
-        } else if (CommonUtils.isNotNull(state) && state == 1) {
+        if (CommonUtils.isNotNull(state) && state != 3) {
             criteria.andEqualTo("state", state);
+        } else if (CommonUtils.isNotNull(state) && state == 3) {
+            criteria.andEqualTo("state", 1);
             criteria2.andEqualTo("state", 2);
             example.or(criteria2);
         }
@@ -42,8 +42,8 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot; th:text=&quot;${session.sessionUser.
                             </p>
                         </li>
                         <li class="user-footer" >
-                        	<div class="pull-left">
-                                <a style="background:#3c8dbc" href="http://console.open.cnlive.com/open/console/admin/account_list?shenhe=1" target="black" class="btn btn-default btn-flat">账号管理</a>
+                        	<div class="pull-left" th:if="${session.sessionUser.spid==0 or session.sessionUser.master}">
+                                <a style="background:#3c8dbc" href="http://console.open.cnlive.com/open/console/user/info" target="black" class="btn btn-default btn-flat">账号管理</a>
                             </div>
                             <div class="pull-right">
                                 <a style="background:#3c8dbc" href="/users/logout" class="btn btn-default btn-flat">注销</a>
@@ -87,7 +87,7 @@
                             <div class="form-horizontal form-group-sm" id="forms" style="display: none;">
                                 <form id="commentForm">
-                                    <input class="hide" name="state" th:value="${param.state}"/>
+<!--                                     <input  th:value="${param.state}"/> -->
                                     <div class="btn-group margin-bottom col-md-6" style="padding: 0;">
                                         <div class="col-md-5" style="padding: 0">
                                             <label for="activity_id" class="control-label cb-toolbar">活动id:</label>
@@ -104,20 +104,21 @@
                                             </div>
                                         </div>
                                         <div class="col-md-3" style="padding: 0">
-                                            <label for="is_hot" class="control-label cb-toolbar">是否热点:</label>
+                                            <label for="state" class="control-label cb-toolbar">状态:</label>
                                             <div class="col-sm-6" style="padding: 0;">
-                                                <select class="form-control col-sm-2" id="is_hot" name="is_hot">
+                                                <select class="form-control col-sm-2" id="state" name="state">
                                                     <option value="">全部</option>
-                                                    <option value="2">是</option>
-                                                    <option value="1">否</option>
+	                                                <option value="0" th:selected="${state1 == '0'}">未审核</option>
+	                                                <option value="1" th:selected="${state1 == '1'}">已通过</option>
+	                                                <option value="2" th:selected="${state1 == '2'}">已拒绝</option>
                                                 </select>
                                             </div>
                                         </div>
                                         <script th:inline="javascript">
-                                            var isHot = [[${param.is_hot}]];
-                                            if (isHot != null && isHot[0] != "") {
-                                                $("#is_hot").val(isHot[0]);
-                                            }
+//                                             var isHot = [[${param.is_hot}]];
+//                                             if (isHot != null && isHot[0] != "") {
+//                                                 $("#is_hot").val(isHot[0]);
+//                                             }
                                         </script>
                                     </div>
@@ -467,6 +468,7 @@
         //已审、未审、全部，状态切换
         function searchStatus(commentStatus, receive) {
             var href = location.href;
+            if ($.trim($("#state").val()) != '') commentStatus =$("#state").val();
             if (sea == "") {//没有参数
                 if (href.endsWith("?")) href = href.substring(0, href.length - 1);
                 if ($.trim(commentStatus) != '') href = href + "?state=" + commentStatus;
@@ -26,7 +26,7 @@
                         <div class="box-body">
                             <div class="btn-group margin-bottom pull-left">
-                                <input type="hidden" name="state" id="state" value=""/>
+<!--                                 <input type="hidden" name="state" id="state" value=""/> -->
                                 <div class="btn-group margin-bottom" id="hide_select_area_2" style=>
                                     <button type="button" class="btn btn-success btn-sm margin-r-5 action claim"
                                             value="2" data="claim" id="claim" data-toggle="modal"
@@ -25,7 +25,7 @@
                         <div class="box-body">
                             <div class="btn-group margin-bottom pull-left">
-                                <input type="hidden" name="state" id="state" value=""/>
+<!--                                 <input type="hidden" name="state" id="state" value=""/> -->
                                 <div class="btn-group margin-bottom" id="hide_select_area_2" style=>
                                     <button type="button" class="btn btn-success btn-sm margin-r-5 action claim"
                                             value="2" data="claim" id="claim" data-toggle="modal"
@@ -87,12 +87,13 @@
                                 <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="video_priority" class="control-label cb-toolbar">热点:</label>
+                                        <label for="state" class="control-label cb-toolbar">状态:</label>
                                         <div class="col-sm-8" style="padding: 0;">
-                                            <select class="form-control" id="video_priority" name="video_priority">
+                                            <select class="form-control" id="state" name="state">
                                                 <option value="">全部</option>
-                                                <option value="1">是</option>
-                                                <option value="0">否</option>
+                                                <option value="0">未审核</option>
+                                                <option value="1">已通过</option>
+                                                <option value="2">已拒绝</option>
                                             </select>
                                             <!--<input class="form-control" name="video_priority" type="text" id="video_priority">-->
                                         </div>
@@ -366,12 +367,14 @@
             var end_date = "";
             var sp_desc ="";
             var count = "";
+            var state = "";
             function updateValue(){
-            	video_priority = $("#video_priority").val();
+//             	video_priority = $("#video_priority").val();
             	video_title = $("#video_titleID").val();
                 start_date = $("#start_date").val();
                 end_date = $("#end_date").val();
+                state = $("#state").val();
                 var spId=[[${session.sessionUser.spid}]];
                 if(spId==0){
                 sp_desc = $("#sp_desc").val();
@@ -383,35 +386,35 @@
         //全部
         function quanbu() {
         	updateValue();
-            window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date +  "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
+            window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date +  "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
         }
         //全部待领
         $('#daishen').click(function () {
         	updateValue();
-            var state = 0;
+        	if($.trim(state) == '') state=0;
             var receive = 0;
             window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
         });
         //我的待审核
         $('#Mydaishen').click(function () {
         	updateValue();
-            var state = 0;
             var receive = 1;
+            if($.trim(state) == '') state=0;
             window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
         });
         //我的已审核
         $('#yishen').click(function () {
         	updateValue();
-            var state = 1;
             var receive = 1;
+            if($.trim(state) == '') state=3;//审核状态，3代表通过和拒绝都查询
             window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
         });
         //查询
         $('#videos_query').click(function () {
-            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+"&pageSize="+count;
+            window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
         });
         /*全选的操作*/
         $('#select_all').click(function () {