Skip to content

N
nbya
Commit 8ac1a09e authored by haoyanbin's avatar haoyanbin
Browse files
Options

code

parent 840de153
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 34 deletions
app/mobile/apis/org_news.go
View file @ 8ac1a09e
package apis
import (
"fmt"
oDto "go-admin/app/operate/service/dto"
"github.com/gin-gonic/gin"
......@@ -55,7 +54,7 @@ func (e OrgNews) GetPage(c *gin.Context) {
err = sOrgAd.GetPage(&reqOrgAd, p, &listOrgAd, &countOrgAd)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取广告 失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
......@@ -64,7 +63,7 @@ func (e OrgNews) GetPage(c *gin.Context) {
err = s.GetPage(&req, p, &list, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取新闻 失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
var reply dto.OrgNewsGetPageReply
......@@ -100,7 +99,7 @@ func (e OrgNews) Get(c *gin.Context) {
p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取新闻失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
......
app/mobile/apis/org_player.go
View file @ 8ac1a09e
package apis
import (
"fmt"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
......@@ -49,7 +48,7 @@ func (e OrgPlayer) GetPage(c *gin.Context) {
err = s.GetPage(&req, p, &list, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球员 失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
......@@ -83,7 +82,7 @@ func (e OrgPlayer) Get(c *gin.Context) {
p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球员失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
......@@ -154,12 +153,16 @@ func (e OrgPlayer) GetInfo(c *gin.Context) {
p := actions.GetPermissionFromContext(c)
err = s.Get(&reqGet, p, &object)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球员失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
//获取当前时间范围的赛季id
seasonId := s.GetNowSeasonId()
if seasonId == "" {
e.Error(109, err, "未获取到数据")
return
}
reply := new(dto.OrgPlayerGetInfoReply)
reply.OrgPlayerInfo = object
......@@ -167,7 +170,7 @@ func (e OrgPlayer) GetInfo(c *gin.Context) {
replyDataAvg := dto.OrgMatchInfo{}
err = s.StatisticsScoringAvg("", seasonId, "avg", &replyDataAvg)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
reply.DataAvg = replyDataAvg
......@@ -175,7 +178,7 @@ func (e OrgPlayer) GetInfo(c *gin.Context) {
replyOrgMatchInfo := dto.OrgMatchInfo{}
err = s.StatisticsScoringAvg(strconv.Itoa(req.PlayerId), seasonId, "avg", &replyOrgMatchInfo)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
reply.OrgMatchInfo = replyOrgMatchInfo
......@@ -186,12 +189,11 @@ func (e OrgPlayer) GetInfo(c *gin.Context) {
replyGetRoundsScoring := make([]dto.OrgPlayerRoundsScoring, 0)
err = s.GetRoundsScoring(&req, matchId, &replyGetRoundsScoring, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
reply.RoundsScoring = replyGetRoundsScoring
//e.OK(reply, "查询成功")
e.PageOK(reply, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
}
......@@ -223,7 +225,7 @@ func (e OrgPlayer) GetOrgMatchSeason(c *gin.Context) {
var count int64
err = s.GetSeasonRoundsScoring(&req, matchId2, &replyGetRoundsScoring, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
e.PageOK(replyGetRoundsScoring, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
......@@ -259,10 +261,9 @@ func (e OrgPlayer) GetOrgMatchEvaluate(c *gin.Context) {
list := make([]dto.OrgPlayerGetOrgMatchEvaluateReply, 0)
var count int64
//p := actions.GetPermissionFromContext(c)
err = s.GetOrgMatchEvaluate(&req, &list, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球员失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
......@@ -294,10 +295,9 @@ func (e OrgPlayer) GetOrgMatchEvaluateContent(c *gin.Context) {
list := make([]dto.OrgPlayerGetOrgMatchEvaluateContentReply, 0)
var count int64
//p := actions.GetPermissionFromContext(c)
err = s.GetOrgMatchEvaluateContent(&req, &list, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球员失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
......@@ -329,10 +329,9 @@ func (e OrgPlayer) GetOrgRounds(c *gin.Context) {
list := make([]dto.GetRoundsReply, 0)
var count int64
//p := actions.GetPermissionFromContext(c)
err = s.GetOrgRounds(&req, &list, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球员失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
......
app/mobile/apis/org_player_rank.go
View file @ 8ac1a09e
package apis
import (
"fmt"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
......@@ -46,7 +45,7 @@ func (e OrgPlayerRank) GetPage(c *gin.Context) {
err = s.GetPage(&req, p, &list, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球队 失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
......@@ -59,7 +58,7 @@ func (e OrgPlayerRank) GetPage(c *gin.Context) {
reqOwn.PageSize = 9999
err = s.GetPageOwn(&reqOwn, p, &listOwn, &countOwn)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球队 失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
......@@ -100,7 +99,7 @@ func (e OrgPlayerRank) GetPageTeam(c *gin.Context) {
err = s.GetPageTeam(&req, p, &list, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球队 失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
......@@ -133,13 +132,25 @@ func (e OrgPlayerRank) GetPageTeamInfo(c *gin.Context) {
sPlayer := service.OrgPlayer{}
e.MakeContext(c).MakeOrm().MakeService(&sPlayer.Service)
req.SeasonId = sPlayer.GetNowSeasonId()
if req.SeasonId == "" {
e.Error(109, err, "未获取到数据")
return
}
reply := dto.OrgPlayerRankInfoGetReply{}
//获取基本信息
err = s.GetTeamInfoData(req.TeamId, req.SeasonId, &reply)
if err != nil {
e.Error(109, err, "未获取到数据")
return
}
//获取排名数据
err = s.GetRankTeamInfo(req.TeamId, req.SeasonId, &reply)
if err != nil {
e.Error(109, err, "未获取到数据")
return
}
//获取平均值数据
list := make([]dto.OrgPlayerRankGetPageReply, 0)
......@@ -147,7 +158,7 @@ func (e OrgPlayerRank) GetPageTeamInfo(c *gin.Context) {
err = s.GetPageTeamInfo(req.TeamId, req.SeasonId, &list, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球队 失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
......@@ -177,6 +188,10 @@ func (e OrgPlayerRank) GetPageTeamInfo(c *gin.Context) {
//获取球员列表
replyPlayerList := make([]dto.OrgPlayerGetPageReply, 0)
err = s.GetTeamInfoPlayerList(req.TeamId, &replyPlayerList)
if err != nil {
e.Error(109, err, "未获取到数据")
return
}
reply.PlayerList = replyPlayerList
e.OK(reply, "查询成功")
......@@ -210,7 +225,7 @@ func (e OrgPlayerRank) GetPageLeague(c *gin.Context) {
err = s.GetPage(&req, p, &list, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取联赛 失败，\r\n失败信息 %s", err.Error()))
e.Error(109, err, "未获取到数据")
return
}
......
app/mobile/apis/org_player_user.go
View file @ 8ac1a09e
......@@ -60,13 +60,19 @@ func (e OrgPlayerUser) GetMsg(c *gin.Context) {
Errors
if errMsg != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
e.Error(106, err, "发送验证码失败")
return
}
reqMsg.Username = req.Username
reqMsg.Code = code
reqMsg.MsgType = "1"
err = sMsg.Insert(&reqMsg)
if err != nil {
e.Logger.Error(err)
e.Error(106, err, "发送验证码失败")
return
}
smsText := "您的验证码为：" + code
if result := utils.SendMobileMsg(req.Username, smsText); result.Status == 0 {
......@@ -75,7 +81,7 @@ func (e OrgPlayerUser) GetMsg(c *gin.Context) {
return
} else {
e.Logger.Error(err)
e.Error(500, err, "发送失败")
e.Error(106, err, "发送验证码失败")
return
}
......@@ -122,7 +128,7 @@ func (e OrgPlayerUser) Login(c *gin.Context) {
Errors
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
e.Error(107, err, "验证码校验失败")
return
}
reqMsg.Username = req.Username
......@@ -135,11 +141,17 @@ func (e OrgPlayerUser) Login(c *gin.Context) {
return
}
sMsg.Remove(req.Username)
err = sMsg.Remove(req.Username)
//自建token生成
reply := new(dto.LoginReply)
token, _ := utils.GenToken(int64(data.Id))
token, err := utils.GenToken(int64(data.Id))
if err != nil {
e.Logger.Error(err)
e.Error(108, err, "生成token失败")
return
}
reply.Token = token
reply.PlayerUserId = strconv.Itoa(data.Id)
......
app/operate/apis/org_upload.go
View file @ 8ac1a09e
......@@ -16,10 +16,10 @@ type OrgUpload struct {
api.Api
}
// GetPage <俱乐部>获取俱乐部列表
// @Summary <俱乐部>获取俱乐部列表
// @Description <俱乐部>获取俱乐部列表
// @Tags <俱乐部>俱乐部
// GetPage <org>上传图片
// @Summary <org>上传图片
// @Description <org>上传图片
// @Tags <org>通用
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgClubGetPageReq true "data"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment