图书排序方式和分页修改

zhima1234 · zhima1234 · commit aa864ed8e3b9 · 2017-04-05T19:55:57.000+08:00
diff --git a/src/http/controller/book.go b/src/http/controller/book.go
@@ -7,12 +7,12 @@
 package controller
 
 import (
+	"html/template"
 	"logic"
 	"net/http"
 
 	"github.com/labstack/echo"
 	"github.com/polaris1119/goutils"
-	"github.com/polaris1119/logger"
 
 	. "http"
 	"model"
@@ -36,55 +36,20 @@ func (self BookController) RegisterRoute(g *echo.Group) {
 
 // ReadList 图书列表页
 func (BookController) ReadList(ctx echo.Context) error {
-	limit := 20
+	curPage := goutils.MustInt(ctx.QueryParam("p"), 1)
+	paginator := logic.NewPaginator(curPage)
 
-	lastId := goutils.MustInt(ctx.QueryParam("lastid"))
-	books := logic.DefaultGoBook.FindBy(ctx, limit+1, lastId)
-	if books == nil {
-		logger.Errorln("book controller: find book error")
-		return ctx.Redirect(http.StatusSeeOther, "/books")
-	}
-
-	num := len(books)
-	if num == 0 {
-		if lastId == 0 {
-			return ctx.Redirect(http.StatusSeeOther, "/")
-		}
-		return ctx.Redirect(http.StatusSeeOther, "/books")
-	}
-
-	var (
-		hasPrev, hasNext bool
-		prevId, nextId   int
-	)
-
-	if lastId > 0 {
-		prevId = lastId
-
-		if prevId-books[0].Id > 1 {
-			hasPrev = false
-		} else {
-			prevId += limit
-			hasPrev = true
-		}
-	}
-
-	if num > limit {
-		hasNext = true
-		books = books[:limit]
-		nextId = books[limit-1].Id
-	} else {
-		nextId = books[num-1].Id
-	}
+	books := logic.DefaultGoBook.FindAll(ctx, paginator, "likenum DESC,id DESC")
+	total := logic.DefaultGoBook.Count(ctx)
+	pageHtml := paginator.SetTotal(total).GetPageHtml(ctx.Request().URL().Path())
 
-	pageInfo := map[string]interface{}{
-		"has_prev": hasPrev,
-		"prev_id":  prevId,
-		"has_next": hasNext,
-		"next_id":  nextId,
+	data := map[string]interface{}{
+		"books":       books,
+		"activeBooks": "active",
+		"page":        template.HTML(pageHtml),
 	}
 
-	return render(ctx, "books/list.html", map[string]interface{}{"books": books, "activeBooks": "active", "page": pageInfo})
+	return render(ctx, "books/list.html", data)
 }
 
 // Detail 图书详细页
diff --git a/src/logic/gobook.go b/src/logic/gobook.go
@@ -39,6 +39,36 @@ func (GoBookLogic) FindBy(ctx context.Context, limit int, lastIds ...int) []*mod
 	return books
 }
 
+// FindAll 支持多页翻看
+func (GoBookLogic) FindAll(ctx context.Context, paginator *Paginator, orderBy string) []*model.Book {
+	objLog := GetLogger(ctx)
+
+	bookList := make([]*model.Book, 0)
+	err := MasterDB.OrderBy(orderBy).Limit(paginator.PerPage(), paginator.Offset()).Find(&bookList)
+	if err != nil {
+		objLog.Errorln("GoBookLogic FindAll error:", err)
+		return nil
+	}
+
+	return bookList
+}
+
+func (GoBookLogic) Count(ctx context.Context) int64 {
+	objLog := GetLogger(ctx)
+
+	var (
+		total int64
+		err   error
+	)
+	total, err = MasterDB.Count(new(model.Book))
+
+	if err != nil {
+		objLog.Errorln("GoBookLogic Count error:", err)
+	}
+
+	return total
+}
+
 // FindByIds 获取多个图书详细信息
 func (GoBookLogic) FindByIds(ids []int) []*model.Book {
 	if len(ids) == 0 {
diff --git a/template/books/list.html b/template/books/list.html
@@ -41,15 +41,11 @@ <h4><a href="/book/{{.Id}}" target="_blank" title="{{.Name}}">{{.Name}}</a></h4>
 			</div>
 			<hr class="dashed">
 			{{end}}
-		</div>
-		<ul class="pager">
-			{{if .page.has_prev}}
-			<li class="previous"><a href="/books?lastid={{.page.prev_id}}">&larr; 上一页</a></li>
-			{{end}}
-			{{if .page.has_next}}
-			<li class="next"><a href="/books?lastid={{.page.next_id}}">下一页 &rarr;</a></li>
+
+			{{if .page}}
+			<nav class="text-center"><ul class="pagination pagination-sm">{{.page}}</ul></nav>
 			{{end}}
-		</ul>
+		</div>
 	</div>
 	<div class="col-lg-3 col-md-4 col-sm-5">
 		<div class="row box_white sidebar">
