周伟鹏 / cnlive_shenhe · Commits

Commit f742adeead3fc019daf0aed785293494333d62f1

Authored by 王言钊
2 parents d3c5ad2b 2a160fd4

Merge branch 'test' into dev

Inline Side-by-side
Showing 15 changed files with 265 additions and 219 deletions
src/main/java/com/cnlive/shenhe/FinalShell.java
  View file @f742ade
@@ -3,7 +3,6 @@ package com.cnlive.shenhe; @@ -3,7 +3,6 @@ package com.cnlive.shenhe;
3 import java.io.IOException; 3 import java.io.IOException;
4 import java.security.MessageDigest; 4 import java.security.MessageDigest;
5 import java.security.NoSuchAlgorithmException; 5 import java.security.NoSuchAlgorithmException;
6 -import java.util.Scanner;  
7 6
8 public class FinalShell { 7 public class FinalShell {
9 public static void main(String[] args) throws NoSuchAlgorithmException, IOException { 8 public static void main(String[] args) throws NoSuchAlgorithmException, IOException {
@@ -14,10 +13,28 @@ public class FinalShell { @@ -14,10 +13,28 @@ public class FinalShell {
14 // tel.append(array[i]); 13 // tel.append(array[i]);
15 //} 14 //}
16 //System.out.println("tel&&wx:" + tel); 15 //System.out.println("tel&&wx:" + tel);
17 - System.out.print("请输入FinalShell的离线机器码：");  
18 - Scanner reader = new Scanner(System.in);  
19 - String machineCode = reader.nextLine();  
20 - generateKey(machineCode); 16 + //System.out.print("请输入FinalShell的离线机器码：");
  17 + //Scanner reader = new Scanner(System.in);
  18 + //String machineCode = reader.nextLine();
  19 + //generateKey(machineCode);
  20 + StringBuilder stringBuilder = new StringBuilder();
  21 + String Username = "我是中国娃哈哈我是中国娃哈哈我是中国娃哈哈";
  22 + int length = Username.length();
  23 + System.out.println(length);
  24 + if (length > 14 && length <= 21) {
  25 + String substring = Username.substring(0, 7);
  26 + String substring1 = Username.substring(7, 14);
  27 + String substring2 = Username.substring(14, length);
  28 + stringBuilder.append(substring).append("\n").append(substring1).append("\n").append(substring2);
  29 + } else if (length > 7 && length <= 14) {
  30 + String substring = Username.substring(0, 7);
  31 + String substring1 = Username.substring(7, length);
  32 + stringBuilder.append(substring).append("\n").append(substring1);
  33 + } else if (length <= 7) {
  34 + String substring = Username.substring(0, length);
  35 + stringBuilder.append(substring);
  36 + }
  37 + System.out.println(stringBuilder.toString());
21 } 38 }
22 39
23 public static void generateKey(String hardwareId) throws NoSuchAlgorithmException { 40 public static void generateKey(String hardwareId) throws NoSuchAlgorithmException {
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
  View file @f742ade
@@ -57,6 +57,7 @@ public class ContentControllerApi { @@ -57,6 +57,7 @@ public class ContentControllerApi {
57 //获取审核类型 57 //获取审核类型
58 Integer shenheType = contentService.getShenheType(json.getInteger("spId"), newContentTag); 58 Integer shenheType = contentService.getShenheType(json.getInteger("spId"), newContentTag);
59 List<ShyContent> contentList = contentService.findShyContent(shyContent); 59 List<ShyContent> contentList = contentService.findShyContent(shyContent);
  60 + logger.info("条件判断之前");
60 if (contentList.size() > 0) { 61 if (contentList.size() > 0) {
61 ShyContent shyContent1 = contentList.get(0); 62 ShyContent shyContent1 = contentList.get(0);
62 // 图文存在则更新 63 // 图文存在则更新
@@ -67,6 +68,7 @@ public class ContentControllerApi { @@ -67,6 +68,7 @@ public class ContentControllerApi {
67 yorN = saveOrUpdateContent(json, shyContent, shenheType); 68 yorN = saveOrUpdateContent(json, shyContent, shenheType);
68 logger.info("图文同步接口保存操作:{}", contentId); 69 logger.info("图文同步接口保存操作:{}", contentId);
69 } 70 }
  71 + logger.info("条件判断之后");
70 if (yorN) { 72 if (yorN) {
71 return new ResponseBean(ErrorEnum.SUCCESS); 73 return new ResponseBean(ErrorEnum.SUCCESS);
72 } else { 74 } else {
@@ -84,6 +86,7 @@ public class ContentControllerApi { @@ -84,6 +86,7 @@ public class ContentControllerApi {
84 * @return 86 * @return
85 */ 87 */
86 private boolean saveOrUpdateContent(JSONObject json, ShyContent shyContent, Integer shenheType) { 88 private boolean saveOrUpdateContent(JSONObject json, ShyContent shyContent, Integer shenheType) {
  89 + logger.info("方法执行之前");
87 //如果不存在直接插入 90 //如果不存在直接插入
88 //标题 91 //标题
89 shyContent.setTitle(json.getString("title")); 92 shyContent.setTitle(json.getString("title"));
@@ -115,9 +118,11 @@ public class ContentControllerApi { @@ -115,9 +118,11 @@ public class ContentControllerApi {
115 //最后一次更新时间 118 //最后一次更新时间
116 shyContent.setLast_update(CommonUtils.getCurrentTime()); 119 shyContent.setLast_update(CommonUtils.getCurrentTime());
117 if (shyContent.getId() == null) { 120 if (shyContent.getId() == null) {
  121 + logger.info("图文插入");
118 //id 存在就插入 122 //id 存在就插入
119 return contentService.impotContent(shyContent); 123 return contentService.impotContent(shyContent);
120 } else { 124 } else {
  125 + logger.info("图文修改");
121 // id不存在就修改 126 // id不存在就修改
122 return contentService.updateShyContent(shyContent); 127 return contentService.updateShyContent(shyContent);
123 } 128 }
src/main/java/com/cnlive/shenhe/dto/CommentsDTO.java
  View file @f742ade
@@ -41,7 +41,7 @@ public class CommentsDTO extends ShyComments implements Serializable { @@ -41,7 +41,7 @@ public class CommentsDTO extends ShyComments implements Serializable {
41 } 41 }
42 42
43 public Integer getPage() { 43 public Integer getPage() {
44 - return page == null ? 1 : page; 44 + return page;
45 } 45 }
46 46
47 public void setPage(Integer page) { 47 public void setPage(Integer page) {
@@ -49,7 +49,7 @@ public class CommentsDTO extends ShyComments implements Serializable { @@ -49,7 +49,7 @@ public class CommentsDTO extends ShyComments implements Serializable {
49 } 49 }
50 50
51 public Integer getPageSize() { 51 public Integer getPageSize() {
52 - return pageSize == null ? 10 : pageSize; 52 + return pageSize;
53 } 53 }
54 54
55 public void setPageSize(Integer pageSize) { 55 public void setPageSize(Integer pageSize) {
src/main/java/com/cnlive/shenhe/dto/LiveApplyDTO.java
  View file @f742ade
@@ -67,7 +67,7 @@ public class LiveApplyDTO extends ShyLiveapply implements Serializable { @@ -67,7 +67,7 @@ public class LiveApplyDTO extends ShyLiveapply implements Serializable {
67 } 67 }
68 68
69 public Integer getPage() { 69 public Integer getPage() {
70 - return page == null ? 1 : page; 70 + return page;
71 } 71 }
72 72
73 public void setPage(Integer page) { 73 public void setPage(Integer page) {
@@ -75,7 +75,7 @@ public class LiveApplyDTO extends ShyLiveapply implements Serializable { @@ -75,7 +75,7 @@ public class LiveApplyDTO extends ShyLiveapply implements Serializable {
75 } 75 }
76 76
77 public Integer getPageSize() { 77 public Integer getPageSize() {
78 - return pageSize == null ? 10 : pageSize; 78 + return pageSize;
79 } 79 }
80 80
81 public void setPageSize(Integer pageSize) { 81 public void setPageSize(Integer pageSize) {
src/main/java/com/cnlive/shenhe/dto/NotSpeakDTO.java
  View file @f742ade
@@ -35,7 +35,7 @@ public class NotSpeakDTO extends ShyNotspeak implements Serializable { @@ -35,7 +35,7 @@ public class NotSpeakDTO extends ShyNotspeak implements Serializable {
35 } 35 }
36 36
37 public Integer getPage() { 37 public Integer getPage() {
38 - return page == null ? 1 : page; 38 + return page;
39 } 39 }
40 40
41 public void setPage(Integer page) { 41 public void setPage(Integer page) {
@@ -43,7 +43,7 @@ public class NotSpeakDTO extends ShyNotspeak implements Serializable { @@ -43,7 +43,7 @@ public class NotSpeakDTO extends ShyNotspeak implements Serializable {
43 } 43 }
44 44
45 public Integer getPageSize() { 45 public Integer getPageSize() {
46 - return pageSize == null ? 10 : pageSize; 46 + return pageSize;
47 } 47 }
48 48
49 public void setPageSize(Integer pageSize) { 49 public void setPageSize(Integer pageSize) {
src/main/java/com/cnlive/shenhe/dto/SitesDTO.java
  View file @f742ade
@@ -44,7 +44,7 @@ public class SitesDTO extends ShySites implements Serializable { @@ -44,7 +44,7 @@ public class SitesDTO extends ShySites implements Serializable {
44 } 44 }
45 45
46 public Integer getPage() { 46 public Integer getPage() {
47 - return page == null ? 1 : page; 47 + return page;
48 } 48 }
49 49
50 public void setPage(Integer page) { 50 public void setPage(Integer page) {
@@ -52,7 +52,7 @@ public class SitesDTO extends ShySites implements Serializable { @@ -52,7 +52,7 @@ public class SitesDTO extends ShySites implements Serializable {
52 } 52 }
53 53
54 public Integer getPageSize() { 54 public Integer getPageSize() {
55 - return pageSize == null ? 10 : pageSize; 55 + return pageSize;
56 } 56 }
57 57
58 public void setPageSize(Integer pageSize) { 58 public void setPageSize(Integer pageSize) {
src/main/java/com/cnlive/shenhe/dto/TopicDTO.java
  View file @f742ade
@@ -68,8 +68,6 @@ public class TopicDTO extends ShyTopic implements Serializable { @@ -68,8 +68,6 @@ public class TopicDTO extends ShyTopic implements Serializable {
68 this.userId = userId; 68 this.userId = userId;
69 } 69 }
70 70
71 -  
72 -  
73 public String getTopic_name() { 71 public String getTopic_name() {
74 return topic_name; 72 return topic_name;
75 } 73 }
@@ -79,7 +77,7 @@ public class TopicDTO extends ShyTopic implements Serializable { @@ -79,7 +77,7 @@ public class TopicDTO extends ShyTopic implements Serializable {
79 } 77 }
80 78
81 public Integer getPage() { 79 public Integer getPage() {
82 - return page == null ? 1 : page; 80 + return page;
83 } 81 }
84 82
85 public void setPage(Integer page) { 83 public void setPage(Integer page) {
@@ -87,7 +85,7 @@ public class TopicDTO extends ShyTopic implements Serializable { @@ -87,7 +85,7 @@ public class TopicDTO extends ShyTopic implements Serializable {
87 } 85 }
88 86
89 public Integer getPageSize() { 87 public Integer getPageSize() {
90 - return pageSize == null ? 10 : pageSize; 88 + return pageSize;
91 } 89 }
92 90
93 public void setPageSize(Integer pageSize) { 91 public void setPageSize(Integer pageSize) {
src/main/java/com/cnlive/shenhe/dto/UsersFreeDTO.java
  View file @f742ade
@@ -37,7 +37,7 @@ public class UsersFreeDTO extends ShyUsersfree implements Serializable { @@ -37,7 +37,7 @@ public class UsersFreeDTO extends ShyUsersfree implements Serializable {
37 } 37 }
38 38
39 public Integer getPage() { 39 public Integer getPage() {
40 - return page == null ? 1 : page; 40 + return page;
41 } 41 }
42 42
43 public void setPage(Integer page) { 43 public void setPage(Integer page) {
@@ -45,7 +45,7 @@ public class UsersFreeDTO extends ShyUsersfree implements Serializable { @@ -45,7 +45,7 @@ public class UsersFreeDTO extends ShyUsersfree implements Serializable {
45 } 45 }
46 46
47 public Integer getPageSize() { 47 public Integer getPageSize() {
48 - return pageSize == null ? 10 : pageSize; 48 + return pageSize;
49 } 49 }
50 50
51 public void setPageSize(Integer pageSize) { 51 public void setPageSize(Integer pageSize) {
src/main/resources/templates/common/frame.html
  View file @f742ade
@@ -81,11 +81,11 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot; @@ -81,11 +81,11 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
81 <li class="active"><a href="/videos/page?state=0&receive=0" id="/videos/page">点播审核</a></li> 81 <li class="active"><a href="/videos/page?state=0&receive=0" id="/videos/page">点播审核</a></li>
82 <li><a href="/audio/page?state=0&receive=0&page=1&pageSize=10" id="/audio/page"> 音频审核</a></li> 82 <li><a href="/audio/page?state=0&receive=0&page=1&pageSize=10" id="/audio/page"> 音频审核</a></li>
83 <li><a href="/live/page?shenhe_state=0" id="/live/page"> 直播审核</a></li> 83 <li><a href="/live/page?shenhe_state=0" id="/live/page"> 直播审核</a></li>
84 - <li><a href="/comments/page?state=0&receive=0" id="/comments/page"> 评论审核</a></li> 84 + <li><a href="/comments/page?state=0&receive=0&page=1&pageSize=10" id="/comments/page"> 评论审核</a></li>
85 <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li> 85 <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li>
86 - <li><a href="/topic/page?shenhe_status=0&receive=0" id="/topic/page"> 话题审核</a></li> 86 + <li><a href="/topic/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/topic/page"> 话题审核</a></li>
87 <li><a href="/channel/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/channel/page"> 频道审核</a></li> 87 <li><a href="/channel/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/channel/page"> 频道审核</a></li>
88 - <li><a href="/liveApply/page?shenhe_state=0&receive=0" id="/liveApply/page">直播申请审核</a></li> 88 + <li><a href="/liveApply/page?shenhe_state=0&receive=0&page=1&pageSize=10" id="/liveApply/page">直播申请审核</a></li>
89 </ul> 89 </ul>
90 </li> 90 </li>
91 <li class="treeview" th:if="${session.sessionUser.spid==0 || session.sessionUser.spid==60}"> 91 <li class="treeview" th:if="${session.sessionUser.spid==0 || session.sessionUser.spid==60}">
@@ -94,10 +94,10 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot; @@ -94,10 +94,10 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
94 </a> 94 </a>
95 <ul class="treeview-menu"> 95 <ul class="treeview-menu">
96 <li><a href="/users/page" id="/users/page"> 审核云用户管理</a></li> 96 <li><a href="/users/page" id="/users/page"> 审核云用户管理</a></li>
97 - <li><a href="/sites/page" id="/sites/page"> SP白名单管理</a></li> 97 + <li><a href="/sites/page?page=1&pageSize=10" id="/sites/page"> SP白名单管理</a></li>
98 <li><a href="/email/page" id="/email/page"> 邮件消息管理</a></li> 98 <li><a href="/email/page" id="/email/page"> 邮件消息管理</a></li>
99 - <li><a href="/usersFree/page" id="/usersFree/page"> 网++白名单管理</a></li>  
100 - <li><a href="/notSpeak/page" id="/notSpeak/page"> 网++禁言管理</a></li> 99 + <li><a href="/usersFree/page?page=1&pageSize=10" id="/usersFree/page"> 网++白名单管理</a></li>
  100 + <li><a href="/notSpeak/page?page=1&pageSize=10" id="/notSpeak/page"> 网++禁言管理</a></li>
101 <li><a href="/activity/page?pageNum=1&pageSize=10" id="/activity/page"> 活动管理</a></li> 101 <li><a href="/activity/page?pageNum=1&pageSize=10" id="/activity/page"> 活动管理</a></li>
102 <li><a href="/log/page?pageNum=1&pageSize=10" id="/log/page"> 日志管理</a></li> 102 <li><a href="/log/page?pageNum=1&pageSize=10" id="/log/page"> 日志管理</a></li>
103 </ul> 103 </ul>
src/main/resources/templates/page/comment.html
  View file @f742ade
@@ -568,7 +568,7 @@ @@ -568,7 +568,7 @@
568 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i]; 568 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
569 } 569 }
570 h = h.substring(1, h.length); 570 h = h.substring(1, h.length);
571 - window.location.href = "/comments/page?" + h + "&pageSize=" + pageSize; 571 + window.location.href = "/comments/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
572 } else { 572 } else {
573 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连 573 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
574 var split = se.split("&"); 574 var split = se.split("&");
@@ -578,7 +578,7 @@ @@ -578,7 +578,7 @@
578 if (s.indexOf("page=") < 0) h = h + "&" + split[i]; 578 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
579 } 579 }
580 h = h.substring(1, h.length); 580 h = h.substring(1, h.length);
581 - window.location.href = "/comments/page?" + h + "&pageSize=" + pageSize; 581 + window.location.href = "/comments/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
582 } 582 }
583 } 583 }
584 584
@@ -620,7 +620,7 @@ @@ -620,7 +620,7 @@
620 type = $("#topic").val(); 620 type = $("#topic").val();
621 comment_user_id = $("#comment_user_id").val(); 621 comment_user_id = $("#comment_user_id").val();
622 var expand_list_state = $("#forms").attr("expand_list_state"); 622 var expand_list_state = $("#forms").attr("expand_list_state");
623 - 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; 623 + 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;
624 } 624 }
625 625
626 //全部 626 //全部
src/main/resources/templates/page/liveApply.html
  View file @f742ade
@@ -80,7 +80,8 @@ @@ -80,7 +80,8 @@
80 <div class="col-md-6" style="padding: 0;width: 100%;"> 80 <div class="col-md-6" style="padding: 0;width: 100%;">
81 <label for="liveApply_theme" class="control-label cb-toolbar">直播主题:</label> 81 <label for="liveApply_theme" class="control-label cb-toolbar">直播主题:</label>
82 <div class="col-sm-7" style="padding: 0;"> 82 <div class="col-sm-7" style="padding: 0;">
83 - <input class="form-control" type="text" th:value="${Theme}" value="" id="liveApply_theme"> 83 + <input class="form-control" type="text" th:value="${Theme}" value=""
  84 + id="liveApply_theme">
84 </div> 85 </div>
85 </div> 86 </div>
86 </div> 87 </div>
@@ -116,7 +117,8 @@ @@ -116,7 +117,8 @@
116 <div class="col-md-5" style="padding: 0;width: 100%;"> 117 <div class="col-md-5" style="padding: 0;width: 100%;">
117 <label for="organization" class="control-label cb-toolbar">发起单位:</label> 118 <label for="organization" class="control-label cb-toolbar">发起单位:</label>
118 <div class="col-sm-7" style="padding: 0;"> 119 <div class="col-sm-7" style="padding: 0;">
119 - <input class="form-control" type="text" th:value="${Organization}" value="" id="organization" 120 + <input class="form-control" type="text" th:value="${Organization}" value=""
  121 + id="organization"
120 name="organization"> 122 name="organization">
121 </div> 123 </div>
122 </div> 124 </div>
@@ -127,7 +129,8 @@ @@ -127,7 +129,8 @@
127 th:if="${session.sessionUser.spid==0}"> 129 th:if="${session.sessionUser.spid==0}">
128 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label> 130 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
129 <div class="col-sm-7" style="padding: 0;"> 131 <div class="col-sm-7" style="padding: 0;">
130 - <input class="form-control" type="text" th:value="${Sp_desc}" value="" id="sp_desc"> 132 + <input class="form-control" type="text" th:value="${Sp_desc}" value=""
  133 + id="sp_desc">
131 </div> 134 </div>
132 </div> 135 </div>
133 </div> 136 </div>
@@ -407,6 +410,7 @@ @@ -407,6 +410,7 @@
407 if (r != null) return unescape(r[2]); 410 if (r != null) return unescape(r[2]);
408 return null; 411 return null;
409 } 412 }
  413 +
410 // 状态==2是展开状态 触发展开 414 // 状态==2是展开状态 触发展开
411 $(function () { 415 $(function () {
412 if (GetQueryString("expand_list_state") == "2") { 416 if (GetQueryString("expand_list_state") == "2") {
@@ -461,7 +465,7 @@ @@ -461,7 +465,7 @@
461 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i]; 465 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
462 } 466 }
463 h = h.substring(1, h.length); 467 h = h.substring(1, h.length);
464 - window.location.href = "/liveApply/page?" + h + "&pageSize=" + pageSize; 468 + window.location.href = "/liveApply/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
465 } else { 469 } else {
466 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连 470 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
467 var split = se.split("&"); 471 var split = se.split("&");
@@ -471,7 +475,7 @@ @@ -471,7 +475,7 @@
471 if (s.indexOf("page=") < 0) h = h + "&" + split[i]; 475 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
472 } 476 }
473 h = h.substring(1, h.length); 477 h = h.substring(1, h.length);
474 - window.location.href = "/liveApply/page?" + h + "&pageSize=" + pageSize; 478 + window.location.href = "/liveApply/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
475 } 479 }
476 } 480 }
477 481
@@ -508,7 +512,7 @@ @@ -508,7 +512,7 @@
508 updateValue(); 512 updateValue();
509 var receive = ""; 513 var receive = "";
510 var expand_list_state = $("#forms").attr("expand_list_state"); 514 var expand_list_state = $("#forms").attr("expand_list_state");
511 - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&expand_list_state=" + expand_list_state; 515 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
512 } 516 }
513 517
514 //全部待领 518 //全部待领
@@ -516,27 +520,27 @@ @@ -516,27 +520,27 @@
516 updateValue(); 520 updateValue();
517 if ($.trim(shenhe_state) == '') shenhe_state = 0; 521 if ($.trim(shenhe_state) == '') shenhe_state = 0;
518 var receive = 0; 522 var receive = 0;
519 - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count; 523 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count;
520 }); 524 });
521 //我的待审核 525 //我的待审核
522 $('#Mydaishen').click(function () { 526 $('#Mydaishen').click(function () {
523 updateValue(); 527 updateValue();
524 var receive = 1; 528 var receive = 1;
525 if ($.trim(shenhe_state) == '') shenhe_state = 0; 529 if ($.trim(shenhe_state) == '') shenhe_state = 0;
526 - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count; 530 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count;
527 }); 531 });
528 //我的已审核 532 //我的已审核
529 $('#yishen').click(function () { 533 $('#yishen').click(function () {
530 updateValue(); 534 updateValue();
531 var receive = 1; 535 var receive = 1;
532 if ($.trim(shenhe_state) == '') shenhe_state = 3;//审核状态，3代表通过和拒绝都查询 536 if ($.trim(shenhe_state) == '') shenhe_state = 3;//审核状态，3代表通过和拒绝都查询
533 - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count; 537 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count;
534 }); 538 });
535 539
536 540
537 //查询 541 //查询
538 $('#videos_query').click(function () { 542 $('#videos_query').click(function () {
539 - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count; 543 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&organization=" + organization + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count;
540 }); 544 });
541 /*全选的操作*/ 545 /*全选的操作*/
542 $('#select_all').click(function () { 546 $('#select_all').click(function () {
src/main/resources/templates/page/notspeak.html
  View file @f742ade
@@ -134,7 +134,8 @@ @@ -134,7 +134,8 @@
134 <div class="col-md-5" style="padding: 0"> 134 <div class="col-md-5" style="padding: 0">
135 <label for="user_name" class="control-label cb-toolbar">用户昵称:</label> 135 <label for="user_name" class="control-label cb-toolbar">用户昵称:</label>
136 <div class="col-sm-8" style="padding: 0;"> 136 <div class="col-sm-8" style="padding: 0;">
137 - <input class="form-control" name="user_name" th:value="${User_name}" type="text" id="user_name"> 137 + <input class="form-control" name="user_name" th:value="${User_name}"
  138 + type="text" id="user_name">
138 </div> 139 </div>
139 </div> 140 </div>
140 <!-- <div class="col-md-3" style="padding: 0"> --> 141 <!-- <div class="col-md-3" style="padding: 0"> -->
@@ -451,6 +452,7 @@ @@ -451,6 +452,7 @@
451 if (r != null) return unescape(r[2]); 452 if (r != null) return unescape(r[2]);
452 return null; 453 return null;
453 } 454 }
  455 +
454 // 状态==2是展开状态 触发展开 456 // 状态==2是展开状态 触发展开
455 $(function () { 457 $(function () {
456 if (GetQueryString("expand_list_state") == "2") { 458 if (GetQueryString("expand_list_state") == "2") {
@@ -483,7 +485,7 @@ @@ -483,7 +485,7 @@
483 user_name = $("#user_name").val(); 485 user_name = $("#user_name").val();
484 count = $("#pageSize").val(); 486 count = $("#pageSize").val();
485 var expand_list_state = $("#forms").attr("expand_list_state"); 487 var expand_list_state = $("#forms").attr("expand_list_state");
486 - window.location.href = "/notSpeak/page?user_id=" + user_id + "&user_name=" + user_name + "&state=" + state + "&pageSize=" + count + "&expand_list_state=" + expand_list_state; 488 + window.location.href = "/notSpeak/page?user_id=" + user_id + "&user_name=" + user_name + "&state=" + state + "&page=" + 1 + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
487 } 489 }
488 490
489 //全部 491 //全部
@@ -584,7 +586,7 @@ @@ -584,7 +586,7 @@
584 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i]; 586 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
585 } 587 }
586 h = h.substring(1, h.length); 588 h = h.substring(1, h.length);
587 - window.location.href = "/notSpeak/page?" + h + "&pageSize=" + pageSize; 589 + window.location.href = "/notSpeak/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
588 } else { 590 } else {
589 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连 591 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
590 var split = se.split("&"); 592 var split = se.split("&");
@@ -594,7 +596,7 @@ @@ -594,7 +596,7 @@
594 if (s.indexOf("page=") < 0) h = h + "&" + split[i]; 596 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
595 } 597 }
596 h = h.substring(1, h.length); 598 h = h.substring(1, h.length);
597 - window.location.href = "/notSpeak/page?" + h + "&pageSize=" + pageSize; 599 + window.location.href = "/notSpeak/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
598 } 600 }
599 } 601 }
600 602
src/main/resources/templates/page/site.html
  View file @f742ade
@@ -3,8 +3,13 @@ @@ -3,8 +3,13 @@
3 3
4 <head th:replace="../templates/common/head::head"></head> 4 <head th:replace="../templates/common/head::head"></head>
5 <style> 5 <style>
6 - .fixed-table-toolbar .bs-bars, .fixed-table-toolbar .columns, .fixed-table-toolbar .search{margin-top: 0px;}  
7 - .table{margin-bottom:0;} 6 + .fixed-table-toolbar .bs-bars, .fixed-table-toolbar .columns, .fixed-table-toolbar .search {
  7 + margin-top: 0px;
  8 + }
  9 +
  10 + .table {
  11 + margin-bottom: 0;
  12 + }
8 13
9 </style> 14 </style>
10 <body class="skin-blue sidebar-mini"> 15 <body class="skin-blue sidebar-mini">
@@ -36,107 +41,120 @@ @@ -36,107 +41,120 @@
36 </div> 41 </div>
37 </div> 42 </div>
38 <div class="columns columns-right btn-group pull-right"> 43 <div class="columns columns-right btn-group pull-right">
39 - <button class="btn btn-default" type="button" name="refresh" title="搜索" id="site_query">搜索</button>  
40 - <ul class="dropdown-menu" role="menu">  
41 - <li><label><input type="checkbox" data-field="sp_id" value="0"  
42 - checked="checked"> spID</label></li>  
43 - <li><label><input type="checkbox" data-field="sp_id_brief" value="1"  
44 - checked="checked"> sp简称</label></li>  
45 - <li><label><input type="checkbox" data-field="type" value="2"  
46 - checked="checked"> 免审业务  
47 - </label></li>  
48 - <li><label><input type="checkbox" data-field="service_time" value="3"  
49 - checked="checked"> 免审业务更新时间</label></li>  
50 - <li><label><input type="checkbox" data-field="upload_time" value="4"  
51 - checked="checked"> sp信息创建时间  
52 - </label></li>  
53 - <li><label><input type="checkbox" data-field="updated_at" value="5"  
54 - checked="checked"> sp信息更新时间</label></li>  
55 - <li><label><input type="checkbox" data-field="action" value="6"  
56 - checked="checked"> 操作  
57 - </label></li>  
58 - </ul>  
59 - </div>  
60 - </div>  
61 - <div class="pull-right search">  
62 - <form id="searchForm">  
63 - <input class="form-control" type="text" placeholder="搜索" id="keyword" name="keyword" th:value="${param.keyword}">  
64 - </form> 44 + <button class="btn btn-default" type="button" name="refresh" title="搜索"
  45 + id="site_query">搜索
  46 + </button>
  47 + <ul class="dropdown-menu" role="menu">
  48 + <li><label><input type="checkbox" data-field="sp_id" value="0"
  49 + checked="checked"> spID</label></li>
  50 + <li><label><input type="checkbox" data-field="sp_id_brief" value="1"
  51 + checked="checked"> sp简称</label></li>
  52 + <li><label><input type="checkbox" data-field="type" value="2"
  53 + checked="checked"> 免审业务
  54 + </label></li>
  55 + <li><label><input type="checkbox" data-field="service_time" value="3"
  56 + checked="checked"> 免审业务更新时间</label></li>
  57 + <li><label><input type="checkbox" data-field="upload_time" value="4"
  58 + checked="checked"> sp信息创建时间
  59 + </label></li>
  60 + <li><label><input type="checkbox" data-field="updated_at" value="5"
  61 + checked="checked"> sp信息更新时间</label></li>
  62 + <li><label><input type="checkbox" data-field="action" value="6"
  63 + checked="checked"> 操作
  64 + </label></li>
  65 + </ul>
65 </div> 66 </div>
66 </div> 67 </div>
67 - <div class="fixed-table-container" style="padding-bottom: 0px;">  
68 - <div class="fixed-table-body">  
69 - <table data-toggle="table" data-pagination="true"  
70 - data-search="false" data-show-refresh="true" data-show-toggle="true"  
71 - data-show-columns="true" data-toolbar="#toolbar"  
72 - class="table table-hover">  
73 - <thead>  
74 - <tr>  
75 - <th style="text-align: center; width: 50px; " data-field="sp_id"  
76 - tabindex="0">  
77 - <div class="th-inner ">spID</div>  
78 - <div class="fht-cell"></div>  
79 - </th>  
80 - <th style="text-align: center; width: 120px; " data-field="sp_id_brief"  
81 - tabindex="0">  
82 - <div class="th-inner ">sp简称</div>  
83 - <div class="fht-cell"></div>  
84 - </th>  
85 - <th style="text-align: center; width: 200px; " data-field="type"  
86 - tabindex="0">  
87 - <div class="th-inner ">免审业务  
88 - </div>  
89 - <div class="fht-cell"></div>  
90 - </th>  
91 - <th style="text-align: center; width: 120px; " data-field="upload_time"  
92 - tabindex="0">  
93 - <div class="th-inner ">sp信息创建时间  
94 - </div>  
95 - <div class="fht-cell"></div>  
96 - </th>  
97 - <th style="text-align: center; width: 120px; " data-field="updated_at"  
98 - tabindex="0">  
99 - <div class="th-inner ">sp信息更新时间</div>  
100 - <div class="fht-cell"></div>  
101 - </th>  
102 - <th style="text-align: center; width: 100px; " data-field="action"  
103 - tabindex="0">  
104 - <div class="th-inner ">操作  
105 - </div>  
106 - <div class="fht-cell"></div>  
107 - </th>  
108 - </tr>  
109 - </thead>  
110 - <tbody>  
111 - <tr th:data-index="${siteStat.index}" th:each="site : ${sitePage.list}">  
112 - <td style="text-align: center; width: 50px;" th:text="${site.spid}">82</td>  
113 - <td style="text-align: center; width: 120px;" th:text="${site.name}">视讯中国</td>  
114 - <td style="text-align: center; width: 200px;" th:text="${site.write_business_name}">点播审核</td>  
115 - <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>  
116 - <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>  
117 - <td style="text-align: center; width: 100px;"><span>&nbsp;</span><a  
118 - class="edit" th:href="'javascript:edit('+${site.id}+',\''+${site.name}+'\',\''+${site.write_business} +'\')'">  
119 - <button class="btn btn-primary btn-xs">设置</button>  
120 - </a><span> </span><span>&nbsp;</span></td>  
121 - </tr> 68 + <div class="pull-right search">
  69 + <form id="searchForm">
  70 + <input class="form-control" type="text" placeholder="搜索" id="keyword"
  71 + name="keyword" th:value="${param.keyword}">
  72 + </form>
  73 + </div>
  74 + </div>
  75 + <div class="fixed-table-container" style="padding-bottom: 0px;">
  76 + <div class="fixed-table-body">
  77 + <table data-toggle="table" data-pagination="true"
  78 + data-search="false" data-show-refresh="true" data-show-toggle="true"
  79 + data-show-columns="true" data-toolbar="#toolbar"
  80 + class="table table-hover">
  81 + <thead>
  82 + <tr>
  83 + <th style="text-align: center; width: 50px; " data-field="sp_id"
  84 + tabindex="0">
  85 + <div class="th-inner ">spID</div>
  86 + <div class="fht-cell"></div>
  87 + </th>
  88 + <th style="text-align: center; width: 120px; " data-field="sp_id_brief"
  89 + tabindex="0">
  90 + <div class="th-inner ">sp简称</div>
  91 + <div class="fht-cell"></div>
  92 + </th>
  93 + <th style="text-align: center; width: 200px; " data-field="type"
  94 + tabindex="0">
  95 + <div class="th-inner ">免审业务
  96 + </div>
  97 + <div class="fht-cell"></div>
  98 + </th>
  99 + <th style="text-align: center; width: 120px; " data-field="upload_time"
  100 + tabindex="0">
  101 + <div class="th-inner ">sp信息创建时间
  102 + </div>
  103 + <div class="fht-cell"></div>
  104 + </th>
  105 + <th style="text-align: center; width: 120px; " data-field="updated_at"
  106 + tabindex="0">
  107 + <div class="th-inner ">sp信息更新时间</div>
  108 + <div class="fht-cell"></div>
  109 + </th>
  110 + <th style="text-align: center; width: 100px; " data-field="action"
  111 + tabindex="0">
  112 + <div class="th-inner ">操作
  113 + </div>
  114 + <div class="fht-cell"></div>
  115 + </th>
  116 + </tr>
  117 + </thead>
  118 + <tbody>
  119 + <tr th:data-index="${siteStat.index}" th:each="site : ${sitePage.list}">
  120 + <td style="text-align: center; width: 50px;" th:text="${site.spid}">82</td>
  121 + <td style="text-align: center; width: 120px;" th:text="${site.name}">视讯中国
  122 + </td>
  123 + <td style="text-align: center; width: 200px;"
  124 + th:text="${site.write_business_name}">点播审核
  125 + </td>
  126 + <td style="text-align: center; width: 120px;"
  127 + th:text="${#dates.format(site.created_at, 'yyyy-MM-dd HH:mm:ss')}">
  128 + 2018-11-22 23:08:48
  129 + </td>
  130 + <td style="text-align: center; width: 120px;"
  131 + th:text="${#dates.format(site.updated_at, 'yyyy-MM-dd HH:mm:ss')}">
  132 + 2016-08-03 14:27:17
  133 + </td>
  134 + <td style="text-align: center; width: 100px;"><span>&nbsp;</span><a
  135 + class="edit"
  136 + th:href="'javascript:edit('+${site.id}+',\''+${site.name}+'\',\''+${site.write_business} +'\')'">
  137 + <button class="btn btn-primary btn-xs">设置</button>
  138 + </a><span> </span><span>&nbsp;</span></td>
  139 + </tr>
122 140
123 - </tbody>  
124 - </table>  
125 - </div> 141 + </tbody>
  142 + </table>
  143 + </div>
126 144
127 - <div class="fixed-table-pagination" style="display: block;">  
128 - <div class="pull-left pagination-detail">  
129 - <span class="pagination-info" th:text="'共 '+${sitePage.total}+' 条记录，每页显示'">共 0 条记录</span> 145 + <div class="fixed-table-pagination" style="display: block;">
  146 + <div class="pull-left pagination-detail">
  147 + <span class="pagination-info" th:text="'共 '+${sitePage.total}+' 条记录，每页显示'">共 0 条记录</span>
130 <select class="" id="pageSize" name="pageSize" onchange="selectPageSize()"> 148 <select class="" id="pageSize" name="pageSize" onchange="selectPageSize()">
131 - <option value="10" th:selected="${pageSize==10}">10</option>  
132 - <option value="20" th:selected="${pageSize==20}">20</option>  
133 - <option value="50" th:selected="${pageSize==50}">50</option>  
134 - <option value="100" th:selected="${pageSize==100}">100</option> 149 + <option value="10" th:selected="${pageSize==10}">10</option>
  150 + <option value="20" th:selected="${pageSize==20}">20</option>
  151 + <option value="50" th:selected="${pageSize==50}">50</option>
  152 + <option value="100" th:selected="${pageSize==100}">100</option>
135 </select> 153 </select>
136 - <span class="pagination-info" >条记录</span>  
137 - </div>  
138 - <div class="pull-right pagination">  
139 - <ul class="pagination" th:if="${sitePage.pages>1}"> 154 + <span class="pagination-info">条记录</span>
  155 + </div>
  156 + <div class="pull-right pagination">
  157 + <ul class="pagination" th:if="${sitePage.pages>1}">
140 <li class="page-pre"><a th:href="'javascript:fanye(1);'">‹‹</a></li> 158 <li class="page-pre"><a th:href="'javascript:fanye(1);'">‹‹</a></li>
141 <li class="page-pre" th:if="${!sitePage.isFirstPage}"><a 159 <li class="page-pre" th:if="${!sitePage.isFirstPage}"><a
142 th:onclick="'javascript:fanye(\''+${sitePage.pageNum-1}+'\');'">‹</a> 160 th:onclick="'javascript:fanye(\''+${sitePage.pageNum-1}+'\');'">‹</a>
@@ -170,17 +188,17 @@ @@ -170,17 +188,17 @@
170 th:onclick="'javascript:fanye(\''+${sitePage.pages}+'\');'">››</a> 188 th:onclick="'javascript:fanye(\''+${sitePage.pages}+'\');'">››</a>
171 </li> 189 </li>
172 </ul> 190 </ul>
173 - </div>  
174 </div> 191 </div>
175 </div> 192 </div>
176 </div> 193 </div>
177 - <div class="clearfix"></div>  
178 </div> 194 </div>
  195 + <div class="clearfix"></div>
179 </div> 196 </div>
180 </div> 197 </div>
181 </div> 198 </div>
182 - </section>  
183 </div> 199 </div>
  200 + </section>
  201 +</div>
184 202
185 <!-- 模态框（Modal） --> 203 <!-- 模态框（Modal） -->
186 <div class="modal fade" id="editModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> 204 <div class="modal fade" id="editModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -206,7 +224,8 @@ @@ -206,7 +224,8 @@
206 <div class="col-sm-10" style="float: left"> 224 <div class="col-sm-10" style="float: left">
207 <div th:each="bu:${business}" style="padding-right: 30px;" class="write_check"> 225 <div th:each="bu:${business}" style="padding-right: 30px;" class="write_check">
208 <span th:text="${bu.value}" style="font-size: 15px"></span> 226 <span th:text="${bu.value}" style="font-size: 15px"></span>
209 - <input type="checkbox" name="write_business" th:value="${bu.key}" th:id="'write_check_'+${bu.key}"> 227 + <input type="checkbox" name="write_business" th:value="${bu.key}"
  228 + th:id="'write_check_'+${bu.key}">
210 </div> 229 </div>
211 </div> 230 </div>
212 </form> 231 </form>
@@ -215,89 +234,90 @@ @@ -215,89 +234,90 @@
215 </div> 234 </div>
216 <div class="modal-footer"> 235 <div class="modal-footer">
217 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button> 236 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
218 - <button type="button" class="btn btn-primary" onclick="javascript:$('#editWrite').submit();">提交更改</button> 237 + <button type="button" class="btn btn-primary" onclick="javascript:$('#editWrite').submit();">提交更改
  238 + </button>
219 </div> 239 </div>
220 </div><!-- /.modal-content --> 240 </div><!-- /.modal-content -->
221 </div><!-- /.modal-dialog --> 241 </div><!-- /.modal-dialog -->
222 </div> 242 </div>
223 <!-- /.modal --> 243 <!-- /.modal -->
224 - <script>  
225 - //设置白名单，打开编辑窗口  
226 - function edit(id,company,write_business){  
227 - $("#edit_company").text(company);  
228 - $("#edit_id").val(id);  
229 - $("#redirect_url").val(location.pathname+location.search);  
230 - $(".write_check input").prop("checked",false);  
231 - if($.trim(write_business)!=''){  
232 - var array = write_business.split(",")  
233 - for (var i=0;i<array.length;i++){  
234 - $("#write_check_"+array[i]).prop("checked",true);  
235 - }  
236 - }  
237 - $('#editModal').modal('show'); 244 +<script>
  245 + //设置白名单，打开编辑窗口
  246 + function edit(id, company, write_business) {
  247 + $("#edit_company").text(company);
  248 + $("#edit_id").val(id);
  249 + $("#redirect_url").val(location.pathname + location.search);
  250 + $(".write_check input").prop("checked", false);
  251 + if ($.trim(write_business) != '') {
  252 + var array = write_business.split(",")
  253 + for (var i = 0; i < array.length; i++) {
  254 + $("#write_check_" + array[i]).prop("checked", true);
  255 + }
238 } 256 }
239 -  
240 - //翻页函数  
241 - function fanye(page) {  
242 - var param = location.search;  
243 - if (param.indexOf("page=") != -1) {  
244 - var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连  
245 - var split = se.split("&");  
246 - var h = "";  
247 - for (var i = 0; i < split.length; i++) {  
248 - var s = split[i];  
249 - if (s.indexOf("page=") < 0) h = h + "&" + split[i];  
250 - }  
251 - h = h.substring(1, h.length);  
252 - window.location.href = "/sites/page?" + h + "&page=" + page;  
253 - } else {  
254 - param = param.substring(1, param.length);  
255 - window.location.href = "/sites/page?" + param + "&page=" + page; 257 + $('#editModal').modal('show');
  258 + }
  259 +
  260 + //翻页函数
  261 + function fanye(page) {
  262 + var param = location.search;
  263 + if (param.indexOf("page=") != -1) {
  264 + var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
  265 + var split = se.split("&");
  266 + var h = "";
  267 + for (var i = 0; i < split.length; i++) {
  268 + var s = split[i];
  269 + if (s.indexOf("page=") < 0) h = h + "&" + split[i];
256 } 270 }
  271 + h = h.substring(1, h.length);
  272 + window.location.href = "/sites/page?" + h + "&page=" + page;
  273 + } else {
  274 + param = param.substring(1, param.length);
  275 + window.location.href = "/sites/page?" + param + "&page=" + page;
257 } 276 }
258 -  
259 - //选择每页数量触发函数  
260 - function selectPageSize(){  
261 - var pageSize=$("#pageSize").val();  
262 - var param = location.search;  
263 - if (param.indexOf("pageSize=") != -1) {  
264 - var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连  
265 - var split = se.split("&");  
266 - var h = "";  
267 - for (var i = 0; i < split.length; i++) {  
268 - var s = split[i];  
269 - if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];  
270 - }  
271 - h = h.substring(1, h.length);  
272 - window.location.href = "/sites/page?" + h + "&pageSize=" + pageSize;  
273 - } else {  
274 - var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连  
275 - var split = se.split("&");  
276 - var h = "";  
277 - for (var i = 0; i < split.length; i++) {  
278 - var s = split[i];  
279 - if (s.indexOf("page=") < 0) h = h + "&" + split[i];  
280 - }  
281 - h = h.substring(1, h.length);  
282 - window.location.href = "/sites/page?" + h + "&pageSize=" + pageSize;  
283 - } 277 + }
  278 +
  279 + //选择每页数量触发函数
  280 + function selectPageSize() {
  281 + var pageSize = $("#pageSize").val();
  282 + var param = location.search;
  283 + if (param.indexOf("pageSize=") != -1) {
  284 + var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
  285 + var split = se.split("&");
  286 + var h = "";
  287 + for (var i = 0; i < split.length; i++) {
  288 + var s = split[i];
  289 + if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
  290 + }
  291 + h = h.substring(1, h.length);
  292 + window.location.href = "/sites/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
  293 + } else {
  294 + var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
  295 + var split = se.split("&");
  296 + var h = "";
  297 + for (var i = 0; i < split.length; i++) {
  298 + var s = split[i];
  299 + if (s.indexOf("page=") < 0) h = h + "&" + split[i];
  300 + }
  301 + h = h.substring(1, h.length);
  302 + window.location.href = "/sites/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
284 } 303 }
285 -  
286 - //搜索  
287 - $('#site_query').click(function () {  
288 - var keyword = $("#keyword").val();  
289 - var pageSize = $("#pageSize").val();  
290 - window.location.href = "/sites/page?keyword=" + keyword + "&pageSize=" + pageSize;  
291 - }); 304 + }
292 305
293 - </script> 306 + //搜索
  307 + $('#site_query').click(function () {
  308 + var keyword = $("#keyword").val();
  309 + var pageSize = $("#pageSize").val();
  310 + window.location.href = "/sites/page?keyword=" + keyword + "&page=" + 1 + "&pageSize=" + pageSize;
  311 + });
  312 +
  313 +</script>
294 314
295 - <footer th:replace="../templates/common/foot::foot" ></footer> 315 +<footer th:replace="../templates/common/foot::foot"></footer>
296 316
297 317
298 - <!-- Add the sidebar's background. This div must be placed  
299 - immediately after the control sidebar -->  
300 - <div class="control-sidebar-bg" style="position: fixed; height: auto;"></div> 318 +<!-- Add the sidebar's background. This div must be placed
  319 + immediately after the control sidebar -->
  320 +<div class="control-sidebar-bg" style="position: fixed; height: auto;"></div>
301 321
302 </div><!-- ./wrapper --> 322 </div><!-- ./wrapper -->
303 323
src/main/resources/templates/page/topic.html
  View file @f742ade
@@ -458,7 +458,7 @@ @@ -458,7 +458,7 @@
458 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i]; 458 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
459 } 459 }
460 h = h.substring(1, h.length); 460 h = h.substring(1, h.length);
461 - window.location.href = "/topic/page?" + h + "&pageSize=" + pageSize; 461 + window.location.href = "/topic/page?" + h +"&page=" + 1 + "&pageSize=" + pageSize;
462 } else { 462 } else {
463 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连 463 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
464 var split = se.split("&"); 464 var split = se.split("&");
@@ -468,7 +468,7 @@ @@ -468,7 +468,7 @@
468 if (s.indexOf("page=") < 0) h = h + "&" + split[i]; 468 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
469 } 469 }
470 h = h.substring(1, h.length); 470 h = h.substring(1, h.length);
471 - window.location.href = "/topic/page?" + h + "&pageSize=" + pageSize; 471 + window.location.href = "/topic/page?" + h +"&page=" + 1 + "&pageSize=" + pageSize;
472 } 472 }
473 } 473 }
474 474
@@ -508,7 +508,7 @@ @@ -508,7 +508,7 @@
508 count = $("#pageSize").val(); 508 count = $("#pageSize").val();
509 sp_desc = $("#sp_desc").val(); 509 sp_desc = $("#sp_desc").val();
510 var expand_list_state = $("#forms").attr("expand_list_state"); 510 var expand_list_state = $("#forms").attr("expand_list_state");
511 - window.location.href = "/topic/page?topic_id=" + topic_id + "&start_date=" + start_date + "&end_date=" + end_date + "&topic_name=" + topic_name + "&pageSize=" + count + "&shenhe_status=" + shenhe_status + "&receive=" + receive + "&sp_desc=" + sp_desc + "&expand_list_state=" + expand_list_state; 511 + window.location.href = "/topic/page?topic_id=" + topic_id + "&start_date=" + start_date + "&end_date=" + end_date + "&topic_name=" + topic_name + "&page=" + 1 + "&pageSize=" + count + "&shenhe_status=" + shenhe_status + "&receive=" + receive + "&sp_desc=" + sp_desc + "&expand_list_state=" + expand_list_state;
512 } 512 }
513 513
514 //全部 514 //全部
src/main/resources/templates/page/usersFree.html
  View file @f742ade
@@ -386,7 +386,7 @@ input:checked + .slider:before { @@ -386,7 +386,7 @@ input:checked + .slider:before {
386 if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i]; 386 if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
387 } 387 }
388 h = h.substring(1, h.length); 388 h = h.substring(1, h.length);
389 - window.location.href = "/usersFree/page?" + h + "&pageSize=" + pageSize; 389 + window.location.href = "/usersFree/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
390 } else { 390 } else {
391 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连 391 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
392 var split = se.split("&"); 392 var split = se.split("&");
@@ -396,7 +396,7 @@ input:checked + .slider:before { @@ -396,7 +396,7 @@ input:checked + .slider:before {
396 if (s.indexOf("page=") < 0) h = h + "&" + split[i]; 396 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
397 } 397 }
398 h = h.substring(1, h.length); 398 h = h.substring(1, h.length);
399 - window.location.href = "/usersFree/page?" + h + "&pageSize=" + pageSize; 399 + window.location.href = "/usersFree/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
400 } 400 }
401 } 401 }
402 402
@@ -405,7 +405,7 @@ input:checked + .slider:before { @@ -405,7 +405,7 @@ input:checked + .slider:before {
405 var userId = $("#user_id").val(); 405 var userId = $("#user_id").val();
406 var mobile = $("#mobile").val(); 406 var mobile = $("#mobile").val();
407 var pageSize = $("#pageSize").val(); 407 var pageSize = $("#pageSize").val();
408 - window.location.href = "/usersFree/page?userId=" + userId + "&mobile=" + mobile+ "&pageSize=" + pageSize; 408 + window.location.href = "/usersFree/page?userId=" + userId + "&mobile=" + mobile + "&page=" + 1 + "&pageSize=" + pageSize;
409 }); 409 });
410 410
411 //鼠标回车事件 411 //鼠标回车事件