Merge pull request studygolang#52 from javasgl/feature.support.paginator

polaris1119 · web-flow · commit 39e134bca351 · 2018-01-16T17:33:17.000+08:00
首页 all tab 支持分页
diff --git a/src/http/controller/index.go b/src/http/controller/index.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/labstack/echo"
 	"github.com/polaris1119/config"
+	"github.com/polaris1119/goutils"
 	"github.com/polaris1119/logger"
 )
 
@@ -46,11 +47,23 @@ func (IndexController) Index(ctx echo.Context) error {
 	if tab == "" {
 		tab = logic.WebsiteSetting.IndexNavs[0].Tab
 	}
+	paginator := logic.NewPaginator(goutils.MustInt(ctx.QueryParam("p"), 1))
+
+	data := logic.DefaultIndex.FindData(ctx, tab, paginator)
 
-	data := logic.DefaultIndex.FindData(ctx, tab)
 	SetCookie(ctx, "INDEX_TAB", data["tab"].(string))
+
 	data["all_nodes"] = logic.GenNodes()
 
+	if tab == "all" {
+		pageHtml := paginator.SetTotal(logic.DefaultFeed.GetTotalCount(ctx)).GetPageHtml(ctx.Request().URL().Path())
+
+		data["page"] = template.HTML(pageHtml)
+
+		data["total"] = paginator.GetTotal()
+
+	}
+
 	return render(ctx, "index.html", data)
 }
 
diff --git a/src/logic/feed.go b/src/logic/feed.go
@@ -23,6 +23,29 @@ type FeedLogic struct{}
 
 var DefaultFeed = FeedLogic{}
 
+func (self FeedLogic) GetTotalCount(ctx context.Context) int64 {
+	objLog := GetLogger(ctx)
+	count, err := MasterDB.Where("state=0").Count(new(model.Feed))
+	if err != nil {
+		objLog.Errorln("FeedLogic Count error:", err)
+		return 0
+	}
+	return count
+}
+
+func (self FeedLogic) FindRecentWithPaginator(ctx context.Context, paginator *Paginator) []*model.Feed {
+	objLog := GetLogger(ctx)
+
+	feeds := make([]*model.Feed, 0)
+	err := MasterDB.Desc("updated_at").Limit(paginator.PerPage(), paginator.Offset()).Find(&feeds)
+	if err != nil {
+		objLog.Errorln("FeedLogic FindRecent error:", err)
+		return nil
+	}
+
+	return self.fillOtherInfo(ctx, feeds, true)
+}
+
 func (self FeedLogic) FindRecent(ctx context.Context, num int) []*model.Feed {
 	objLog := GetLogger(ctx)
 
diff --git a/src/logic/index.go b/src/logic/index.go
@@ -19,7 +19,8 @@ type IndexLogic struct{}
 
 var DefaultIndex = IndexLogic{}
 
-func (IndexLogic) FindData(ctx context.Context, tab string) map[string]interface{} {
+func (IndexLogic) FindData(ctx context.Context, tab string, paginator *Paginator) map[string]interface{} {
+
 	indexNav := GetCurIndexNav(tab)
 	if indexNav == nil {
 		indexNav = WebsiteSetting.IndexNavs[0]
@@ -41,7 +42,7 @@ func (IndexLogic) FindData(ctx context.Context, tab string) map[string]interface
 	switch {
 	case indexNav.DataSource == "feed":
 		topFeeds := DefaultFeed.FindTop(ctx)
-		feeds := DefaultFeed.FindRecent(ctx, 50)
+		feeds := DefaultFeed.FindRecentWithPaginator(ctx, paginator)
 		data["feeds"] = append(topFeeds, feeds...)
 	case isNid:
 		paginator := NewPaginator(1)
diff --git a/src/logic/page.go b/src/logic/page.go
@@ -143,6 +143,10 @@ func (this *Paginator) SetTotal(total int64) *Paginator {
 	return this
 }
 
+func (this *Paginator) GetTotal() int {
+	return this.total
+}
+
 func (this *Paginator) Offset() (offset int) {
 	if this.curPage > 1 {
 		offset = (this.curPage - 1) * this.perPage
diff --git a/template/index.html b/template/index.html
@@ -19,6 +19,7 @@
 			</div>
 			{{end}}
 
+
 		{{with or .feeds .topics .articles .docs}}
 		
 			{{range $i, $feed := $.feeds}}
@@ -82,6 +83,7 @@
 						{{end}}
 					</tr>
 				</tbody></table>
+
 			</div>
 				{{if eq $i 4}}
 					{{if $.pos_ad.banner}}
@@ -278,6 +280,14 @@
 					{{end}}
 				{{end}}
 			{{end}}
+			
+			{{if $.page}}
+			<div class="box_white">
+				<div class="inner_content">
+					<nav class="text-center"><ul class="pagination pagination-sm" style="margin: 1px 0;">{{$.page}}</ul></nav>
+				</div>
+			</div>
+			{{end}}
 
 		{{else}}
 
