From 5a7221b1ecfc78f83dd7383fb1f6e0d6e67a5317 Mon Sep 17 00:00:00 2001
From: sunxin <2741094504@qq.com>
Date: Sat, 2 Mar 2019 18:17:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mingsoft/cms/action/web/SearchAction.java | 37 +++++++++++++++++--
 src/main/webapp/templets/1/default/search.htm |  8 ++--
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/action/web/SearchAction.java b/src/main/java/net/mingsoft/cms/action/web/SearchAction.java
index 7c83d953..c32700d7 100644
--- a/src/main/java/net/mingsoft/cms/action/web/SearchAction.java
+++ b/src/main/java/net/mingsoft/cms/action/web/SearchAction.java
@@ -48,7 +48,8 @@ import net.mingsoft.cms.util.CmsParserUtil;
 import net.mingsoft.mdiy.biz.ISearchBiz;
 import net.mingsoft.mdiy.entity.ContentModelFieldEntity;
 import net.mingsoft.mdiy.entity.SearchEntity;
-
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.text.StrSpliter;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.PageUtil;
 import freemarker.core.ParseException;
@@ -56,6 +57,7 @@ import freemarker.template.MalformedTemplateNameException;
 import freemarker.template.TemplateNotFoundException;
 import net.mingsoft.base.constant.Const;
 import net.mingsoft.basic.util.BasicUtil;
+import net.mingsoft.basic.util.StringUtil;
 import net.mingsoft.mdiy.util.ParserUtil;
 
 /**
@@ -114,6 +116,7 @@ public class SearchAction extends BaseAction {
 		if (ObjectUtil.isNull(search)) {
 			this.outJson(response, false);
 		}
+		
 		Map<String, Object> map = BasicUtil.assemblyRequestMap();
 		// 读取请求字段
 		Map<String, String[]> field =  request.getParameterMap(); 
@@ -154,16 +157,44 @@ public class SearchAction extends BaseAction {
 			map.put(ParserUtil.TYPE_ID, typeId);
 		}
 		int size = BasicUtil.getInt(ParserUtil.SIZE,10);
+		int total = PageUtil.totalPage(count, size);
 		//获取总数
-		map.put(ParserUtil.TOTAL, PageUtil.totalPage(count, size));
+		map.put(ParserUtil.TOTAL, total);
 		//设置页面显示数量
 		map.put(ParserUtil.RCOUNT, size);
 		map.put(ParserUtil.SIZE, size);
 		//设置列表当前页
 		map.put(ParserUtil.PAGE_NO, BasicUtil.getInt(ParserUtil.PAGE_NO,1));
+		@SuppressWarnings("unused")
+		int pageNo = (int) map.get(ParserUtil.PAGE_NO);
+		int next,pre;
+		if(StringUtil.isBlank(pageNo)){
+			next = 2;
+			pre = 1;
+		}else{
+			next = pageNo+1;
+			pre = pageNo+1;
+		}
+		String url = BasicUtil.getUrl() + request.getServletPath() +"?";
+		String pageNoStr = "&"+ParserUtil.PAGE_NO+"=";
+		BasicUtil.removeUrlParams(ParserUtil.PAGE_NO.split(""));
+		//下一页
+		String nextUrl = url + BasicUtil.assemblyRequestUrlParams()+pageNoStr+next;
+		//首页
+		String indexUrl = url + BasicUtil.assemblyRequestUrlParams() + pageNoStr + 1;
+		//尾页
+		String lastUrl = url + BasicUtil.assemblyRequestUrlParams() + pageNoStr + total;
+		//上一页
+		String preUrl = url + BasicUtil.assemblyRequestUrlParams() + pageNoStr + pre;
 		
+		Map<String, Object> pageMap = new HashMap<String, Object>();
+		pageMap.put(ParserUtil.INDEX_URL, indexUrl);
+		pageMap.put(ParserUtil.NEXT_URL, nextUrl);
+		pageMap.put(ParserUtil.PRE_URL, preUrl);
+		pageMap.put(ParserUtil.LAST_URL, lastUrl);
 		map.put(ParserUtil.URL, BasicUtil.getUrl());
-		Map searchMap = new HashMap<>();
+		map.put(ParserUtil.PAGE, pageMap);
+		Map<Object, Object> searchMap = new HashMap<>();
 		searchMap.put(BASIC_TITLE, BasicUtil.getString(BASIC_TITLE));
 		searchMap.put(ParserUtil.PAGE_NO, BasicUtil.getInt(ParserUtil.PAGE_NO,1));
 		map.put(SEARCH, searchMap);
diff --git a/src/main/webapp/templets/1/default/search.htm b/src/main/webapp/templets/1/default/search.htm
index 1d5f23ec..f3a6e3ce 100644
--- a/src/main/webapp/templets/1/default/search.htm
+++ b/src/main/webapp/templets/1/default/search.htm
@@ -27,10 +27,10 @@
                     </ul>
                 </div>
                 <div class="ms-content-main-page">
-	              	<a href="jacascript::void(0)" @click="indexAndLast(1)">首页</a>
-                  	<a href="jacascript::void(0)" @click="search(false)">上一页</a>
-                  	<a href="jacascript::void(0)" @click="search(true)">下一页</a>
-                  	<a href="jacascript::void(0)" @click="indexAndLast({ms:page.total/})">尾页</a>
+	              	 <a class="ms-content-main-page-first" href="{ms:global.url/}{ms:page.index/}">首页</a>
+		             <a class="ms-content-main-page-upper" href="{ms:global.url/}{ms:page.pre/}">上一页</a>
+		             <a class="ms-content-main-page-next" href="{ms:global.url/}{ms:page.next/}">下一页</a>
+		             <a class="ms-content-main-page-last" href="{ms:global.url/}{ms:page.last/}">末页</a>
 	            </div>
             </div>
         </div>