Skip to content

N
nbya
Commit 89cd0fa7 authored by haoyanbin's avatar haoyanbin
Browse files
Options

1

parent 98b9c2b8
Hide whitespace changes
Inline Side-by-side
Showing with 231 additions and 140 deletions
app/operate/apis/org_club_player.go
View file @ 89cd0fa7
......@@ -25,7 +25,7 @@ type OrgClubPlayer struct {
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-player [get]
// @Router /api/v1/org-club-player [get]
// @Security Bearer
func (e OrgClubPlayer) GetPage(c *gin.Context) {
req := dto.OrgClubPlayerGetPageReq{}
......@@ -77,6 +77,12 @@ func (e OrgClubPlayer) GetPageMatch(c *gin.Context) {
return
}
if req.Id == "" {
e.Logger.Error(err)
e.Error(500, err, "id不得为空")
return
}
p := actions.GetPermissionFromContext(c)
reply := new(dto.GetPageMatchReply)
......
app/operate/apis/org_team.go
View file @ 89cd0fa7
......@@ -76,29 +76,36 @@ func (e OrgTeam) Get(c *gin.Context) {
e.Error(500, err, err.Error())
return
}
var object models.OrgTeam
var object dto.OrgTeamGetPageReply
p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球队失败，\r\n失败信息 %s", err.Error()))
return
}
if object.ClubId == "" {
if req.GetId() == 0 {
sOrgClubUser := service.OrgClubUser{}
_, object.ClubId = sOrgClubUser.GetClubId(user.GetUserId(c))
}
e.MakeContext(c).MakeOrm().MakeService(&sOrgClubUser.Service)
reqClub := dto.OrgClubGetReq{}
sClub := service.OrgClub{}
var objectClub models.OrgClub
_, object.ClubId = sOrgClubUser.GetClubId(user.GetUserId(c))
reqClub.Id, _ = strconv.Atoi(object.ClubId)
err = sClub.Get(&reqClub, p, &objectClub)
reqClub := dto.OrgClubGetReq{}
sClub := service.OrgClub{}
e.MakeContext(c).MakeOrm().MakeService(&sClub.Service)
var objectClub models.OrgClub
reqClub.Id, _ = strconv.Atoi(object.ClubId)
err = sClub.Get(&reqClub, p, &objectClub)
object.ClubName = objectClub.ClubName
} else {
err = s.Get(&req, p, &object)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球队失败，\r\n失败信息 %s", err.Error()))
return
}
}
reply := dto.OrgTeamGetReply{}
reply.ClubId = object.ClubId
reply.ClubName = objectClub.ClubName
reply.ClubName = object.ClubName
reply.TeamName = object.TeamName
e.OK(object, "查询成功")
......
app/operate/apis/org_team_team.go
View file @ 89cd0fa7
......@@ -7,7 +7,6 @@ import (
"github.com/go-admin-team/go-admin-core/sdk/api"
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"go-admin/app/operate/models"
"go-admin/app/operate/service"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
......@@ -98,26 +97,26 @@ func (e OrgTeamTeam) GetPageMatch(c *gin.Context) {
// @Router /api/v1/org-team-team/{id} [get]
// @Security Bearer
func (e OrgTeamTeam) Get(c *gin.Context) {
req := dto.OrgTeamGetReq{}
s := service.OrgTeam{}
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
}
var object models.OrgTeam
p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球队失败，\r\n失败信息 %s", err.Error()))
return
}
//req := dto.OrgTeamGetReq{}
//s := service.OrgTeam{}
//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
//}
//var object models.OrgTeam
//
//p := actions.GetPermissionFromContext(c)
//err = s.Get(&req, p, &object)
//if err != nil {
// e.Error(500, err, fmt.Sprintf("获取球队失败，\r\n失败信息 %s", err.Error()))
// return
//}
e.OK(object, "查询成功")
//e.OK(object, "查询成功")
}
app/operate/service/dto/org_club_team.go
View file @ 89cd0fa7
......@@ -15,6 +15,7 @@ type OrgClubTeamGetPageReq struct {
}
type OrgClubTeamGetPageReply struct {
Id string `json:"id"`
TeamId string `json:"teamId"`
Rank string `json:"rank"`
LeagueName string `json:"leagueName"`
......
app/operate/service/dto/org_team.go
View file @ 89cd0fa7
......@@ -16,6 +16,7 @@ type OrgTeamGetPageReq struct {
type OrgTeamGetPageReply struct {
Id string `json:"id" comment:"球队id"` //球队id
ClubId string `json:"clubId" comment:"俱乐部id"`
ClubName string `json:"clubName" comment:"俱乐部名称"`
TeamName string `json:"teamName" comment:"球队名称"`
CreatedAt string `json:"createdAt" comment:"球队创建时间"`
......
app/operate/service/org_club_player.go
View file @ 89cd0fa7
......@@ -22,7 +22,9 @@ func (e *OrgClubPlayer) GetPage(c *dto.OrgClubPlayerGetPageReq, p *actions.DataP
var err error
err = e.Orm.Table("org_match_team_player as omtp").
Select("omtp.id, ol.league_name, os.season_name, om.rounds, omtp.player_name").
Select("omtp.id, ol.league_name, os.season_name, om.rounds, omtp.player_name, omtp.player_number,omtp.position,"+
"omtp.scoring, omtp.scoring, omtp.rebound, omtp.assist, omtp.steal, omtp.free_throw, "+
"omtp.block_shot, omtp.foul, omtp.two_point_shot, omtp.three_point_shot").
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").
Joins("left join org_season as os on os.id = om.season_id").
......
app/operate/service/org_club_team.go
View file @ 89cd0fa7
......@@ -131,17 +131,17 @@ func (e *OrgClubTeam) statisticsScoring(teamId string, rounds string, seasonId s
var err error
field := ""
if statistics == "sum" {
field += "sum(omtp.scoring)as scoring," +
"sum(omtp.rebound)as rebound," +
"sum(omtp.assist)as assist," +
"sum(omtp.steal)as steal," +
"sum(omtp.free_throw)as free_throw," +
"sum(omtp.block_shot)as block_shot," +
"sum(omtp.foul)as foul," +
"sum(omtp.two_point_shot)as two_point_shot," +
"sum(omtp.three_point_shot)as three_point_shot"
}
//if statistics == "sum" {
field += "sum(omtp.scoring)as scoring," +
"sum(omtp.rebound)as rebound," +
"sum(omtp.assist)as assist," +
"sum(omtp.steal)as steal," +
"sum(omtp.free_throw)as free_throw," +
"sum(omtp.block_shot)as block_shot," +
"sum(omtp.foul)as foul," +
"sum(omtp.two_point_shot)as two_point_shot," +
"sum(omtp.three_point_shot)as three_point_shot"
//}
err = e.Orm.Table("org_match_team_player as omtp").
Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds").
......@@ -151,7 +151,13 @@ func (e *OrgClubTeam) statisticsScoring(teamId string, rounds string, seasonId s
First(data).Error
if statistics == "avg" {
_, _, teamCount := e.GetPageForTeam(seasonId)
var teamCount int64 = 0
err = e.Orm.Table("org_match_team_player as omtp").
Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds").
Select(field).
Scopes(cDto.SetWhere("om", "season_id", seasonId)).
Count(&teamCount).Error
//_, _, teamCount := e.GetPageForTeam(seasonId)
data.Scoring = utils.GetAvg(data.Scoring, teamCount)
data.Rebound = utils.GetAvg(data.Rebound, teamCount)
......@@ -222,7 +228,7 @@ func (e *OrgClubTeam) rankingScoring(replyGetPlayerRank []models.OrgMatchTeamPla
return replyGetPlayerRank[i].Scoring > replyGetPlayerRank[j].Scoring
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
if v.TeamId == playerId {
scoring.Scoring = strconv.Itoa(k + 1)
}
}
......@@ -232,7 +238,7 @@ func (e *OrgClubTeam) rankingRebound(replyGetPlayerRank []models.OrgMatchTeamPla
return replyGetPlayerRank[i].Rebound > replyGetPlayerRank[j].Rebound
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
if v.TeamId == playerId {
scoring.Rebound = strconv.Itoa(k + 1)
}
}
......@@ -242,7 +248,7 @@ func (e *OrgClubTeam) rankingAssist(replyGetPlayerRank []models.OrgMatchTeamPlay
return replyGetPlayerRank[i].Assist > replyGetPlayerRank[j].Assist
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
if v.TeamId == playerId {
scoring.Assist = strconv.Itoa(k + 1)
}
}
......@@ -252,7 +258,7 @@ func (e *OrgClubTeam) rankingSteal(replyGetPlayerRank []models.OrgMatchTeamPlaye
return replyGetPlayerRank[i].Steal > replyGetPlayerRank[j].Steal
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
if v.TeamId == playerId {
scoring.Steal = strconv.Itoa(k + 1)
}
}
......@@ -262,7 +268,7 @@ func (e *OrgClubTeam) rankingFreeThrow(replyGetPlayerRank []models.OrgMatchTeamP
return replyGetPlayerRank[i].FreeThrow > replyGetPlayerRank[j].FreeThrow
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
if v.TeamId == playerId {
scoring.FreeThrow = strconv.Itoa(k + 1)
}
}
......@@ -272,7 +278,7 @@ func (e *OrgClubTeam) rankingBlockShot(replyGetPlayerRank []models.OrgMatchTeamP
return replyGetPlayerRank[i].BlockShot > replyGetPlayerRank[j].BlockShot
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
if v.TeamId == playerId {
scoring.BlockShot = strconv.Itoa(k + 1)
}
}
......@@ -282,7 +288,7 @@ func (e *OrgClubTeam) rankingFoul(replyGetPlayerRank []models.OrgMatchTeamPlayer
return replyGetPlayerRank[i].Foul > replyGetPlayerRank[j].Foul
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
if v.TeamId == playerId {
scoring.Foul = strconv.Itoa(k + 1)
}
}
......@@ -292,7 +298,7 @@ func (e *OrgClubTeam) rankingTwoPointShot(replyGetPlayerRank []models.OrgMatchTe
return replyGetPlayerRank[i].TwoPointShot > replyGetPlayerRank[j].TwoPointShot
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
if v.TeamId == playerId {
scoring.TwoPointShot = strconv.Itoa(k + 1)
}
}
......@@ -302,7 +308,7 @@ func (e *OrgClubTeam) rankingThreePointShot(replyGetPlayerRank []models.OrgMatch
return replyGetPlayerRank[i].ThreePointShot > replyGetPlayerRank[j].ThreePointShot
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
if v.TeamId == playerId {
scoring.ThreePointShot = strconv.Itoa(k + 1)
}
}
......@@ -310,7 +316,7 @@ func (e *OrgClubTeam) rankingThreePointShot(replyGetPlayerRank []models.OrgMatch
func (e *OrgClubTeam) statisticsRanking(seasonId string, data *[]models.OrgMatchTeamPlayer) error {
var err error
field := "team_id," +
field := "omtp.team_id," +
"sum(omtp.scoring)as scoring," +
"sum(omtp.rebound)as rebound," +
"sum(omtp.assist)as assist," +
......@@ -324,7 +330,7 @@ func (e *OrgClubTeam) statisticsRanking(seasonId string, data *[]models.OrgMatch
Select(field).
Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds").
Where("om.season_id = ?", seasonId).
Group("team_id").
Group("omtp.team_id").
Find(&data).Error
if err != nil {
......
app/operate/service/org_team.go
View file @ 89cd0fa7
......@@ -22,7 +22,7 @@ func (e *OrgTeam) GetPage(c *dto.OrgTeamGetPageReq, p *actions.DataPermission, l
var data models.OrgTeam
err = e.Orm.Table("org_team as ot").
Select("ot.id,oc.club_name,ot.team_name,ot.created_at").
Select("ot.id,oc.id as club_id,oc.club_name,ot.team_name,ot.created_at").
Joins("left join org_club as oc on ot.club_id=oc.id").
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
......@@ -39,10 +39,12 @@ func (e *OrgTeam) GetPage(c *dto.OrgTeamGetPageReq, p *actions.DataPermission, l
}
// Get 获取OrgTeam对象
func (e *OrgTeam) Get(d *dto.OrgTeamGetReq, p *actions.DataPermission, model *models.OrgTeam) error {
func (e *OrgTeam) Get(d *dto.OrgTeamGetReq, p *actions.DataPermission, model *dto.OrgTeamGetPageReply) error {
var data models.OrgTeam
err := e.Orm.Model(&data).
err := e.Orm.Table("org_team as ot").
Select("ot.id,oc.id as club_id,oc.club_name,ot.team_name,ot.created_at").
Joins("left join org_club as oc on ot.club_id=oc.id").
Scopes(
actions.Permission(data.TableName(), p),
).
......
common/utils/common.go
View file @ 89cd0fa7
package utils
import "strconv"
import (
"fmt"
"strconv"
)
func StringToInt(data string) int {
reply, _ := strconv.Atoi(data)
......@@ -8,5 +11,7 @@ func StringToInt(data string) int {
}
func GetAvg(data string, count int64) string {
return strconv.Itoa(StringToInt(data) / int(count))
floatData, _ := strconv.ParseFloat(data, 64)
res := fmt.Sprintf("%.2f", floatData/float64(count))
return res
}
docs/docs.go
View file @ 89cd0fa7
......@@ -1309,6 +1309,42 @@ var doc = `{
}
}
},
"/api/v1/org-club-player": {
"get": {
"security": [
{
"Bearer": []
}
],
"description": "\u003c俱乐部\u003e获取球员数据列表",
"tags": [
"\u003c俱乐部\u003e球员"
],
"summary": "\u003c俱乐部\u003e获取球员数据列表",
"parameters": [
{
"type": "integer",
"description": "页条数",
"name": "pageSize",
"in": "query"
},
{
"type": "integer",
"description": "页码",
"name": "pageIndex",
"in": "query"
}
],
"responses": {
"200": {
"description": "{\"code\": 200, \"data\": [...]}",
"schema": {
"type": "string"
}
}
}
}
},
"/api/v1/org-club-player/get": {
"get": {
"security": [
......@@ -2893,11 +2929,11 @@ var doc = `{
"Bearer": []
}
],
"description": "\u003c俱乐部\u003e获取球员数据列表",
"description": "\u003c球队\u003e获取球员列表",
"tags": [
"\u003c俱乐部\u003e球员"
"\u003c球队\u003e球员"
],
"summary": "\u003c俱乐部\u003e获取球员数据列表",
"summary": "\u003c球队\u003e获取球员列表",
"parameters": [
{
"type": "integer",
......@@ -8402,12 +8438,21 @@ var doc = `{
"models.SysDept": {
"type": "object",
"properties": {
"children": {
"type": "array",
"items": {
"$ref": "#/definitions/models.SysDept"
}
},
"createBy": {
"type": "integer"
},
"createdAt": {
"type": "string"
},
"dataScope": {
"type": "string"
},
"deptId": {
"description": "部门编码",
"type": "integer"
......@@ -8427,6 +8472,9 @@ var doc = `{
"description": "负责人",
"type": "string"
},
"params": {
"type": "string"
},
"parentId": {
"description": "上级部门",
"type": "integer"
......@@ -8457,21 +8505,9 @@ var doc = `{
"action": {
"type": "string"
},
"apis": {
"type": "array",
"items": {
"type": "integer"
}
},
"breadcrumb": {
"type": "string"
},
"children": {
"type": "array",
"items": {
"$ref": "#/definitions/models.SysMenu"
}
},
"component": {
"type": "string"
},
......@@ -8481,18 +8517,12 @@ var doc = `{
"createdAt": {
"type": "string"
},
"dataScope": {
"type": "string"
},
"icon": {
"type": "string"
},
"isFrame": {
"type": "string"
},
"is_select": {
"type": "boolean"
},
"menuId": {
"type": "integer"
},
......@@ -8505,9 +8535,6 @@ var doc = `{
"noCache": {
"type": "boolean"
},
"params": {
"type": "string"
},
"parentId": {
"type": "integer"
},
......@@ -8520,9 +8547,6 @@ var doc = `{
"permission": {
"type": "string"
},
"roleId": {
"type": "integer"
},
"sort": {
"type": "integer"
},
......
docs/swagger.json
View file @ 89cd0fa7
......@@ -1292,6 +1292,42 @@
}
}
},
"/api/v1/org-club-player": {
"get": {
"security": [
{
"Bearer": []
}
],
"description": "\u003c俱乐部\u003e获取球员数据列表",
"tags": [
"\u003c俱乐部\u003e球员"
],
"summary": "\u003c俱乐部\u003e获取球员数据列表",
"parameters": [
{
"type": "integer",
"description": "页条数",
"name": "pageSize",
"in": "query"
},
{
"type": "integer",
"description": "页码",
"name": "pageIndex",
"in": "query"
}
],
"responses": {
"200": {
"description": "{\"code\": 200, \"data\": [...]}",
"schema": {
"type": "string"
}
}
}
}
},
"/api/v1/org-club-player/get": {
"get": {
"security": [
......@@ -2876,11 +2912,11 @@
"Bearer": []
}
],
"description": "\u003c俱乐部\u003e获取球员数据列表",
"description": "\u003c球队\u003e获取球员列表",
"tags": [
"\u003c俱乐部\u003e球员"
"\u003c球队\u003e球员"
],
"summary": "\u003c俱乐部\u003e获取球员数据列表",
"summary": "\u003c球队\u003e获取球员列表",
"parameters": [
{
"type": "integer",
......@@ -8385,12 +8421,21 @@
"models.SysDept": {
"type": "object",
"properties": {
"children": {
"type": "array",
"items": {
"$ref": "#/definitions/models.SysDept"
}
},
"createBy": {
"type": "integer"
},
"createdAt": {
"type": "string"
},
"dataScope": {
"type": "string"
},
"deptId": {
"description": "部门编码",
"type": "integer"
......@@ -8410,6 +8455,9 @@
"description": "负责人",
"type": "string"
},
"params": {
"type": "string"
},
"parentId": {
"description": "上级部门",
"type": "integer"
......@@ -8440,21 +8488,9 @@
"action": {
"type": "string"
},
"apis": {
"type": "array",
"items": {
"type": "integer"
}
},
"breadcrumb": {
"type": "string"
},
"children": {
"type": "array",
"items": {
"$ref": "#/definitions/models.SysMenu"
}
},
"component": {
"type": "string"
},
......@@ -8464,18 +8500,12 @@
"createdAt": {
"type": "string"
},
"dataScope": {
"type": "string"
},
"icon": {
"type": "string"
},
"isFrame": {
"type": "string"
},
"is_select": {
"type": "boolean"
},
"menuId": {
"type": "integer"
},
......@@ -8488,9 +8518,6 @@
"noCache": {
"type": "boolean"
},
"params": {
"type": "string"
},
"parentId": {
"type": "integer"
},
......@@ -8503,9 +8530,6 @@
"permission": {
"type": "string"
},
"roleId": {
"type": "integer"
},
"sort": {
"type": "integer"
},
......
docs/swagger.yaml
View file @ 89cd0fa7
......@@ -1425,10 +1425,16 @@ definitions:
type: object
models.SysDept:
properties:
children:
items:
$ref: '#/definitions/models.SysDept'
type: array
createBy:
type: integer
createdAt:
type: string
dataScope:
type: string
deptId:
description: 部门编码
type: integer
......@@ -1443,6 +1449,8 @@ definitions:
leader:
description: 负责人
type: string
params:
type: string
parentId:
description: 上级部门
type: integer
......@@ -1464,28 +1472,16 @@ definitions:
properties:
action:
type: string
apis:
items:
type: integer
type: array
breadcrumb:
type: string
children:
items:
$ref: '#/definitions/models.SysMenu'
type: array
component:
type: string
createBy:
type: integer
createdAt:
type: string
dataScope:
type: string
icon:
type: string
is_select:
type: boolean
isFrame:
type: string
menuId:
......@@ -1496,8 +1492,6 @@ definitions:
type: string
noCache:
type: boolean
params:
type: string
parentId:
type: integer
path:
......@@ -1506,8 +1500,6 @@ definitions:
type: string
permission:
type: string
roleId:
type: integer
sort:
type: integer
sysApi:
......@@ -2512,6 +2504,28 @@ paths:
summary: <俱乐部>创建俱乐部
tags:
- <俱乐部>俱乐部
/api/v1/org-club-player:
get:
description: <俱乐部>获取球员数据列表
parameters:
- description: 页条数
in: query
name: pageSize
type: integer
- description: 页码
in: query
name: pageIndex
type: integer
responses:
"200":
description: '{"code": 200, "data": [...]}'
schema:
type: string
security:
- Bearer: []
summary: <俱乐部>获取球员数据列表
tags:
- <俱乐部>球员
/api/v1/org-club-player/get:
get:
description: <俱乐部>获取球员比赛详情
......@@ -3496,7 +3510,7 @@ paths:
tags:
- <球队>球员
get:
description: <俱乐部>获取球员数据列表
description: <球队>获取球员列表
parameters:
- description: 页条数
in: query
......@@ -3513,9 +3527,9 @@ paths:
type: string
security:
- Bearer: []
summary: <俱乐部>获取球员数据列表
summary: <球队>获取球员列表
tags:
- <俱乐部>球员
- <球队>球员
post:
consumes:
- application/json
......
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