Merge branch 'test' into dev

王言钊
2 parents 28a09ebe a5e061f5
Showing 10 changed files with 54 additions and 41 deletions
src/main/java/com/cnlive/shenhe/FinalShell.java
src/main/java/com/cnlive/shenhe/dto/AudioDTO.java
src/main/java/com/cnlive/shenhe/dto/ChannelDTO.java
src/main/java/com/cnlive/shenhe/dto/ShyActivityDTO.java
src/main/java/com/cnlive/shenhe/dto/ShyLogDTO.java
src/main/resources/templates/common/frame.html
src/main/resources/templates/page/activity.html
src/main/resources/templates/page/audio.html
src/main/resources/templates/page/channel.html
src/main/resources/templates/page/log.html
@@ -7,6 +7,13 @@ import java.util.Scanner;
 public class FinalShell {
     public static void main(String[] args) throws NoSuchAlgorithmException, IOException {
+        //int[] array = {2, 0, 6, 7, 3, 8, 1};
+        //int[] index = {6, 4, 0, 3, 6, 1, 3, 5, 3, 1, 0};
+        //StringBuilder tel = new StringBuilder();
+        //for (int i : index) {
+        //    tel.append(array[i]);
+        //}
+        //System.out.println("tel&&wx:" + tel);
         System.out.print("请输入FinalShell的离线机器码：");
         Scanner reader = new Scanner(System.in);
         String machineCode = reader.nextLine();
@@ -65,7 +65,7 @@ public class AudioDTO extends ShyAudio implements Serializable {
     }
     public Integer getPage() {
-        return page == null ? 1 : page;
+        return page;
     }
     public void setPage(Integer page) {
@@ -73,7 +73,7 @@ public class AudioDTO extends ShyAudio implements Serializable {
     }
     public Integer getPageSize() {
-        return pageSize == null ? 10 : pageSize;
+        return pageSize;
     }
     public void setPageSize(Integer pageSize) {
@@ -35,7 +35,7 @@ public class ChannelDTO extends ShyChannel implements Serializable {
     }
     public Integer getPage() {
-        return page == null ? 1 : page;
+        return page;
     }
     public void setPage(Integer page) {
@@ -43,7 +43,7 @@ public class ChannelDTO extends ShyChannel implements Serializable {
     }
     public Integer getPageSize() {
-        return pageSize == null ? 10 : pageSize;
+        return pageSize;
     }
     public void setPageSize(Integer pageSize) {
@@ -14,7 +14,7 @@ public class ShyActivityDTO extends ShyActivity implements Serializable {
     private Integer pageNum;
-    private Integer pageSize ;
+    private Integer pageSize;
     public ShyActivityDTO(Integer pageNum, Integer pageSize) {
@@ -26,7 +26,7 @@ public class ShyActivityDTO extends ShyActivity implements Serializable {
     }
     public Integer getPageNum() {
-        return pageNum == null ? 1 : pageNum;
+        return pageNum;
     }
     public void setPageNum(Integer pageNum) {
@@ -34,7 +34,7 @@ public class ShyActivityDTO extends ShyActivity implements Serializable {
     }
     public Integer getPageSize() {
-        return pageSize == null ? 10 : pageSize;
+        return pageSize;
     }
     public void setPageSize(Integer pageSize) {
@@ -13,13 +13,13 @@ public class ShyLogDTO extends ShyLog implements Serializable {
     private Integer pageNum;
-    private Integer pageSize ;
+    private Integer pageSize;
     public ShyLogDTO() {
     }
     public Integer getPageNum() {
-        return pageNum == null ? 1 : pageNum;
+        return pageNum;
     }
     public void setPageNum(Integer pageNum) {
@@ -27,14 +27,14 @@ public class ShyLogDTO extends ShyLog implements Serializable {
     }
     public Integer getPageSize() {
-        return pageSize == null ? 10 : pageSize;
+        return pageSize;
     }
     public void setPageSize(Integer pageSize) {
         this.pageSize = pageSize;
     }
-    public ShyLogDTO(Integer page, Integer pageSize) {
+    public ShyLogDTO(Integer pageNum, Integer pageSize) {
         this.pageNum = pageNum;
         this.pageSize = pageSize;
     }
@@ -42,7 +42,7 @@ public class ShyLogDTO extends ShyLog implements Serializable {
     @Override
     public String toString() {
         return "ShyLogDTO{" +
-                "page=" + pageNum +
+                "pageNum=" + pageNum +
                 ", pageSize=" + pageSize +
                 "} " + super.toString();
     }
@@ -79,12 +79,12 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
                 </a>
                 <ul class="treeview-menu">
                     <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" id="/audio/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="/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" id="/channel/page"> 频道审核</a></li>
+                    <li><a href="/channel/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/channel/page"> 频道审核</a></li>
                     <li><a href="/liveApply/page?shenhe_state=0&receive=0" id="/liveApply/page">直播申请审核</a></li>
                 </ul>
             </li>
@@ -98,8 +98,8 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
                     <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>
-                    <li><a href="/activity/page" id="/activity/page"> 活动管理</a></li>
-                    <li><a href="/log/page" id="/log/page"> 日志管理</a></li>
+                    <li><a href="/activity/page?pageNum=1&pageSize=10" id="/activity/page"> 活动管理</a></li>
+                    <li><a href="/log/page?pageNum=1&pageSize=10" id="/log/page"> 日志管理</a></li>
                 </ul>
             </li>
         </ul>
@@ -223,7 +223,8 @@
                                             <option value="10" th:selected="${ShyActivitylist.pageSize==10}">10</option>
                                             <option value="20" th:selected="${ShyActivitylist.pageSize==20}">20</option>
                                             <option value="50" th:selected="${ShyActivitylist.pageSize==50}">50</option>
-                                            <option value="100" th:selected="${ShyActivitylist.pageSize==100}">100</option>
+                                            <option value="100" th:selected="${ShyActivitylist.pageSize==100}">100
+                                            </option>
                                         </select> <span class="pagination-info">条记录</span>
                                     </div>
                                     <div class="pull-right pagination">
@@ -309,9 +310,9 @@
                                 <select class="" id="exempt_from_trial" name="exempt_from_trial">
                                     <option value="" name="-选择审核类型-">-选择审核类型-</option>
-                                    <option value="1" name="非免审">免审</option>
-                                    <option value="2" name="免审">机审</option>
-                                    <option value="3" name="免审">人工审</option>
+                                    <option value="1" name="免审">免审</option>
+                                    <option value="2" name="机审">机审</option>
+                                    <option value="3" name="人工审">人工审</option>
                                 </select>
                             </div>
                         </div>
@@ -470,7 +471,7 @@
                     if (s.indexOf("pageSize=") < 0 && s.indexOf("pageNum=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/activity/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/activity/page?" + h + "&pageNum=" + 1 + "&pageSize=" + pageSize;
             } else {
                 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                 var split = se.split("&");
@@ -480,7 +481,7 @@
                     if (s.indexOf("pageNum=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/activity/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/activity/page?" + h + "&pageNum=" + 1 + "&pageSize=" + pageSize;
             }
         }
@@ -492,7 +493,7 @@
             var exempt_from_trial = $("#exempt_from_trial_query").val();
             // exempt_from_trial.selected = true;
             var pageSize = $("#pageSize").val();
-            window.location.href = "/activity/page?activity=" + activity + "&exempt_from_trial=" + exempt_from_trial + "&pageSize=" + pageSize;
+            window.location.href = "/activity/page?activity=" + activity + "&exempt_from_trial=" + exempt_from_trial + "&pageNum=" + 1 + "&pageSize=" + pageSize;
         });
         //鼠标回车事件
@@ -81,7 +81,8 @@
                                     <div class="col-md-5" style="padding: 0;width: 100%;">
                                         <label for="video_titleID" class="control-label cb-toolbar">标题:</label>
                                         <div class="col-sm-9" style="padding: 0;">
-                                            <input class="form-control" type="text" th:value="${AudioTitle}" value="" id="video_titleID">
+                                            <input class="form-control" type="text" th:value="${AudioTitle}" value=""
+                                                   id="video_titleID">
                                         </div>
                                     </div>
                                 </div>
@@ -108,7 +109,8 @@
                                         <div class="col-md-10" style="padding: 0;width: 25%;">
                                             <label for="start_date" class="control-label cb-toolbar">时间:</label>
                                             <div class="input-group col-md-9 date">
-                                                <input class="form-control date" name="start_date" type="text" th:value="${Start_date}"
+                                                <input class="form-control date" name="start_date" type="text"
+                                                       th:value="${Start_date}"
                                                        id="start_date">
                                                 <span class="input-group-addon">
                                                 <span class="glyphicon glyphicon-calendar"></span>
@@ -118,7 +120,8 @@
                                         <div class="col-md-10" style="padding: 0;width: 25%;">
                                             <label for="start_date" class="control-label cb-toolbar">至</label>
                                             <div class="input-group col-md-9 date">
-                                                <input class="form-control date" name="end_date" type="text" th:value="${End_date}"
+                                                <input class="form-control date" name="end_date" type="text"
+                                                       th:value="${End_date}"
                                                        id="end_date">
                                                 <span class="input-group-addon">
                                                 <span class="glyphicon glyphicon-calendar"></span>
@@ -130,7 +133,8 @@
                                              th:if="${session.sessionUser.spid==0}">
                                             <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
                                             <div class="col-sm-9" style="padding: 0;">
-                                                <input class="form-control" type="text" th:value="${Sp_desc}" value="" id="sp_desc">
+                                                <input class="form-control" type="text" th:value="${Sp_desc}" value=""
+                                                       id="sp_desc">
                                             </div>
                                         </div>
@@ -138,7 +142,8 @@
                                              th:if="${session.sessionUser.spid==0}">
                                             <label for="sp_Id" class="control-label cb-toolbar">sp_Id</label>
                                             <div class="col-sm-9" style="padding: 0;">
-                                                <input class="form-control" type="text" th:value="${Sp_id}" value="" id="sp_Id">
+                                                <input class="form-control" type="text" th:value="${Sp_id}" value=""
+                                                       id="sp_Id">
                                             </div>
                                         </div>
                                         <!--                                           <div class="col-md-6" style="padding: 0;width: 15%;" th:if="${session.sessionUser.spid==0}"> -->
@@ -399,7 +404,7 @@
                     if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/audio/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/audio/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
             } else {
                 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                 var split = se.split("&");
@@ -409,7 +414,7 @@
                     if (s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/audio/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/audio/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
             }
         }
@@ -448,7 +453,7 @@
         function quanbu() {
             updateValue();
             var expand_list_state = $("#forms").attr("expand_list_state");
-            window.location.href = "/audio/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 + "&sp_Id=" + sp_Id + "&expand_list_state=" + expand_list_state;
+            window.location.href = "/audio/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&expand_list_state=" + expand_list_state;
         }
         //全部待领
@@ -456,27 +461,27 @@
             updateValue();
             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 + "&sp_Id=" + sp_Id;
+            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 + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id;
         });
         //我的待审核
         $('#Mydaishen').click(function () {
             updateValue();
             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 + "&sp_Id=" + sp_Id;
+            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 + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id;
         });
         //我的已审核
         $('#yishen').click(function () {
             updateValue();
             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 + "&sp_Id=" + sp_Id;
+            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 + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id;
         });
         //查询
         $('#videos_query').click(function () {
-            window.location.href = "/audio/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 + "&sp_Id=" + sp_Id;
+            window.location.href = "/audio/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id;
         });
         /*全选的操作*/
         $('#select_all').click(function () {
@@ -439,7 +439,7 @@
                     if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/channel/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/channel/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
             } else {
                 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                 var split = se.split("&");
@@ -449,7 +449,7 @@
                     if (s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/channel/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/channel/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
             }
         }
@@ -487,7 +487,7 @@
             end_date = $("#end_date").val();
             count = $("#pageSize").val();
             var expand_list_state = $("#forms").attr("expand_list_state");
-            window.location.href = "/channel/page?channel_id=" + channel_id + "&start_date=" + start_date + "&end_date=" + end_date + "&channel_name=" + channel_name + "&pageSize=" + count + "&shenhe_status=" + shenhe_status + "&receive=" + receive + "&expand_list_state=" + expand_list_state;
+            window.location.href = "/channel/page?channel_id=" + channel_id + "&start_date=" + start_date + "&end_date=" + end_date + "&channel_name=" + channel_name + "&page=" + 1 + "&pageSize=" + count + "&shenhe_status=" + shenhe_status + "&receive=" + receive + "&expand_list_state=" + expand_list_state;
         }
         //全部
@@ -210,7 +210,7 @@
                      if (s.indexOf("pageSize=") < 0 &&s.indexOf("pageNum=") < 0) h = h + "&" + split[i];
                  }
                  h = h.substring(1, h.length);
-                 window.location.href = "/log/page?" + h + "&pageSize=" + pageSize;
+                 window.location.href = "/log/page?" + h + "&pageNum=" + 1 + "&pageSize=" + pageSize;
              } else {
             	 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                  var split = se.split("&");
@@ -220,7 +220,7 @@
                      if (s.indexOf("pageNum=") < 0) h = h + "&" + split[i];
                  }
                  h = h.substring(1, h.length);
-                 window.location.href = "/log/page?" + h + "&pageSize=" + pageSize;
+                 window.location.href = "/log/page?" + h + "&pageNum=" + 1 + "&pageSize=" + pageSize;
              }
         }
@@ -228,7 +228,7 @@
         $('#site_query').click(function () {
         	var keyword = $("#keyword").val();
         	var pageSize = $("#pageSize").val();
-        	window.location.href = "/log/page?keyword=" + keyword + "&pageSize=" + pageSize;
+        	window.location.href = "/log/page?keyword=" + keyword + "&pageNum=" + 1 + "&pageSize=" + pageSize;
 		});
     </script>