修复评论、SP白名单模块并测试

王言钊
1 parent a5e061f5
Showing 5 changed files with 200 additions and 180 deletions
src/main/java/com/cnlive/shenhe/dto/CommentsDTO.java
src/main/java/com/cnlive/shenhe/dto/SitesDTO.java
src/main/resources/templates/common/frame.html
src/main/resources/templates/page/comment.html
src/main/resources/templates/page/site.html
@@ -41,7 +41,7 @@ public class CommentsDTO extends ShyComments implements Serializable {
     }
     public Integer getPage() {
-        return page == null ? 1 : page;
+        return page;
     }
     public void setPage(Integer page) {
@@ -49,7 +49,7 @@ public class CommentsDTO extends ShyComments implements Serializable {
     }
     public Integer getPageSize() {
-        return pageSize == null ? 10 : pageSize;
+        return pageSize;
     }
     public void setPageSize(Integer pageSize) {
@@ -44,7 +44,7 @@ public class SitesDTO extends ShySites implements Serializable {
     }
     public Integer getPage() {
-        return page == null ? 1 : page;
+        return page;
     }
     public void setPage(Integer page) {
@@ -52,7 +52,7 @@ public class SitesDTO extends ShySites implements Serializable {
     }
     public Integer getPageSize() {
-        return pageSize == null ? 10 : pageSize;
+        return pageSize;
     }
     public void setPageSize(Integer pageSize) {
@@ -81,7 +81,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
                     <li class="active"><a href="/videos/page?state=0&receive=0" id="/videos/page">点播审核</a></li>
                     <li><a href="/audio/page?state=0&receive=0&page=1&pageSize=10" id="/audio/page"> 音频审核</a></li>
                     <li><a href="/live/page?shenhe_state=0" id="/live/page"> 直播审核</a></li>
-                    <li><a href="/comments/page?state=0&receive=0" id="/comments/page"> 评论审核</a></li>
+                    <li><a href="/comments/page?state=0&receive=0&page=1&pageSize=10" id="/comments/page"> 评论审核</a></li>
                     <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li>
                     <li><a href="/topic/page?shenhe_status=0&receive=0" id="/topic/page"> 话题审核</a></li>
                     <li><a href="/channel/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/channel/page"> 频道审核</a></li>
@@ -94,7 +94,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
                 </a>
                 <ul class="treeview-menu">
                     <li><a href="/users/page" id="/users/page"> 审核云用户管理</a></li>
-                    <li><a href="/sites/page" id="/sites/page"> SP白名单管理</a></li>
+                    <li><a href="/sites/page?page=1&pageSize=10" id="/sites/page"> SP白名单管理</a></li>
                     <li><a href="/email/page" id="/email/page"> 邮件消息管理</a></li>
                     <li><a href="/usersFree/page" id="/usersFree/page"> 网++白名单管理</a></li>
                     <li><a href="/notSpeak/page" id="/notSpeak/page"> 网++禁言管理</a></li>
@@ -568,7 +568,7 @@
                     if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/comments/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/comments/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
             } else {
                 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                 var split = se.split("&");
@@ -578,7 +578,7 @@
                     if (s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/comments/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/comments/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
             }
         }
@@ -620,7 +620,7 @@
             type = $("#topic").val();
             comment_user_id = $("#comment_user_id").val();
             var expand_list_state = $("#forms").attr("expand_list_state");
-            window.location.href = "/comments/page?activity_id=" + activity_id + "&start_date=" + start_date + "&end_date=" + end_date + "&content=" + content + "&pageSize=" + count + "&state=" + state + "&receive=" + receive + "&type=" + type + "&comment_user_id=" + comment_user_id + "&expand_list_state=" + expand_list_state;
+            window.location.href = "/comments/page?activity_id=" + activity_id + "&start_date=" + start_date + "&end_date=" + end_date + "&content=" + content + "&page=" + 1 + "&pageSize=" + count + "&state=" + state + "&receive=" + receive + "&type=" + type + "&comment_user_id=" + comment_user_id + "&expand_list_state=" + expand_list_state;
         }
         //全部
@@ -3,8 +3,13 @@
 <head th:replace="../templates/common/head::head"></head>
 <style>
-    .fixed-table-toolbar .bs-bars, .fixed-table-toolbar .columns, .fixed-table-toolbar .search{margin-top: 0px;}
-    .table{margin-bottom:0;}
+    .fixed-table-toolbar .bs-bars, .fixed-table-toolbar .columns, .fixed-table-toolbar .search {
+        margin-top: 0px;
+    }
+
+    .table {
+        margin-bottom: 0;
+    }
 </style>
 <body class="skin-blue sidebar-mini">
@@ -36,107 +41,120 @@
                                         </div>
                                     </div>
                                     <div class="columns columns-right btn-group pull-right">
-                                        <button class="btn btn-default" type="button" name="refresh" title="搜索" id="site_query">搜索</button>
-                                            <ul class="dropdown-menu" role="menu">
-                                                <li><label><input type="checkbox" data-field="sp_id" value="0"
-                                                                  checked="checked"> spID</label></li>
-                                                <li><label><input type="checkbox" data-field="sp_id_brief" value="1"
-                                                                  checked="checked"> sp简称</label></li>
-                                                <li><label><input type="checkbox" data-field="type" value="2"
-                                                                  checked="checked"> 免审业务
-                                                </label></li>
-                                                <li><label><input type="checkbox" data-field="service_time" value="3"
-                                                                  checked="checked"> 免审业务更新时间</label></li>
-                                                <li><label><input type="checkbox" data-field="upload_time" value="4"
-                                                                  checked="checked"> sp信息创建时间
-                                                </label></li>
-                                                <li><label><input type="checkbox" data-field="updated_at" value="5"
-                                                                  checked="checked"> sp信息更新时间</label></li>
-                                                <li><label><input type="checkbox" data-field="action" value="6"
-                                                                  checked="checked"> 操作
-                                                </label></li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="pull-right search">
-                                        <form id="searchForm">
-                                            <input class="form-control" type="text"  placeholder="搜索" id="keyword" name="keyword" th:value="${param.keyword}">
-                                        </form>
+                                        <button class="btn btn-default" type="button" name="refresh" title="搜索"
+                                                id="site_query">搜索
+                                        </button>
+                                        <ul class="dropdown-menu" role="menu">
+                                            <li><label><input type="checkbox" data-field="sp_id" value="0"
+                                                              checked="checked"> spID</label></li>
+                                            <li><label><input type="checkbox" data-field="sp_id_brief" value="1"
+                                                              checked="checked"> sp简称</label></li>
+                                            <li><label><input type="checkbox" data-field="type" value="2"
+                                                              checked="checked"> 免审业务
+                                            </label></li>
+                                            <li><label><input type="checkbox" data-field="service_time" value="3"
+                                                              checked="checked"> 免审业务更新时间</label></li>
+                                            <li><label><input type="checkbox" data-field="upload_time" value="4"
+                                                              checked="checked"> sp信息创建时间
+                                            </label></li>
+                                            <li><label><input type="checkbox" data-field="updated_at" value="5"
+                                                              checked="checked"> sp信息更新时间</label></li>
+                                            <li><label><input type="checkbox" data-field="action" value="6"
+                                                              checked="checked"> 操作
+                                            </label></li>
+                                        </ul>
                                     </div>
                                 </div>
-                                <div class="fixed-table-container" style="padding-bottom: 0px;">
-                                    <div class="fixed-table-body">
-                                        <table data-toggle="table" data-pagination="true"
-                                               data-search="false" data-show-refresh="true" data-show-toggle="true"
-                                               data-show-columns="true" data-toolbar="#toolbar"
-                                               class="table table-hover">
-                                            <thead>
-                                            <tr>
-                                                <th style="text-align: center; width: 50px; " data-field="sp_id"
-                                                    tabindex="0">
-                                                    <div class="th-inner ">spID</div>
-                                                    <div class="fht-cell"></div>
-                                                </th>
-                                                <th style="text-align: center; width: 120px; " data-field="sp_id_brief"
-                                                    tabindex="0">
-                                                    <div class="th-inner ">sp简称</div>
-                                                    <div class="fht-cell"></div>
-                                                </th>
-                                                <th style="text-align: center; width: 200px; " data-field="type"
-                                                    tabindex="0">
-                                                    <div class="th-inner ">免审业务
-                                                    </div>
-                                                    <div class="fht-cell"></div>
-                                                </th>
-                                                <th style="text-align: center; width: 120px; " data-field="upload_time"
-                                                    tabindex="0">
-                                                    <div class="th-inner ">sp信息创建时间
-                                                    </div>
-                                                    <div class="fht-cell"></div>
-                                                </th>
-                                                <th style="text-align: center; width: 120px; " data-field="updated_at"
-                                                    tabindex="0">
-                                                    <div class="th-inner ">sp信息更新时间</div>
-                                                    <div class="fht-cell"></div>
-                                                </th>
-                                                <th style="text-align: center; width: 100px; " data-field="action"
-                                                    tabindex="0">
-                                                    <div class="th-inner ">操作
-                                                    </div>
-                                                    <div class="fht-cell"></div>
-                                                </th>
-                                            </tr>
-                                            </thead>
-                                            <tbody>
-                                                <tr th:data-index="${siteStat.index}" th:each="site : ${sitePage.list}">
-                                                    <td style="text-align: center; width: 50px;" th:text="${site.spid}">82</td>
-                                                    <td style="text-align: center; width: 120px;" th:text="${site.name}">视讯中国</td>
-                                                    <td style="text-align: center; width: 200px;" th:text="${site.write_business_name}">点播审核</td>
-                                                    <td style="text-align: center; width: 120px;" th:text="${#dates.format(site.created_at, 'yyyy-MM-dd HH:mm:ss')}">2018-11-22 23:08:48</td>
-                                                    <td style="text-align: center; width: 120px;" th:text="${#dates.format(site.updated_at, 'yyyy-MM-dd HH:mm:ss')}">2016-08-03 14:27:17</td>
-                                                    <td style="text-align: center; width: 100px;"><span>&nbsp;</span><a
-                                                            class="edit" th:href="'javascript:edit('+${site.id}+',\''+${site.name}+'\',\''+${site.write_business} +'\')'">
-                                                        <button class="btn btn-primary btn-xs">设置</button>
-                                                    </a><span> </span><span>&nbsp;</span></td>
-                                                </tr>
+                                <div class="pull-right search">
+                                    <form id="searchForm">
+                                        <input class="form-control" type="text" placeholder="搜索" id="keyword"
+                                               name="keyword" th:value="${param.keyword}">
+                                    </form>
+                                </div>
+                            </div>
+                            <div class="fixed-table-container" style="padding-bottom: 0px;">
+                                <div class="fixed-table-body">
+                                    <table data-toggle="table" data-pagination="true"
+                                           data-search="false" data-show-refresh="true" data-show-toggle="true"
+                                           data-show-columns="true" data-toolbar="#toolbar"
+                                           class="table table-hover">
+                                        <thead>
+                                        <tr>
+                                            <th style="text-align: center; width: 50px; " data-field="sp_id"
+                                                tabindex="0">
+                                                <div class="th-inner ">spID</div>
+                                                <div class="fht-cell"></div>
+                                            </th>
+                                            <th style="text-align: center; width: 120px; " data-field="sp_id_brief"
+                                                tabindex="0">
+                                                <div class="th-inner ">sp简称</div>
+                                                <div class="fht-cell"></div>
+                                            </th>
+                                            <th style="text-align: center; width: 200px; " data-field="type"
+                                                tabindex="0">
+                                                <div class="th-inner ">免审业务
+                                                </div>
+                                                <div class="fht-cell"></div>
+                                            </th>
+                                            <th style="text-align: center; width: 120px; " data-field="upload_time"
+                                                tabindex="0">
+                                                <div class="th-inner ">sp信息创建时间
+                                                </div>
+                                                <div class="fht-cell"></div>
+                                            </th>
+                                            <th style="text-align: center; width: 120px; " data-field="updated_at"
+                                                tabindex="0">
+                                                <div class="th-inner ">sp信息更新时间</div>
+                                                <div class="fht-cell"></div>
+                                            </th>
+                                            <th style="text-align: center; width: 100px; " data-field="action"
+                                                tabindex="0">
+                                                <div class="th-inner ">操作
+                                                </div>
+                                                <div class="fht-cell"></div>
+                                            </th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <tr th:data-index="${siteStat.index}" th:each="site : ${sitePage.list}">
+                                            <td style="text-align: center; width: 50px;" th:text="${site.spid}">82</td>
+                                            <td style="text-align: center; width: 120px;" th:text="${site.name}">视讯中国
+                                            </td>
+                                            <td style="text-align: center; width: 200px;"
+                                                th:text="${site.write_business_name}">点播审核
+                                            </td>
+                                            <td style="text-align: center; width: 120px;"
+                                                th:text="${#dates.format(site.created_at, 'yyyy-MM-dd HH:mm:ss')}">
+                                                2018-11-22 23:08:48
+                                            </td>
+                                            <td style="text-align: center; width: 120px;"
+                                                th:text="${#dates.format(site.updated_at, 'yyyy-MM-dd HH:mm:ss')}">
+                                                2016-08-03 14:27:17
+                                            </td>
+                                            <td style="text-align: center; width: 100px;"><span>&nbsp;</span><a
+                                                    class="edit"
+                                                    th:href="'javascript:edit('+${site.id}+',\''+${site.name}+'\',\''+${site.write_business} +'\')'">
+                                                <button class="btn btn-primary btn-xs">设置</button>
+                                            </a><span> </span><span>&nbsp;</span></td>
+                                        </tr>
-                                            </tbody>
-                                        </table>
-                                    </div>
+                                        </tbody>
+                                    </table>
+                                </div>
-                                    <div class="fixed-table-pagination" style="display: block;">
-                                        <div class="pull-left pagination-detail">
-                                       	 <span class="pagination-info" th:text="'共 '+${sitePage.total}+' 条记录，每页显示'">共 0 条记录</span>
+                                <div class="fixed-table-pagination" style="display: block;">
+                                    <div class="pull-left pagination-detail">
+                                        <span class="pagination-info" th:text="'共 '+${sitePage.total}+' 条记录，每页显示'">共 0 条记录</span>
                                         <select class="" id="pageSize" name="pageSize" onchange="selectPageSize()">
-                                          <option value="10" th:selected="${pageSize==10}">10</option>
-                                          <option value="20" th:selected="${pageSize==20}">20</option>
-                                          <option value="50" th:selected="${pageSize==50}">50</option>
-                                          <option value="100" th:selected="${pageSize==100}">100</option>
+                                            <option value="10" th:selected="${pageSize==10}">10</option>
+                                            <option value="20" th:selected="${pageSize==20}">20</option>
+                                            <option value="50" th:selected="${pageSize==50}">50</option>
+                                            <option value="100" th:selected="${pageSize==100}">100</option>
                                         </select>
-                                        <span class="pagination-info" >条记录</span>
-                                        </div>
-                                        <div class="pull-right pagination">
-                                              <ul class="pagination" th:if="${sitePage.pages>1}">
+                                        <span class="pagination-info">条记录</span>
+                                    </div>
+                                    <div class="pull-right pagination">
+                                        <ul class="pagination" th:if="${sitePage.pages>1}">
                                             <li class="page-pre"><a th:href="'javascript:fanye(1);'">‹‹</a></li>
                                             <li class="page-pre" th:if="${!sitePage.isFirstPage}"><a
                                                     th:onclick="'javascript:fanye(\''+${sitePage.pageNum-1}+'\');'">‹</a>
@@ -170,17 +188,17 @@
                                                     th:onclick="'javascript:fanye(\''+${sitePage.pages}+'\');'">››</a>
                                             </li>
                                         </ul>
-                                        </div>
                                     </div>
                                 </div>
                             </div>
-                            <div class="clearfix"></div>
                         </div>
+                        <div class="clearfix"></div>
                     </div>
                 </div>
             </div>
-        </section>
     </div>
+    </section>
+</div>
 <!-- 模态框（Modal） -->
 <div class="modal fade" id="editModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -206,7 +224,8 @@
                         <div class="col-sm-10" style="float: left">
                             <div th:each="bu:${business}" style="padding-right: 30px;" class="write_check">
                                 <span th:text="${bu.value}" style="font-size: 15px"></span>
-                                <input type="checkbox" name="write_business" th:value="${bu.key}" th:id="'write_check_'+${bu.key}">
+                                <input type="checkbox" name="write_business" th:value="${bu.key}"
+                                       th:id="'write_check_'+${bu.key}">
                             </div>
                         </div>
                     </form>
@@ -215,89 +234,90 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" onclick="javascript:$('#editWrite').submit();">提交更改</button>
+                <button type="button" class="btn btn-primary" onclick="javascript:$('#editWrite').submit();">提交更改
+                </button>
             </div>
         </div><!-- /.modal-content -->
     </div><!-- /.modal-dialog -->
 </div>
 <!-- /.modal -->
-    <script>
-        //设置白名单，打开编辑窗口
-        function edit(id,company,write_business){
-            $("#edit_company").text(company);
-            $("#edit_id").val(id);
-            $("#redirect_url").val(location.pathname+location.search);
-            $(".write_check input").prop("checked",false);
-             if($.trim(write_business)!=''){
-                 var array =  write_business.split(",")
-                 for (var i=0;i<array.length;i++){
-                     $("#write_check_"+array[i]).prop("checked",true);
-                 }
-             }
-            $('#editModal').modal('show');
+<script>
+    //设置白名单，打开编辑窗口
+    function edit(id, company, write_business) {
+        $("#edit_company").text(company);
+        $("#edit_id").val(id);
+        $("#redirect_url").val(location.pathname + location.search);
+        $(".write_check input").prop("checked", false);
+        if ($.trim(write_business) != '') {
+            var array = write_business.split(",")
+            for (var i = 0; i < array.length; i++) {
+                $("#write_check_" + array[i]).prop("checked", true);
+            }
         }
-        
-        //翻页函数
-        function fanye(page) {
-            var param = location.search;
-            if (param.indexOf("page=") != -1) {
-            	var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
-                var split = se.split("&");
-                var h = "";
-                for (var i = 0; i < split.length; i++) {
-                    var s = split[i];
-                    if (s.indexOf("page=") < 0) h = h + "&" + split[i];
-                }
-                h = h.substring(1, h.length);
-                window.location.href = "/sites/page?" + h + "&page=" + page;
-            } else {
-                param = param.substring(1, param.length);
-                window.location.href = "/sites/page?" + param + "&page=" + page;
+        $('#editModal').modal('show');
+    }
+
+    //翻页函数
+    function fanye(page) {
+        var param = location.search;
+        if (param.indexOf("page=") != -1) {
+            var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
+            var split = se.split("&");
+            var h = "";
+            for (var i = 0; i < split.length; i++) {
+                var s = split[i];
+                if (s.indexOf("page=") < 0) h = h + "&" + split[i];
             }
+            h = h.substring(1, h.length);
+            window.location.href = "/sites/page?" + h + "&page=" + page;
+        } else {
+            param = param.substring(1, param.length);
+            window.location.href = "/sites/page?" + param + "&page=" + page;
         }
-        
-        //选择每页数量触发函数
-        function selectPageSize(){
-        	var pageSize=$("#pageSize").val();
-        	 var param = location.search;
-             if (param.indexOf("pageSize=") != -1) {
-             	var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
-                 var split = se.split("&");
-                 var h = "";
-                 for (var i = 0; i < split.length; i++) {
-                     var s = split[i];
-                     if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
-                 }
-                 h = h.substring(1, h.length);
-                 window.location.href = "/sites/page?" + h + "&pageSize=" + pageSize;
-             } else {
-            	 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
-                 var split = se.split("&");
-                 var h = "";
-                 for (var i = 0; i < split.length; i++) {
-                     var s = split[i];
-                     if (s.indexOf("page=") < 0) h = h + "&" + split[i];
-                 }
-                 h = h.substring(1, h.length);
-                 window.location.href = "/sites/page?" + h + "&pageSize=" + pageSize;
-             }
+    }
+
+    //选择每页数量触发函数
+    function selectPageSize() {
+        var pageSize = $("#pageSize").val();
+        var param = location.search;
+        if (param.indexOf("pageSize=") != -1) {
+            var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
+            var split = se.split("&");
+            var h = "";
+            for (var i = 0; i < split.length; i++) {
+                var s = split[i];
+                if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
+            }
+            h = h.substring(1, h.length);
+            window.location.href = "/sites/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
+        } else {
+            var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
+            var split = se.split("&");
+            var h = "";
+            for (var i = 0; i < split.length; i++) {
+                var s = split[i];
+                if (s.indexOf("page=") < 0) h = h + "&" + split[i];
+            }
+            h = h.substring(1, h.length);
+            window.location.href = "/sites/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
         }
-        
-        //搜索
-        $('#site_query').click(function () {
-        	var keyword = $("#keyword").val();
-        	var pageSize = $("#pageSize").val();
-        	window.location.href = "/sites/page?keyword=" + keyword + "&pageSize=" + pageSize;
-		});
+    }
-    </script>
+    //搜索
+    $('#site_query').click(function () {
+        var keyword = $("#keyword").val();
+        var pageSize = $("#pageSize").val();
+        window.location.href = "/sites/page?keyword=" + keyword + "&page=" + 1 + "&pageSize=" + pageSize;
+    });
+
+</script>
-    <footer th:replace="../templates/common/foot::foot" ></footer>
+<footer th:replace="../templates/common/foot::foot"></footer>
-    <!-- Add the sidebar's background. This div must be placed
-         immediately after the control sidebar -->
-    <div class="control-sidebar-bg" style="position: fixed; height: auto;"></div>
+<!-- Add the sidebar's background. This div must be placed
+     immediately after the control sidebar -->
+<div class="control-sidebar-bg" style="position: fixed; height: auto;"></div>
 </div><!-- ./wrapper -->