diff --git a/app/mobile/apis/org_player_rank.go b/app/mobile/apis/org_player_rank.go index 15aa30b9ec55428d445fcd14588da589f336ed52..2a44154673835a99407003c60826e121bbf57909 100755 --- a/app/mobile/apis/org_player_rank.go +++ b/app/mobile/apis/org_player_rank.go @@ -2,7 +2,6 @@ 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" @@ -89,3 +88,38 @@ func (e OrgPlayerRank) GetPageTeam(c *gin.Context) { e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询æˆåŠŸ") } + +// GetPage <手机端>获å–è”赛列表 +// @Summary <手机端>获å–è”赛列表 +// @Description <手机端>获å–è”赛列表 +// @Tags <手机端>è”赛列表 +// @Param data body dto.OrgLeagueGetPageReq true "data" +// @Success 200 {string} string "{"code": 200, "data": [...]}" +// @Router /api/v1/org-player-rank/league [get] +// @Security Bearer +func (e OrgPlayerRank) GetPageLeague(c *gin.Context) { + req := dto.OrgLeagueGetPageReq{} + s := service.OrgLeague{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + p := actions.GetPermissionFromContext(c) + list := make([]dto.OrgLeagueGetPageReply, 0) + var count int64 + + err = s.GetPage(&req, p, &list, &count) + if err != nil { + e.Error(500, err, fmt.Sprintf("获å–è”èµ› 失败,\r\nå¤±è´¥ä¿¡æ¯ %s", err.Error())) + return + } + + e.PageOK(list, int(count), 1, 999, "查询æˆåŠŸ") +} diff --git a/app/mobile/router/org_player_rank.go b/app/mobile/router/org_player_rank.go index d41e22e83844400b3ced45bd5dad55a5d61182c3..2eddc5be311caa767c369e346264fdced6ae4900 100755 --- a/app/mobile/router/org_player_rank.go +++ b/app/mobile/router/org_player_rank.go @@ -16,5 +16,6 @@ func registerOrgPlayerRankRouter(v1 *gin.RouterGroup) { { r.GET("", api.GetPage) r.GET("/team", api.GetPageTeam) + r.GET("/league", api.GetPageLeague) } } diff --git a/app/mobile/service/dto/org_league.go b/app/mobile/service/dto/org_league.go index a9b49f916f6697c4b426c9f617bcad29cf43300c..9d49f410b22910e378e157efcb3b4f3e40256745 100755 --- a/app/mobile/service/dto/org_league.go +++ b/app/mobile/service/dto/org_league.go @@ -2,25 +2,16 @@ package dto import ( "go-admin/app/operate/models" - "go-admin/common/dto" common "go-admin/common/models" - "time" ) type OrgLeagueGetPageReq struct { - dto.Pagination `search:"-"` - OrgLeagueOrder + PlayerId string `form:"playerId" json:"playerId" comment:""` // } -type OrgLeagueOrder struct {Id int `form:"idOrder" search:"type:order;column:id;table:org_league"` - LeagueName string `form:"leagueNameOrder" search:"type:order;column:league_name;table:org_league"` - Status string `form:"statusOrder" search:"type:order;column:status;table:org_league"` - CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_league"` - UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_league"` - CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_league"` - UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_league"` - DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_league"` - +type OrgLeagueGetPageReply struct { + Id string `json:"id" comment:""` // + LeagueName string `json:"leagueName" comment:"è”赛级别"` } func (m *OrgLeagueGetPageReq) GetNeedSearch() interface{} { @@ -28,18 +19,18 @@ func (m *OrgLeagueGetPageReq) GetNeedSearch() interface{} { } type OrgLeagueInsertReq struct { - Id int `json:"-" comment:""` // - LeagueName string `json:"leagueName" comment:"è”赛级别"` - Status string `json:"status" comment:"è”赛开å¯çŠ¶æ€ 1 是 0 å¦"` - common.ControlBy + Id int `json:"-" comment:""` // + LeagueName string `json:"leagueName" comment:"è”赛级别"` + Status string `json:"status" comment:"è”赛开å¯çŠ¶æ€ 1 是 0 å¦"` + common.ControlBy } -func (s *OrgLeagueInsertReq) Generate(model *models.OrgLeague) { - if s.Id == 0 { - model.Model = common.Model{ Id: s.Id } - } - model.LeagueName = s.LeagueName - model.Status = s.Status +func (s *OrgLeagueInsertReq) Generate(model *models.OrgLeague) { + if s.Id == 0 { + model.Model = common.Model{Id: s.Id} + } + model.LeagueName = s.LeagueName + model.Status = s.Status } func (s *OrgLeagueInsertReq) GetId() interface{} { @@ -47,18 +38,18 @@ func (s *OrgLeagueInsertReq) GetId() interface{} { } type OrgLeagueUpdateReq struct { - Id int `uri:"id" comment:""` // - LeagueName string `json:"leagueName" comment:"è”赛级别"` - Status string `json:"status" comment:"è”赛开å¯çŠ¶æ€ 1 是 0 å¦"` - common.ControlBy + Id int `uri:"id" comment:""` // + LeagueName string `json:"leagueName" comment:"è”赛级别"` + Status string `json:"status" comment:"è”赛开å¯çŠ¶æ€ 1 是 0 å¦"` + common.ControlBy } -func (s *OrgLeagueUpdateReq) Generate(model *models.OrgLeague) { - if s.Id == 0 { - model.Model = common.Model{ Id: s.Id } - } - model.LeagueName = s.LeagueName - model.Status = s.Status +func (s *OrgLeagueUpdateReq) Generate(model *models.OrgLeague) { + if s.Id == 0 { + model.Model = common.Model{Id: s.Id} + } + model.LeagueName = s.LeagueName + model.Status = s.Status } func (s *OrgLeagueUpdateReq) GetId() interface{} { @@ -67,8 +58,9 @@ func (s *OrgLeagueUpdateReq) GetId() interface{} { // OrgLeagueGetReq 功能获å–è¯·æ±‚å‚æ•° type OrgLeagueGetReq struct { - Id int `uri:"id"` + Id int `uri:"id"` } + func (s *OrgLeagueGetReq) GetId() interface{} { return s.Id } @@ -80,4 +72,4 @@ type OrgLeagueDeleteReq struct { func (s *OrgLeagueDeleteReq) GetId() interface{} { return s.Ids -} \ No newline at end of file +} diff --git a/app/mobile/service/org_league.go b/app/mobile/service/org_league.go index 40702403739cf19164075b6e6838f48d67d71192..84bd5343c0177515febd31df6d0a2af9d0410ef7 100755 --- a/app/mobile/service/org_league.go +++ b/app/mobile/service/org_league.go @@ -2,14 +2,12 @@ package service import ( "errors" - - "github.com/go-admin-team/go-admin-core/sdk/service" + "github.com/go-admin-team/go-admin-core/sdk/service" "gorm.io/gorm" + "go-admin/app/mobile/service/dto" "go-admin/app/operate/models" - "go-admin/app/operate/service/dto" "go-admin/common/actions" - cDto "go-admin/common/dto" ) type OrgLeague struct { @@ -17,17 +15,37 @@ type OrgLeague struct { } // GetPage 获å–OrgLeague列表 -func (e *OrgLeague) GetPage(c *dto.OrgLeagueGetPageReq, p *actions.DataPermission, list *[]models.OrgLeague, count *int64) error { +func (e *OrgLeague) GetPage(c *dto.OrgLeagueGetPageReq, p *actions.DataPermission, list *[]dto.OrgLeagueGetPageReply, count *int64) error { var err error - var data models.OrgLeague - err = e.Orm.Model(&data). - Scopes( - cDto.MakeCondition(c.GetNeedSearch()), - cDto.Paginate(c.GetPageSize(), c.GetPageIndex()), - actions.Permission(data.TableName(), p), - ). - Find(list).Limit(-1).Offset(-1). + err = e.Orm.Table("org_match_team_player as omtp"). + Select("ol.id, ol.league_name"). + Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds"). + Joins("left join org_league as ol on ol.id = om.league_id"). + Where("ol.status=?", 1). + Where("omtp.player_id=?", c.PlayerId). + Group("om.league_id"). + Find(list). + Count(count).Error + if err != nil { + e.Log.Errorf("OrgLeagueService GetPage error:%s \r\n", err) + return err + } + return nil +} + +// GetPage 获å–OrgLeague列表 +func (e *OrgLeague) GetPageForOwn(c *dto.OrgLeagueGetPageReq, p *actions.DataPermission, list *[]dto.OrgLeagueGetPageReply, count *int64) error { + var err error + + err = e.Orm.Table("org_match_team_player as omtp"). + Select("ol.id, ol.league_name"). + Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds"). + Joins("left join org_league as ol on ol.id = om.league_id"). + Where("ol.status=?", 1). + Where("omtp.player_id=?", c.PlayerId). + Group("om.league_id"). + Find(list). Count(count).Error if err != nil { e.Log.Errorf("OrgLeagueService GetPage error:%s \r\n", err) @@ -59,9 +77,9 @@ func (e *OrgLeague) Get(d *dto.OrgLeagueGetReq, p *actions.DataPermission, model // Insert 创建OrgLeague对象 func (e *OrgLeague) Insert(c *dto.OrgLeagueInsertReq) error { - var err error - var data models.OrgLeague - c.Generate(&data) + var err error + var data models.OrgLeague + c.Generate(&data) err = e.Orm.Create(&data).Error if err != nil { e.Log.Errorf("OrgLeagueService Insert error:%s \r\n", err) @@ -72,22 +90,22 @@ func (e *OrgLeague) Insert(c *dto.OrgLeagueInsertReq) error { // Update 修改OrgLeague对象 func (e *OrgLeague) Update(c *dto.OrgLeagueUpdateReq, p *actions.DataPermission) error { - var err error - var data = models.OrgLeague{} - e.Orm.Scopes( - actions.Permission(data.TableName(), p), - ).First(&data, c.GetId()) - c.Generate(&data) + var err error + var data = models.OrgLeague{} + e.Orm.Scopes( + actions.Permission(data.TableName(), p), + ).First(&data, c.GetId()) + c.Generate(&data) - db := e.Orm.Save(&data) - if db.Error != nil { - e.Log.Errorf("OrgLeagueService Save error:%s \r\n", err) - return err - } - if db.RowsAffected == 0 { - return errors.New("æ— æƒæ›´æ–°è¯¥æ•°æ®") - } - return nil + db := e.Orm.Save(&data) + if db.Error != nil { + e.Log.Errorf("OrgLeagueService Save error:%s \r\n", err) + return err + } + if db.RowsAffected == 0 { + return errors.New("æ— æƒæ›´æ–°è¯¥æ•°æ®") + } + return nil } // Remove åˆ é™¤OrgLeague @@ -99,11 +117,11 @@ func (e *OrgLeague) Remove(d *dto.OrgLeagueDeleteReq, p *actions.DataPermission) actions.Permission(data.TableName(), p), ).Delete(&data, d.GetId()) if err := db.Error; err != nil { - e.Log.Errorf("Service RemoveOrgLeague error:%s \r\n", err) - return err - } - if db.RowsAffected == 0 { - return errors.New("æ— æƒåˆ 除该数æ®") - } + e.Log.Errorf("Service RemoveOrgLeague error:%s \r\n", err) + return err + } + if db.RowsAffected == 0 { + return errors.New("æ— æƒåˆ 除该数æ®") + } return nil -} \ No newline at end of file +}