修改统计注册，主播筛选

controllers/register.go

@@ -22,28 +22,37 @@ func (c *RegisterController) Get() {
 		c.Ctx.Redirect(302, "/accountlogin")
 		return
 	}
-	c.Data["username"] = userinfo.(*LoginInfo).Username
+	username := userinfo.(*LoginInfo).Username
+	c.Data["username"] = username
 	c.Data["token"] = models.GetToken()
-	userPermission := models.GetPermission(userinfo.(*LoginInfo).Username)
+	userPermission := models.GetPermission(username)
 	if (userPermission & (1 << uint(models.ModelStatment))) == 0 {
 		c.Ctx.Redirect(302, "/accountlogin")
 		return
 	}
-	serverId := c.GetString("server_id")
-	if serverId == "" {
-		serverId = "1001"
-	}
+	select_username := c.GetString("select_username")
 	days, _ := c.GetInt("days")
-	log.Printf("RegisterController days[%d]", days)
 	if days == 0 {
 		days = 7
 	}
 	log.Printf("RegisterController days[%d]", days)
 
-	series, categories := events.Register_get_range_day_time_count(days, serverId)
-	filename := events.Save_register_records(series, userinfo.(*LoginInfo).Username)
+	users, _ := models.GetTypeUserList("主播")
+	shareCode := ""
+	if select_username != "" {
+		shareCode = models.GetUserShareCode(select_username)
+	}
+	promoter := models.IsUserPromoter(username)
+	if promoter == 1 {
+		select_username = username
+		shareCode = models.GetUserShareCode(username)
+	}
+	series, categories := events.Register_get_range_day_time_count(days, shareCode)
+	filename := events.Save_register_records(series, username)
 	c.Data["Series"], c.Data["Categories"] = series, categories
-	c.Data["Server_id"] = serverId
+	c.Data["SelectUserName"] = select_username
+	c.Data["Promoter"] = promoter
+	c.Data["users"] = users
 	c.Data["Days"] = days
 	c.Data["file"] = filename
 	if c.GetString("querydata") == "register" {

events/register.go

@@ -1,58 +1,63 @@
 package events
 
 import (
-	"fmt"
-	"os"
 	"bufio"
+	"fmt"
 	"io"
-	"strings"
 	"math"
+	"os"
+	"strings"
 
 	"box-gm/utils"
 	"time"
+
 	// "log"
-	"github.com/tealeg/xlsx"
 	"github.com/astaxie/beego"
+	"github.com/tealeg/xlsx"
 )
 
 // 注册分布
-func Register_get_day_time_count(date string, serverId string) (map[int]int, int) {
+func Register_get_day_time_count(date string, shareCode string) (map[int]int, int) {
 	var timeCount = make(map[int]int)
-	
-	f, err := os.Open(fmt.Sprintf("%s/register-%s.log", utils.GetKeyConf("events", "path"), date))
+
+	filename := fmt.Sprintf("%s/register-%s.log", utils.GetKeyConf("events", "path"), date)
+	f, err := os.Open(filename)
 	if err != nil {
 		return timeCount, 0
 	}
 	defer f.Close()
 
-
-	startTime := utils.GetTime(date+" 00:00:00")
+	startTime := utils.GetTime(date + " 00:00:00")
 	totalCount := 0
-	
+
 	buff := bufio.NewReader(f)
 	for {
 		line, err := buff.ReadString('\n')
 
-		if err != nil || io.EOF == err {
+		if (err != nil || io.EOF == err) && line == "" {
 			break
 		}
 		line = strings.TrimSpace(line)
 
 		arr := strings.Split(line, ";")
-		if serverId == "0" || arr[1] == serverId {
-			eventTime := utils.GetTime(arr[0])
+		if shareCode == "" || arr[3] == shareCode {
+			eventTime := utils.GetTime(arr[1])
 
 			sec := eventTime - startTime
-			sec = int(math.Floor(float64(sec/300)))
-			timeCount[sec] ++
-			totalCount ++
+			sec = int(math.Floor(float64(sec / 300)))
+			timeCount[sec]++
+			totalCount++
+		}
+
+		if err != nil || io.EOF == err {
+			break
 		}
 	}
 
 	return timeCount, totalCount
 }
 
-func Register_get_range_day_time_count(days int, serverId string) ([]*tgSeries, []string) {
+func Register_get_range_day_time_count(days int, shareCode string) ([]*tgSeries, []string) {
 	var series []*tgSeries
 	currTime := int(time.Now().Unix())
 	dayCount := 0
@@ -61,26 +66,26 @@ func Register_get_range_day_time_count(days int, serverId string) ([]*tgSeries,
 		date := time.Unix(int64(tiEvent), 0).Format("2006-01-02")
 
 		item := &tgSeries{}
-		glCount, totalCount := Register_get_day_time_count(date, serverId)
+		glCount, totalCount := Register_get_day_time_count(date, shareCode)
 		item.Name = date + fmt.Sprintf(" 总人数:%d", totalCount)
-		for i:=0; i < 289; i++ {
+		for i := 0; i < 289; i++ {
 			item.Data = append(item.Data, glCount[i])
 		}
 		item.MapCount = glCount
 		// log.Printf("item[%v]", item)
 		series = append(series, item)
 
-		dayCount ++
+		dayCount++
 		if dayCount > days {
 			break
 		}
 	}
-	
-	var arrCate [] string
+
+	var arrCate []string
 	loc, _ := time.LoadLocation("Local")
-	theTime, _ := time.ParseInLocation("2006-01-02 15:04:05", time.Now().Format("2006-01-02") + " 00:00:00", loc)
-	for i:=0; i < 289; i++ {
-		ti := theTime.Add(time.Minute*5*time.Duration(i))
+	theTime, _ := time.ParseInLocation("2006-01-02 15:04:05", time.Now().Format("2006-01-02")+" 00:00:00", loc)
+	for i := 0; i < 289; i++ {
+		ti := theTime.Add(time.Minute * 5 * time.Duration(i))
 		arrCate = append(arrCate, fmt.Sprintf("%02d:%02d:%02d", ti.Hour(), ti.Minute(), ti.Second()))
 	}
 	return series, arrCate
@@ -106,13 +111,13 @@ func Save_register_records(series []*tgSeries, user string) string {
 	row.AddCell().Value = "人数"
 
 	loc, _ := time.LoadLocation("Local")
-	theTime, _ := time.ParseInLocation("2006-01-02 15:04:05", time.Now().Format("2006-01-02") + " 00:00:00", loc)
+	theTime, _ := time.ParseInLocation("2006-01-02 15:04:05", time.Now().Format("2006-01-02")+" 00:00:00", loc)
 	for i := 0; i < len(series); i++ {
 		item := series[i]
 		for k, v := range item.MapCount {
 			row = sheet.AddRow()
 			row.AddCell().SetString(item.Name)
-			ti := theTime.Add(time.Minute*5*time.Duration(k))
+			ti := theTime.Add(time.Minute * 5 * time.Duration(k))
 			row.AddCell().SetString(fmt.Sprintf("%02d:%02d:%02d", ti.Hour(), ti.Minute(), ti.Second()))
 			row.AddCell().SetInt(v)
 		}
@@ -127,4 +132,4 @@ func Save_register_records(series []*tgSeries, user string) string {
 	}
 
 	return name
-}
+}

models/role.go

@@ -2,9 +2,10 @@ package models
 
 import (
 	"errors"
+	"log"
+
 	"github.com/astaxie/beego/orm"
 	"github.com/astaxie/beego/validation"
-	"log"
 )
 
 type Role struct {
@@ -42,7 +43,7 @@ func GetRolelist() (roles []orm.Params, count int64) {
 	return roles, count
 }
 
-//添加权限组
+// 添加权限组
 func AddRole(r *Role) (int64, error) {
 	if err := checkRole(r); err != nil {
 		return 0, err
@@ -56,7 +57,7 @@ func AddRole(r *Role) (int64, error) {
 	return id, err
 }
 
-//更新用户
+// 更新用户
 func UpdateRole(r *Role) (int64, error) {
 	if err := checkRole(r); err != nil {
 		return 0, err
@@ -92,3 +93,13 @@ func GetRoleById(id int64) (role *Role) {
 	}
 	return role
 }
+
+func GetRoleIdByName(name string) int64 {
+	role := &Role{Name: name}
+	o := orm.NewOrm()
+	err := o.Read(role, "Name")
+	if err != nil {
+		return -1
+	}
+	return role.Id
+}

models/user.go

@@ -49,6 +49,17 @@ func GetUserlist() (users []orm.Params, count int64) {
 	return users, count
 }
 
+// 主播类型
+func GetTypeUserList(name string) (users []orm.Params, count int64) {
+	roleId := GetRoleIdByName(name)
+	o := orm.NewOrm()
+	user := new(User)
+	qs := o.QueryTable(user).Filter("Role", roleId)
+	qs.Values(&users)
+	count, _ = qs.Count()
+	return users, count
+}
+
 // 添加用户
 func AddUser(u *User) (int64, error) {
 	if err := checkUser(u); err != nil {
@@ -166,3 +177,13 @@ func GetUserRoleName(username string) string {
 	}
 	return p.Name
 }
+
+// 账号是否主播
+func IsUserPromoter(username string) int {
+	roleName := GetUserRoleName(username)
+	status := 0
+	if roleName == "主播" {
+		status = 1
+	}
+	return status
+}

views/register.tpl

@@ -12,11 +12,18 @@
         <script src="http://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
         <script src="http://code.highcharts.com/highcharts.js"></script>
     </head>
-    <body onload="InitParams({{.Server_id}}, {{.Days}})">
+    <body onload="InitParams({{.SelectUserName}}, {{.Days}}, {{.Promoter}})">
+    <input type="text" id="token" value={{.token}} hidden=true>
     <div class="x-body layui-anim layui-anim-up">
         <blockquote class="layui-elem-quote">
-          指定服务器:<input id="server_id" type="text" name="服务器ID" />
-              
+          <label for="select_username" id="label_username">主播列表:</label>
+          <select name="" id="select_username" style="width:256px;">
+            <option value="">全部</option>
+            {{range .users}}
+              <option value={{.Username}}>{{.Username}}</option>
+            {{end}}
+          </select>
+          {{"       "}}
           过往天数:<input id="days" type="text" name="天数" />
           <br>
           <br>
@@ -87,19 +94,33 @@
         $('#container').highcharts(json);
       });
     
-      function InitParams(ServerId, Days) {
-        if (ServerId.length > 0) {
-            document.getElementById("server_id").value = ServerId;
+      var promoter = 0
+      function InitParams(SelectUserName, Days, Promoter) {
+        promoter = Promoter
+        if (SelectUserName.length > 0) {
+            var obj = document.getElementById("select_username");
+            if (obj.options.length > 0){
+              for (var i = 0; i < obj.options.length; i ++){
+                if (obj.options[i].value == SelectUserName) {
+                  obj.options[i].selected = true;
+                  break
+                }
+              }
+            }
         }
         if (Days != null && Days > 0) {
             document.getElementById("days").value = Days;
         }
+        if (promoter == 1){
+          document.getElementById("label_username").hidden = true
+          document.getElementById("select_username").hidden = true
+        }
       }
 
       function submitUpdate () {
-        var sid = document.getElementById("server_id").value;
+        var sid = document.getElementById("select_username").value;
         var days = document.getElementById("days").value;
-        var text = "server_id=" + encodeURI(sid) + "&days=" + encodeURI(days);
+        var text = "select_username=" + encodeURI(sid) + "&days=" + encodeURI(days);
         
         $.ajax({
           type:"get",
@@ -122,9 +143,9 @@
         });
       }
       function submitDownload () {
-        var sid = document.getElementById("server_id").value;
+        var sid = document.getElementById("select_username").value;
         var days = document.getElementById("days").value;
-        var text = "server_id=" + encodeURI(sid) + "&days=" + encodeURI(days) + "&querydata=register";
+        var text = "select_username=" + encodeURI(sid) + "&days=" + encodeURI(days) + "&querydata=register";
         
         $.ajax({
           type:"get",