add:增加用户信息和图表定位

controllers/chart.go

@@ -47,41 +47,3 @@ func (this *ChartController) List() {
 	br.Success = true
 	br.Ret = 200
 }
-
-// @Title List
-// @Description create users
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
-// @Success 200 {object} models.BaseResponse
-// @Failure 403 {object} models.BaseResponse
-// @router /my/list [get]
-func (this *ChartController) MyList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-
-	result, err := services.GetChartList(pageSize, currentIndex)
-	if err != nil {
-		br.Msg = "查询图表失败"
-		br.ErrMsg = "查询图表失败，系统异常，Err:" + err.Error()
-		return
-	}
-	if result.Ret != 200 {
-		br.Msg = "查询图表失败"
-		br.ErrMsg = result.ErrMsg
-		return
-	}
-	resp := new(response.ChartListResp)
-	resp.List = result.Data.List
-	resp.Paging = result.Data.Paging
-
-	br.Msg = "查询图表成功"
-	br.Data = result.Data
-	br.Success = true
-	br.Ret = 200
-}

controllers/my_chart.go

@@ -56,6 +56,7 @@ func (this *MyChartController) Collect() {
 		UniqueCode:   req.UniqueCode,
 		ChartImage:   req.ChartImage,
 		ChartName:    req.ChartName,
+		ChartInfoId:  req.ChartInfoId,
 		CreateTime:   time.Now(),
 		ModifyTime:   time.Now(),
 	}
@@ -180,6 +181,75 @@ func (this *MyChartController) List() {
 	br.Ret = 200
 }
 
+// @Title Locate
+// @Description create users
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
+// @Success 200 {object} models.BaseResponse
+// @Failure 403 {object} models.BaseResponse
+// @router /locate [get]
+func (this *MyChartController) Locate() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	user := this.User
+	total, err := models.GetMyChartListCountById(user.UserId)
+	if err != nil {
+		br.Msg = "查询收藏数量失败"
+		br.ErrMsg = "查询收藏数量失败,Err:" + err.Error()
+		return
+	}
+	charts := make([]*response.MyChartLocateItem, 0)
+	if total == 0 {
+		br.Data = charts
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		return
+	}
+	items, err := models.GetMyChartListById(user.UserId, 0, total)
+	if err != nil {
+		br.Msg = "查询收藏失败"
+		br.ErrMsg = "查询收藏失败,Err:" + err.Error()
+		return
+	}
+	for k, v := range items {
+		var prevChartInfoId, nextChartInfoId int
+		switch k {
+		case 0:
+			prevChartInfoId = -1
+			if k < total {
+				nextChartInfoId = items[k+1].ChartInfoId
+			}
+		case total - 1:
+			nextChartInfoId = -1
+			if k > 0 {
+				prevChartInfoId = items[k-1].ChartInfoId
+			}
+		default:
+			prevChartInfoId = items[k-1].ChartInfoId
+			nextChartInfoId = items[k+1].ChartInfoId
+
+		}
+		tmpChart := &response.MyChartLocateItem{
+			MyChartId:       v.MyChartId,
+			ChartInfoId:     v.ChartInfoId,
+			ChartName:       v.ChartName,
+			UniqueCode:      v.UniqueCode,
+			PrevChartInfoId: prevChartInfoId,
+			NextChartInfoId: nextChartInfoId,
+		}
+		charts = append(charts, tmpChart)
+	}
+
+	br.Data = charts
+	br.Msg = "查询成功"
+	br.Success = true
+	br.Ret = 200
+}
+
 // @Title IsCollect
 // @Description create users
 // @Param   PageSize   query   int  true       "每页数据条数"

controllers/user.go

@@ -367,3 +367,39 @@ func (this *UserController) AreaCodeList() {
 	br.Success = true
 	br.Msg = "获取成功"
 }
+
+// Info
+// @Title 用户信息
+// @Description 用户信息
+// @Success 200 Ret=200 获取成功
+// @router /info [get]
+func (this *UserAuthController) Info() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	user := this.User
+
+	if user == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，用户信息为空"
+		br.Ret = 408
+		return
+	}
+	userView := &models.UserView{
+		Headimgurl:   user.Headimgurl,
+		RealName:     user.RealName,
+		Phone:        user.Phone,
+		AreaCode:     user.AreaCode,
+		Email:        user.Email,
+		Componey:     user.Company,
+		Status:       user.Status,
+		ValidEndTime: user.ValidEndTime.Format(utils.FormatDate),
+	}
+
+	br.Data = userView
+	br.Msg = "查询成功"
+	br.Success = true
+	br.Ret = 200
+}

models/my_chart.go

@@ -11,6 +11,7 @@ type MyChart struct {
 	ChartName    string    `description:"图表名称"`   // 图表名称
 	UniqueCode   string    `description:"图表唯一编码"` // 图表唯一编码
 	ChartImage   string    `description:"图表图片"`   // 图表图片
+	ChartInfoId  int       `description:"图表id"`   // 图表图片
 	UserId       int       `description:"用户ID"`
 	UserRealName string    `description:"用户真实姓名"` // 真实姓名
 	CreateTime   time.Time `description:"创建时间"`

models/request/my_chart.go

@@ -1,9 +1,10 @@
 package request
 
 type MyChartCollectReq struct {
-	ChartName  string `description:"图表名称"`   // 图表名称
-	UniqueCode string `description:"图表唯一编码"` // 图表唯一编码
-	ChartImage string `description:"图表图片"`   // 图表图片
+	ChartName   string `description:"图表名称"`   // 图表名称
+	UniqueCode  string `description:"图表唯一编码"` // 图表唯一编码
+	ChartImage  string `description:"图表图片"`   // 图表图片
+	ChartInfoId int    `description:"图表id"`   // 图表id
 }
 type MyChartCollectCancelReq struct {
 	UniqueCode string `description:"图表唯一编码"` // 图表唯一编码

models/response/my_chart.go

@@ -14,3 +14,13 @@ type MyChartListResp struct {
 	List   []*models.MyChart  `description:"图表列表"`
 	Paging *paging.PagingItem `description:"分页信息"`
 }
+
+// MyChartLocateItem 用户图表定位
+type MyChartLocateItem struct {
+	MyChartId       int
+	ChartInfoId     int
+	ChartName       string
+	UniqueCode      string
+	PrevChartInfoId int
+	NextChartInfoId int
+}

models/user.go

@@ -61,6 +61,17 @@ type UserItem struct {
 	LastUpdateTime time.Time `description:"用户最近一次登录时间"`
 }
 
+type UserView struct {
+	Headimgurl   string `description:"用户头像，最后一个数值代表正方形头像大小（有0、46、64、96、132数值可选，0代表640*640正方形头像），用户没有头像时该项为空"`
+	RealName     string `description:"用户实际名称"`
+	Phone        string `description:"手机号码"`
+	AreaCode     string `description:"区号"`
+	Email        string `description:"邮箱"`
+	Componey     string `description:"所属公司"`
+	ValidEndTime string `description:"服务截至时间"`
+	Status       int    `description:"用户类型: 0表示禁用，1表示潜在客户，2表示正式客户"`
+}
+
 func GetUserByToken(token string) (item *User, err error) {
 	sql := `SELECT * FROM user WHERE access_token=? `
 	o := orm.NewOrm()

routers/commentsRouter.go

@@ -16,15 +16,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mini_api/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta/eta_mini_api/controllers:ChartController"],
-        beego.ControllerComments{
-            Method: "MyList",
-            Router: `/my/list`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_mini_api/controllers:ChartPermissionController"] = append(beego.GlobalControllerRouter["eta/eta_mini_api/controllers:ChartPermissionController"],
         beego.ControllerComments{
             Method: "List",
@@ -79,6 +70,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mini_api/controllers:MyChartController"] = append(beego.GlobalControllerRouter["eta/eta_mini_api/controllers:MyChartController"],
+        beego.ControllerComments{
+            Method: "Locate",
+            Router: `/locate`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mini_api/controllers:MyReportController"] = append(beego.GlobalControllerRouter["eta/eta_mini_api/controllers:MyReportController"],
         beego.ControllerComments{
             Method: "Collect",
@@ -151,6 +151,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mini_api/controllers:UserAuthController"] = append(beego.GlobalControllerRouter["eta/eta_mini_api/controllers:UserAuthController"],
+        beego.ControllerComments{
+            Method: "Info",
+            Router: `/info`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mini_api/controllers:UserAuthController"] = append(beego.GlobalControllerRouter["eta/eta_mini_api/controllers:UserAuthController"],
         beego.ControllerComments{
             Method: "Login",