Skip to content

N
nbya
Commit 4877c269 authored by haoyanbin's avatar haoyanbin
Browse files
Options

赛事管理

parent 754b285d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 598 additions and 413 deletions
app/operate/apis/org_match.go
View file @ 4877c269
This diff is collapsed.
app/operate/apis/org_season.go
View file @ 4877c269
package apis
import (
"fmt"
"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/jwtauth/user"
......@@ -28,18 +27,18 @@ type OrgSeason struct {
// @Router /api/v1/org-season [get]
// @Security Bearer
func (e OrgSeason) GetPage(c *gin.Context) {
req := dto.OrgSeasonGetPageReq{}
s := service.OrgSeason{}
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
}
req := dto.OrgSeasonGetPageReq{}
s := service.OrgSeason{}
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([]models.OrgSeason, 0)
......@@ -48,7 +47,7 @@ func (e OrgSeason) 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()))
return
return
}
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
......@@ -65,11 +64,7 @@ func (e OrgSeason) GetPage(c *gin.Context) {
func (e OrgSeason) Get(c *gin.Context) {
req := dto.OrgSeasonGetReq{}
s := service.OrgSeason{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
Errors
err := e.MakeContext(c).MakeOrm().Bind(&req).MakeService(&s.Service).Errors
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
......@@ -80,11 +75,31 @@ func (e OrgSeason) 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()))
return
//e.Error(500, err, fmt.Sprintf("获取赛季失败，\r\n失败信息 %s", err.Error()))
//return
}
e.OK( object, "查询成功")
//联赛级别列表
sOrgLeague := service.OrgLeague{}
listOrgLeague := make([]models.OrgLeague, 0)
var countOrgLeague int64 = 0
err = e.MakeContext(c).MakeOrm().MakeService(&sOrgLeague.Service).Errors
reqOrgLeague := new(dto.OrgLeagueGetPageReq)
reqOrgLeague.PageIndex = 1
reqOrgLeague.PageSize = 999
err = sOrgLeague.GetPage(reqOrgLeague, p, &listOrgLeague, &countOrgLeague)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取联赛 失败，\r\n失败信息 %s", err.Error()))
return
}
reply := dto.OrgSeasonGetReply{OrgLeagueList: listOrgLeague, OrgSeason: object}
e.OK(reply, "查询成功")
}
// Insert <赛事>创建赛季
......@@ -98,25 +113,25 @@ func (e OrgSeason) Get(c *gin.Context) {
// @Router /api/v1/org-season [post]
// @Security Bearer
func (e OrgSeason) Insert(c *gin.Context) {
req := dto.OrgSeasonInsertReq{}
s := service.OrgSeason{}
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
}
req := dto.OrgSeasonInsertReq{}
s := service.OrgSeason{}
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
}
// 设置创建人
req.SetCreateBy(user.GetUserId(c))
err = s.Insert(&req)
if err != nil {
e.Error(500, err, fmt.Sprintf("创建赛季 失败，\r\n失败信息 %s", err.Error()))
return
return
}
e.OK(req.GetId(), "创建成功")
......@@ -133,27 +148,27 @@ func (e OrgSeason) Insert(c *gin.Context) {
// @Router /api/v1/org-season/{id} [put]
// @Security Bearer
func (e OrgSeason) Update(c *gin.Context) {
req := dto.OrgSeasonUpdateReq{}
s := service.OrgSeason{}
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
}
req := dto.OrgSeasonUpdateReq{}
s := service.OrgSeason{}
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
}
req.SetUpdateBy(user.GetUserId(c))
p := actions.GetPermissionFromContext(c)
err = s.Update(&req, p)
if err != nil {
e.Error(500, err, fmt.Sprintf("修改赛季 失败，\r\n失败信息 %s", err.Error()))
return
return
}
e.OK( req.GetId(), "修改成功")
e.OK(req.GetId(), "修改成功")
}
// Delete 删除赛季
......@@ -165,18 +180,18 @@ func (e OrgSeason) Update(c *gin.Context) {
// @Router /api/v1/org-season [delete]
// @Security Bearer
func (e OrgSeason) Delete(c *gin.Context) {
s := service.OrgSeason{}
req := dto.OrgSeasonDeleteReq{}
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
}
s := service.OrgSeason{}
req := dto.OrgSeasonDeleteReq{}
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
}
// req.SetUpdateBy(user.GetUserId(c))
p := actions.GetPermissionFromContext(c)
......@@ -184,7 +199,7 @@ func (e OrgSeason) Delete(c *gin.Context) {
err = s.Remove(&req, p)
if err != nil {
e.Error(500, err, fmt.Sprintf("删除赛季失败，\r\n失败信息 %s", err.Error()))
return
return
}
e.OK( req.GetId(), "删除成功")
}
\ No newline at end of file
e.OK(req.GetId(), "删除成功")
}
app/operate/models/org_match_team_player.go
View file @ 4877c269
package models
import (
// "gorm.io/gorm"
// "gorm.io/gorm"
"go-admin/common/models"
)
type OrgMatchTeamPlayer struct {
models.Model
MatchId string `json:"matchId" gorm:"type:bigint(20);comment:MatchId"`
ClubId string `json:"clubId" gorm:"type:bigint(20);comment:ClubId"`
TeamId string `json:"teamId" gorm:"type:bigint(20);comment:TeamId"`
PlayerName string `json:"playerName" gorm:"type:varchar(60);comment:球员名称"`
PlayerNumber string `json:"playerNumber" gorm:"type:varchar(60);comment:球员号码"`
Position string `json:"position" gorm:"type:varchar(60);comment:场上位置"`
Scoring string `json:"scoring" gorm:"type:bigint(20);comment:得分"`
Rebound string `json:"rebound" gorm:"type:bigint(20);comment:篮板"`
Assist string `json:"assist" gorm:"type:bigint(20);comment:助攻"`
Steal string `json:"steal" gorm:"type:bigint(20);comment:抢断"`
FreeThrow string `json:"freeThrow" gorm:"type:bigint(20);comment:罚球"`
BlockShot string `json:"blockShot" gorm:"type:bigint(20);comment:盖帽"`
Foul string `json:"foul" gorm:"type:bigint(20);comment:犯规"`
TwoPointShot string `json:"twoPointShot" gorm:"type:bigint(20);comment:2分进球数量"`
ThreePointShot string `json:"threePointShot" gorm:"type:bigint(20);comment:3分进球数量"`
models.ModelTime
models.ControlBy
models.Model
MatchId string `json:"matchId" gorm:"type:bigint(20);comment:MatchId"`
ClubId string `json:"clubId" gorm:"type:bigint(20);comment:ClubId"`
TeamId string `json:"teamId" gorm:"type:bigint(20);comment:TeamId"`
PlayerName string `json:"playerName" gorm:"type:varchar(60);comment:球员名称"`
PlayerNumber string `json:"playerNumber" gorm:"type:varchar(60);comment:球员号码"`
Position string `json:"position" gorm:"type:varchar(60);comment:场上位置"`
Scoring string `json:"scoring" gorm:"type:bigint(20);comment:得分"`
Rebound string `json:"rebound" gorm:"type:bigint(20);comment:篮板"`
Assist string `json:"assist" gorm:"type:bigint(20);comment:助攻"`
Steal string `json:"steal" gorm:"type:bigint(20);comment:抢断"`
FreeThrow string `json:"freeThrow" gorm:"type:bigint(20);comment:罚球"`
BlockShot string `json:"blockShot" gorm:"type:bigint(20);comment:盖帽"`
Foul string `json:"foul" gorm:"type:bigint(20);comment:犯规"`
TwoPointShot string `json:"twoPointShot" gorm:"type:bigint(20);comment:2分进球数量"`
ThreePointShot string `json:"threePointShot" gorm:"type:bigint(20);comment:3分进球数量"`
models.ModelTime
models.ControlBy
}
func (OrgMatchTeamPlayer) TableName() string {
return "org_match_team_player"
return "org_match_team_player"
}
func (e *OrgMatchTeamPlayer) Generate() models.ActiveRecord {
......@@ -39,4 +38,4 @@ func (e *OrgMatchTeamPlayer) Generate() models.ActiveRecord {
func (e *OrgMatchTeamPlayer) GetId() interface{} {
return e.Id
}
\ No newline at end of file
}
app/operate/router/org_match.go
View file @ 4877c269
......@@ -22,9 +22,9 @@ func registerOrgMatchRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddl
r.POST("", api.Insert)
r.PUT("/:id", api.Update)
r.DELETE("", api.Delete)
r.GET("/get-players/:id", api.GetPlayers)
r.GET("/get-players-is-set/:id", api.GetPlayersIsSet)
r.PUT("/update-players/:id", api.UpdatePlayers)
r.PUT("/update-players-date/:id", api.UpdatePlayersData)
r.GET("/get-player/:id", api.GetPlayer)
r.GET("/get-player-is-set/:id", api.GetPlayerIsSet)
r.PUT("/update-player/:id", api.UpdatePlayer)
r.PUT("/update-player-data/:id", api.UpdatePlayerData)
}
}
\ No newline at end of file
}
app/operate/service/dto/org_match.go
View file @ 4877c269
This diff is collapsed.
app/operate/service/dto/org_season.go
View file @ 4877c269
......@@ -12,6 +12,11 @@ type OrgSeasonGetPageReq struct {
OrgSeasonOrder
}
type OrgSeasonGetReply struct {
OrgSeason models.OrgSeason `form:"orgSeason"`
OrgLeagueList []models.OrgLeague `form:"orgLeagueList"`
}
type OrgSeasonOrder struct {Id int `form:"idOrder" search:"type:order;column:id;table:org_season"`
LeagueId string `form:"leagueIdOrder" search:"type:order;column:league_id;table:org_season"`
DivisionId string `form:"divisionIdOrder" search:"type:order;column:division_id;table:org_season"`
......
app/operate/service/org_match_team_player.go
View file @ 4877c269
......@@ -3,7 +3,7 @@ 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/operate/models"
......@@ -59,9 +59,9 @@ func (e *OrgMatchTeamPlayer) Get(d *dto.OrgMatchTeamPlayerGetReq, p *actions.Dat
// Insert 创建OrgMatchTeamPlayer对象
func (e *OrgMatchTeamPlayer) Insert(c *dto.OrgMatchTeamPlayerInsertReq) error {
var err error
var data models.OrgMatchTeamPlayer
c.Generate(&data)
var err error
var data models.OrgMatchTeamPlayer
c.Generate(&data)
err = e.Orm.Create(&data).Error
if err != nil {
e.Log.Errorf("OrgMatchTeamPlayerService Insert error:%s \r\n", err)
......@@ -72,22 +72,22 @@ func (e *OrgMatchTeamPlayer) Insert(c *dto.OrgMatchTeamPlayerInsertReq) error {
// Update 修改OrgMatchTeamPlayer对象
func (e *OrgMatchTeamPlayer) Update(c *dto.OrgMatchTeamPlayerUpdateReq, p *actions.DataPermission) error {
var err error
var data = models.OrgMatchTeamPlayer{}
e.Orm.Scopes(
actions.Permission(data.TableName(), p),
).First(&data, c.GetId())
c.Generate(&data)
var err error
var data = models.OrgMatchTeamPlayer{}
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("OrgMatchTeamPlayerService 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("OrgMatchTeamPlayerService Save error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
return nil
}
// Remove 删除OrgMatchTeamPlayer
......@@ -99,11 +99,32 @@ func (e *OrgMatchTeamPlayer) Remove(d *dto.OrgMatchTeamPlayerDeleteReq, p *actio
actions.Permission(data.TableName(), p),
).Delete(&data, d.GetId())
if err := db.Error; err != nil {
e.Log.Errorf("Service RemoveOrgMatchTeamPlayer error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
e.Log.Errorf("Service RemoveOrgMatchTeamPlayer error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
return nil
}
\ No newline at end of file
}
// Insert 创建OrgMatchTeamPlayer对象
func (e *OrgMatchTeamPlayer) IsBeing(d *dto.OrgMatchTeamPlayerGetReq, p *actions.DataPermission, model *models.OrgMatchTeamPlayer) error {
var data models.OrgMatchTeamPlayer
err := e.Orm.Model(&data).
Scopes(
actions.Permission(data.TableName(), p),
).
First(model, d.GetId()).Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看")
e.Log.Errorf("Service GetOrgMatchTeamPlayer error:%s \r\n", err)
return err
}
if err != nil {
e.Log.Errorf("db error:%s", err)
return err
}
return nil
}
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