Skip to content

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

Player

parent 3dfe5710
Hide whitespace changes
Inline Side-by-side
Showing with 414 additions and 180 deletions
app/operate/apis/org_match.go
View file @ e5105abb
...@@ -358,7 +358,7 @@ func (e OrgMatch) GetPlayer(c *gin.Context) { ...@@ -358,7 +358,7 @@ func (e OrgMatch) GetPlayer(c *gin.Context) {
} }
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
list := make([]models.OrgPlayer, 0) list := make([]dto.OrgPlayerGetPageReply, 0)
var count int64 var count int64
req.PageIndex = 1 req.PageIndex = 1
...@@ -449,7 +449,7 @@ func (e OrgMatch) UpdatePlayer(c *gin.Context) { ...@@ -449,7 +449,7 @@ func (e OrgMatch) UpdatePlayer(c *gin.Context) {
teamId := "" teamId := ""
for _, v := range playersIds { for _, v := range playersIds {
orgPlayer := new(models.OrgPlayer) orgPlayer := new(dto.OrgPlayerGetReply)
id, _ := strconv.Atoi(v) id, _ := strconv.Atoi(v)
reqOrgPlayer := new(dto.OrgPlayerGetReq) reqOrgPlayer := new(dto.OrgPlayerGetReq)
reqOrgPlayer.Id = id reqOrgPlayer.Id = id
......
app/operate/apis/org_player.go
View file @ e5105abb
package apis package apis
import ( import (
"fmt" "fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"strconv"
"go-admin/app/operate/models"
"go-admin/app/operate/service" "go-admin/app/operate/service"
"go-admin/app/operate/service/dto" "go-admin/app/operate/service/dto"
"go-admin/common/actions" "go-admin/common/actions"
...@@ -28,27 +27,27 @@ type OrgPlayer struct { ...@@ -28,27 +27,27 @@ type OrgPlayer struct {
// @Router /api/v1/org-player [get] // @Router /api/v1/org-player [get]
// @Security Bearer // @Security Bearer
func (e OrgPlayer) GetPage(c *gin.Context) { func (e OrgPlayer) GetPage(c *gin.Context) {
req := dto.OrgPlayerGetPageReq{} req := dto.OrgPlayerGetPageReq{}
s := service.OrgPlayer{} s := service.OrgPlayer{}
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
Bind(&req). Bind(&req).
MakeService(&s.Service). MakeService(&s.Service).
Errors Errors
if err != nil { if err != nil {
e.Logger.Error(err) e.Logger.Error(err)
e.Error(500, err, err.Error()) e.Error(500, err, err.Error())
return return
} }
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
list := make([]models.OrgPlayer, 0) list := make([]dto.OrgPlayerGetPageReply, 0)
var count int64 var count int64
err = s.GetPage(&req, p, &list, &count) err = s.GetPage(&req, p, &list, &count)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("获取球员 失败，\r\n失败信息 %s", err.Error())) e.Error(500, err, fmt.Sprintf("获取球员 失败，\r\n失败信息 %s", err.Error()))
return return
} }
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
...@@ -65,7 +64,7 @@ func (e OrgPlayer) GetPage(c *gin.Context) { ...@@ -65,7 +64,7 @@ func (e OrgPlayer) GetPage(c *gin.Context) {
func (e OrgPlayer) Get(c *gin.Context) { func (e OrgPlayer) Get(c *gin.Context) {
req := dto.OrgPlayerGetReq{} req := dto.OrgPlayerGetReq{}
s := service.OrgPlayer{} s := service.OrgPlayer{}
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
Bind(&req). Bind(&req).
MakeService(&s.Service). MakeService(&s.Service).
...@@ -75,16 +74,16 @@ func (e OrgPlayer) Get(c *gin.Context) { ...@@ -75,16 +74,16 @@ func (e OrgPlayer) Get(c *gin.Context) {
e.Error(500, err, err.Error()) e.Error(500, err, err.Error())
return return
} }
var object models.OrgPlayer var object dto.OrgPlayerGetReply
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object) err = s.Get(&req, p, &object)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("获取球员失败，\r\n失败信息 %s", err.Error())) e.Error(500, err, fmt.Sprintf("获取球员失败，\r\n失败信息 %s", err.Error()))
return return
} }
e.OK( object, "查询成功") e.OK(object, "查询成功")
} }
// Insert <球队>创建球员 // Insert <球队>创建球员
...@@ -98,25 +97,42 @@ func (e OrgPlayer) Get(c *gin.Context) { ...@@ -98,25 +97,42 @@ func (e OrgPlayer) Get(c *gin.Context) {
// @Router /api/v1/org-player [post] // @Router /api/v1/org-player [post]
// @Security Bearer // @Security Bearer
func (e OrgPlayer) Insert(c *gin.Context) { func (e OrgPlayer) Insert(c *gin.Context) {
req := dto.OrgPlayerInsertReq{} req := dto.OrgPlayerInsertReq{}
s := service.OrgPlayer{} s := service.OrgPlayer{}
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
Bind(&req). Bind(&req).
MakeService(&s.Service). MakeService(&s.Service).
Errors Errors
if err != nil { if err != nil {
e.Logger.Error(err) e.Logger.Error(err)
e.Error(500, err, err.Error()) e.Error(500, err, err.Error())
return return
} }
reqUser := dto.OrgPlayerUserInsertReq{}
sUser := service.OrgPlayerUser{}
e.MakeContext(c).MakeOrm().MakeService(&sUser.Service)
_, userId := sUser.IsBeing(req.Username)
if userId > 0 {
req.PlayerUserId = strconv.Itoa(userId)
} else {
// 设置创建人
reqUser.SetCreateBy(user.GetUserId(c))
reqUser.Username = req.Username
reqUser.Password = dto.Pwd("123456")
err = sUser.Insert(&reqUser)
req.PlayerUserId = strconv.Itoa(reqUser.Id)
}
// 设置创建人 // 设置创建人
req.SetCreateBy(user.GetUserId(c)) req.SetCreateBy(user.GetUserId(c))
err = s.Insert(&req) err = s.Insert(&req)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("创建球员 失败，\r\n失败信息 %s", err.Error())) e.Error(500, err, fmt.Sprintf("创建球员 失败，\r\n失败信息 %s", err.Error()))
return return
} }
e.OK(req.GetId(), "创建成功") e.OK(req.GetId(), "创建成功")
...@@ -133,27 +149,43 @@ func (e OrgPlayer) Insert(c *gin.Context) { ...@@ -133,27 +149,43 @@ func (e OrgPlayer) Insert(c *gin.Context) {
// @Router /api/v1/org-player/{id} [put] // @Router /api/v1/org-player/{id} [put]
// @Security Bearer // @Security Bearer
func (e OrgPlayer) Update(c *gin.Context) { func (e OrgPlayer) Update(c *gin.Context) {
req := dto.OrgPlayerUpdateReq{} req := dto.OrgPlayerUpdateReq{}
s := service.OrgPlayer{} s := service.OrgPlayer{}
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
Bind(&req). Bind(&req).
MakeService(&s.Service). MakeService(&s.Service).
Errors Errors
if err != nil { if err != nil {
e.Logger.Error(err) e.Logger.Error(err)
e.Error(500, err, err.Error()) e.Error(500, err, err.Error())
return return
} }
req.SetUpdateBy(user.GetUserId(c)) req.SetUpdateBy(user.GetUserId(c))
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
reqUser := dto.OrgPlayerUserInsertReq{}
sUser := service.OrgPlayerUser{}
e.MakeContext(c).MakeOrm().MakeService(&sUser.Service)
_, userId := sUser.IsBeing(req.Username)
if userId > 0 {
req.PlayerUserId = strconv.Itoa(userId)
} else {
// 设置创建人
reqUser.SetCreateBy(user.GetUserId(c))
reqUser.Username = req.Username
reqUser.Password = dto.Pwd("123456")
err = sUser.Insert(&reqUser)
req.PlayerUserId = strconv.Itoa(reqUser.Id)
}
err = s.Update(&req, p) err = s.Update(&req, p)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("修改球员 失败，\r\n失败信息 %s", err.Error())) e.Error(500, err, fmt.Sprintf("修改球员 失败，\r\n失败信息 %s", err.Error()))
return return
} }
e.OK( req.GetId(), "修改成功") e.OK(req.GetId(), "修改成功")
} }
// Delete <球队>删除球员 // Delete <球队>删除球员
...@@ -165,18 +197,18 @@ func (e OrgPlayer) Update(c *gin.Context) { ...@@ -165,18 +197,18 @@ func (e OrgPlayer) Update(c *gin.Context) {
// @Router /api/v1/org-player [delete] // @Router /api/v1/org-player [delete]
// @Security Bearer // @Security Bearer
func (e OrgPlayer) Delete(c *gin.Context) { func (e OrgPlayer) Delete(c *gin.Context) {
s := service.OrgPlayer{} s := service.OrgPlayer{}
req := dto.OrgPlayerDeleteReq{} req := dto.OrgPlayerDeleteReq{}
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
Bind(&req). Bind(&req).
MakeService(&s.Service). MakeService(&s.Service).
Errors Errors
if err != nil { if err != nil {
e.Logger.Error(err) e.Logger.Error(err)
e.Error(500, err, err.Error()) e.Error(500, err, err.Error())
return return
} }
// req.SetUpdateBy(user.GetUserId(c)) // req.SetUpdateBy(user.GetUserId(c))
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
...@@ -184,7 +216,7 @@ func (e OrgPlayer) Delete(c *gin.Context) { ...@@ -184,7 +216,7 @@ func (e OrgPlayer) Delete(c *gin.Context) {
err = s.Remove(&req, p) err = s.Remove(&req, p)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("删除球员失败，\r\n失败信息 %s", err.Error())) e.Error(500, err, fmt.Sprintf("删除球员失败，\r\n失败信息 %s", err.Error()))
return return
} }
e.OK( req.GetId(), "删除成功") e.OK(req.GetId(), "删除成功")
} }
\ No newline at end of file
app/operate/apis/org_team_match.go
View file @ e5105abb
...@@ -78,11 +78,11 @@ func (e OrgTeamMatch) GetPlayers(c *gin.Context) { ...@@ -78,11 +78,11 @@ func (e OrgTeamMatch) GetPlayers(c *gin.Context) {
} }
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
list := make([]models.OrgPlayer, 0) list := make([]dto.OrgPlayerGetPageReply, 0)
var count int64 var count int64
req.PageIndex = 1 req.PageIndex = 1
req.PageSize = 999 req.PageSize = 9999
err = s.GetPage(&req, p, &list, &count) err = s.GetPage(&req, p, &list, &count)
if err != nil { if err != nil {
...@@ -167,7 +167,7 @@ func (e OrgTeamMatch) UpdatePlayers(c *gin.Context) { ...@@ -167,7 +167,7 @@ func (e OrgTeamMatch) UpdatePlayers(c *gin.Context) {
teamId := "" teamId := ""
for _, v := range playersIds { for _, v := range playersIds {
orgPlayer := new(models.OrgPlayer) orgPlayer := new(dto.OrgPlayerGetReply)
id, _ := strconv.Atoi(v) id, _ := strconv.Atoi(v)
reqOrgPlayer := new(dto.OrgPlayerGetReq) reqOrgPlayer := new(dto.OrgPlayerGetReq)
reqOrgPlayer.Id = id reqOrgPlayer.Id = id
......
app/operate/service/dto/org_player.go
View file @ e5105abb
...@@ -4,12 +4,29 @@ import ( ...@@ -4,12 +4,29 @@ import (
"go-admin/app/operate/models" "go-admin/app/operate/models"
"go-admin/common/dto" "go-admin/common/dto"
common "go-admin/common/models" common "go-admin/common/models"
"golang.org/x/crypto/bcrypt"
"time" "time"
) )
type OrgPlayerGetPageReq struct { type OrgPlayerGetPageReq struct {
dto.Pagination `search:"-"` dto.Pagination `search:"-"`
TeamId string `form:"teamId" search:"type:exact;column:team_id;table:org_player" comment:""` TeamId string `form:"teamId" search:"type:contains;column:team_id;table:ot" comment:""`
TeamName string `form:"teamName" search:"type:contains;column:team_name;table:ot" comment:""`
PlayerName string `form:"playerName" search:"type:contains;column:player_name;table:op" comment:""`
Status string `form:"status" search:"type:exact;column:status;table:op" comment:""`
}
type OrgPlayerGetPageReply struct {
Id string `json:"id" comment:"球队id"` //球队id
ClubId string `json:"clubId" comment:"俱乐部id"`
ClubName string `json:"clubName" comment:"俱乐部名称"`
TeamId string `json:"teamId" comment:"球队id"`
TeamName string `json:"teamName" comment:"球队名称"`
PlayerName string `json:"playerName" comment:"球员名称"`
PlayerNameEn string `json:"playerNameEn" comment:"球员名称英文"`
PlayerNumber string `json:"playerNumber" comment:"球衣号"`
Position string `json:"position" comment:"场上位置"`
Sex string `json:"sex" comment:"性别"`
Status string `json:"status" comment:"状态"`
} }
type OrgPlayerOrder struct { type OrgPlayerOrder struct {
...@@ -47,6 +64,8 @@ type OrgPlayerInsertReq struct { ...@@ -47,6 +64,8 @@ type OrgPlayerInsertReq struct {
PlayerImg string `json:"playerImg" comment:"球员照片"` PlayerImg string `json:"playerImg" comment:"球员照片"`
PlayerUserId string `json:"playerUserId" comment:"org_player_user表id"` PlayerUserId string `json:"playerUserId" comment:"org_player_user表id"`
ShareConf string `json:"shareConf" comment:"分享功能 1 开启 2 关闭"` ShareConf string `json:"shareConf" comment:"分享功能 1 开启 2 关闭"`
PlayerNameEn string `json:"playerNameEn" comment:"球员名称英文"`
Username string `json:"username" comment:"账号"`
common.ControlBy common.ControlBy
} }
...@@ -82,6 +101,8 @@ type OrgPlayerUpdateReq struct { ...@@ -82,6 +101,8 @@ type OrgPlayerUpdateReq struct {
PlayerImg string `json:"playerImg" comment:"球员照片"` PlayerImg string `json:"playerImg" comment:"球员照片"`
PlayerUserId string `json:"playerUserId" comment:"org_player_user表id"` PlayerUserId string `json:"playerUserId" comment:"org_player_user表id"`
ShareConf string `json:"shareConf" comment:"分享功能 1 开启 2 关闭"` ShareConf string `json:"shareConf" comment:"分享功能 1 开启 2 关闭"`
PlayerNameEn string `json:"playerNameEn" comment:"球员名称英文"`
Username string `json:"username" comment:"账号"`
common.ControlBy common.ControlBy
} }
...@@ -110,6 +131,24 @@ type OrgPlayerGetReq struct { ...@@ -110,6 +131,24 @@ type OrgPlayerGetReq struct {
Id int `uri:"id"` Id int `uri:"id"`
} }
type OrgPlayerGetReply struct {
Id int `json:"id" comment:"球员id"`
ClubId string `json:"clubId" comment:"俱乐部id"`
ClubName string `json:"clubName" comment:"俱乐部名称"`
TeamId string `json:"teamId" comment:"球队id"`
TeamName string `json:"teamName" comment:"球队名称"`
PlayerName string `json:"playerName" comment:"球员名称"`
PlayerNameEn string `json:"playerNameEn" comment:"球员名称英文"`
IdCard string `json:"idCard" comment:"身份证号"`
Sex string `json:"sex" comment:"性别"`
PlayerNumber string `json:"playerNumber" comment:"球衣号"`
Position string `json:"position" comment:"场上位置"`
PlayerImg string `json:"playerImg" comment:"球员照片"`
Username string `json:"username" comment:"账号"`
ShareConf string `json:"shareConf" comment:"分享功能 1 开启 2 关闭"`
Status string `json:"status" comment:"状态"`
}
func (s *OrgPlayerGetReq) GetId() interface{} { func (s *OrgPlayerGetReq) GetId() interface{} {
return s.Id return s.Id
} }
...@@ -122,3 +161,18 @@ type OrgPlayerDeleteReq struct { ...@@ -122,3 +161,18 @@ type OrgPlayerDeleteReq struct {
func (s *OrgPlayerDeleteReq) GetId() interface{} { func (s *OrgPlayerDeleteReq) GetId() interface{} {
return s.Ids return s.Ids
} }
func Pwd(password string) string {
if password == "" {
return ""
}
var hash []byte
var err error
if hash, err = bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost); err != nil {
return ""
} else {
return string(hash)
}
}
app/operate/service/org_player.go
View file @ e5105abb
...@@ -16,16 +16,22 @@ type OrgPlayer struct { ...@@ -16,16 +16,22 @@ type OrgPlayer struct {
} }
// GetPage 获取OrgPlayer列表 // GetPage 获取OrgPlayer列表
func (e *OrgPlayer) GetPage(c *dto.OrgPlayerGetPageReq, p *actions.DataPermission, list *[]models.OrgPlayer, count *int64) error { func (e *OrgPlayer) GetPage(c *dto.OrgPlayerGetPageReq, p *actions.DataPermission, list *[]dto.OrgPlayerGetPageReply, count *int64) error {
var err error var err error
var data models.OrgPlayer var data models.OrgPlayer
err = e.Orm.Model(&data). err = e.Orm.Table("org_player as op").
Select("op.id,op.club_id,oc.club_name,op.team_id,ot.team_name,"+
"op.player_name,op.player_number,op.position,op.sex,op.status").
Joins("left join org_club as oc on op.club_id=oc.id").
Joins("left join org_team as ot on op.team_id=ot.id").
Joins("left join org_player_user as opu on op.player_user_id=opu.id").
Scopes( Scopes(
cDto.MakeCondition(c.GetNeedSearch()), cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()), cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
actions.Permission(data.TableName(), p), actions.Permission(data.TableName(), p),
cDto.SetWhere("", "team_id", c.TeamId), cDto.SetWhere("op", "team_id", c.TeamId),
cDto.PassDel("op"),
). ).
Find(list).Limit(-1).Offset(-1). Find(list).Limit(-1).Offset(-1).
Count(count).Error Count(count).Error
...@@ -37,10 +43,16 @@ func (e *OrgPlayer) GetPage(c *dto.OrgPlayerGetPageReq, p *actions.DataPermissio ...@@ -37,10 +43,16 @@ func (e *OrgPlayer) GetPage(c *dto.OrgPlayerGetPageReq, p *actions.DataPermissio
} }
// Get 获取OrgPlayer对象 // Get 获取OrgPlayer对象
func (e *OrgPlayer) Get(d *dto.OrgPlayerGetReq, p *actions.DataPermission, model *models.OrgPlayer) error { func (e *OrgPlayer) Get(d *dto.OrgPlayerGetReq, p *actions.DataPermission, model *dto.OrgPlayerGetReply) error {
var data models.OrgPlayer var data models.OrgPlayer
err := e.Orm.Model(&data). err := e.Orm.Table("org_player as op").
Select("op.id,op.club_id,oc.club_name,op.team_id,ot.team_name,"+
"op.player_name,op.player_name_en,op.id_card,op.player_number,"+
"op.position,op.sex,op.player_img,opu.username,op.share_conf,op.status").
Joins("left join org_club as oc on op.club_id=oc.id").
Joins("left join org_team as ot on op.team_id=ot.id").
Joins("left join org_player_user as opu on op.player_user_id=opu.id").
Scopes( Scopes(
actions.Permission(data.TableName(), p), actions.Permission(data.TableName(), p),
). ).
......
app/operate/service/org_player_user.go
View file @ e5105abb
...@@ -3,7 +3,7 @@ package service ...@@ -3,7 +3,7 @@ package service
import ( import (
"errors" "errors"
"github.com/go-admin-team/go-admin-core/sdk/service" "github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm" "gorm.io/gorm"
"go-admin/app/operate/models" "go-admin/app/operate/models"
...@@ -59,35 +59,36 @@ func (e *OrgPlayerUser) Get(d *dto.OrgPlayerUserGetReq, p *actions.DataPermissio ...@@ -59,35 +59,36 @@ func (e *OrgPlayerUser) Get(d *dto.OrgPlayerUserGetReq, p *actions.DataPermissio
// Insert 创建OrgPlayerUser对象 // Insert 创建OrgPlayerUser对象
func (e *OrgPlayerUser) Insert(c *dto.OrgPlayerUserInsertReq) error { func (e *OrgPlayerUser) Insert(c *dto.OrgPlayerUserInsertReq) error {
var err error var err error
var data models.OrgPlayerUser var data models.OrgPlayerUser
c.Generate(&data) c.Generate(&data)
err = e.Orm.Create(&data).Error err = e.Orm.Create(&data).Error
if err != nil { if err != nil {
e.Log.Errorf("OrgPlayerUserService Insert error:%s \r\n", err) e.Log.Errorf("OrgPlayerUserService Insert error:%s \r\n", err)
return err return err
} }
c.Id = data.Id
return nil return nil
} }
// Update 修改OrgPlayerUser对象 // Update 修改OrgPlayerUser对象
func (e *OrgPlayerUser) Update(c *dto.OrgPlayerUserUpdateReq, p *actions.DataPermission) error { func (e *OrgPlayerUser) Update(c *dto.OrgPlayerUserUpdateReq, p *actions.DataPermission) error {
var err error var err error
var data = models.OrgPlayerUser{} var data = models.OrgPlayerUser{}
e.Orm.Scopes( e.Orm.Scopes(
actions.Permission(data.TableName(), p), actions.Permission(data.TableName(), p),
).First(&data, c.GetId()) ).First(&data, c.GetId())
c.Generate(&data) c.Generate(&data)
db := e.Orm.Save(&data) db := e.Orm.Save(&data)
if db.Error != nil { if db.Error != nil {
e.Log.Errorf("OrgPlayerUserService Save error:%s \r\n", err) e.Log.Errorf("OrgPlayerUserService Save error:%s \r\n", err)
return err return err
} }
if db.RowsAffected == 0 { if db.RowsAffected == 0 {
return errors.New("无权更新该数据") return errors.New("无权更新该数据")
} }
return nil return nil
} }
// Remove 删除OrgPlayerUser // Remove 删除OrgPlayerUser
...@@ -99,11 +100,29 @@ func (e *OrgPlayerUser) Remove(d *dto.OrgPlayerUserDeleteReq, p *actions.DataPer ...@@ -99,11 +100,29 @@ func (e *OrgPlayerUser) Remove(d *dto.OrgPlayerUserDeleteReq, p *actions.DataPer
actions.Permission(data.TableName(), p), actions.Permission(data.TableName(), p),
).Delete(&data, d.GetId()) ).Delete(&data, d.GetId())
if err := db.Error; err != nil { if err := db.Error; err != nil {
e.Log.Errorf("Service RemoveOrgPlayerUser error:%s \r\n", err) e.Log.Errorf("Service RemoveOrgPlayerUser error:%s \r\n", err)
return err return err
} }
if db.RowsAffected == 0 { if db.RowsAffected == 0 {
return errors.New("无权删除该数据") return errors.New("无权删除该数据")
} }
return nil return nil
} }
\ No newline at end of file
func (e *OrgPlayerUser) IsBeing(username string) (error, int) {
var data models.OrgPlayerUser
err := e.Orm.Model(&data).
Where("username=?", username).
First(&data).Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看")
e.Log.Errorf("Service GetOrgMatchTeamPlayer error:%s \r\n", err)
return err, 0
}
if err != nil {
e.Log.Errorf("db error:%s", err)
return err, 0
}
return nil, data.Id
}
docs/docs.go
View file @ e5105abb
...@@ -1948,11 +1948,11 @@ var doc = `{ ...@@ -1948,11 +1948,11 @@ var doc = `{
"Bearer": [] "Bearer": []
} }
], ],
"description": "\u003c赛事\u003e获取联赛列表", "description": "获取联赛列表",
"tags": [ "tags": [
"\u003c赛事\u003e联赛" "联赛"
], ],
"summary": "\u003c赛事\u003e获取联赛列表", "summary": "获取联赛列表",
"parameters": [ "parameters": [
{ {
"type": "integer", "type": "integer",
...@@ -1982,14 +1982,14 @@ var doc = `{ ...@@ -1982,14 +1982,14 @@ var doc = `{
"Bearer": [] "Bearer": []
} }
], ],
"description": "\u003c赛事\u003e创建联赛", "description": "创建联赛",
"consumes": [ "consumes": [
"application/json" "application/json"
], ],
"tags": [ "tags": [
"\u003c赛事\u003e联赛" "联赛"
], ],
"summary": "\u003c赛事\u003e创建联赛", "summary": "创建联赛",
"parameters": [ "parameters": [
{ {
"description": "data", "description": "data",
...@@ -2016,11 +2016,11 @@ var doc = `{ ...@@ -2016,11 +2016,11 @@ var doc = `{
"Bearer": [] "Bearer": []
} }
], ],
"description": "\u003c赛事\u003e删除联赛", "description": "删除联赛",
"tags": [ "tags": [
"\u003c赛事\u003e联赛" "联赛"
], ],
"summary": "\u003c赛事\u003e删除联赛", "summary": "删除联赛",
"parameters": [ "parameters": [
{ {
"description": "ids", "description": "ids",
...@@ -2051,11 +2051,11 @@ var doc = `{ ...@@ -2051,11 +2051,11 @@ var doc = `{
"Bearer": [] "Bearer": []
} }
], ],
"description": "\u003c赛事\u003e获取联赛", "description": "获取联赛",
"tags": [ "tags": [
"\u003c赛事\u003e联赛" "联赛"
], ],
"summary": "\u003c赛事\u003e获取联赛", "summary": "获取联赛",
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
...@@ -2079,14 +2079,14 @@ var doc = `{ ...@@ -2079,14 +2079,14 @@ var doc = `{
"Bearer": [] "Bearer": []
} }
], ],
"description": "\u003c赛事\u003e修改联赛", "description": "修改联赛",
"consumes": [ "consumes": [
"application/json" "application/json"
], ],
"tags": [ "tags": [
"\u003c赛事\u003e联赛" "联赛"
], ],
"summary": "\u003c赛事\u003e修改联赛", "summary": "修改联赛",
"parameters": [ "parameters": [
{ {
"description": "body", "description": "body",
...@@ -7016,6 +7016,9 @@ var doc = `{ ...@@ -7016,6 +7016,9 @@ var doc = `{
"playerName": { "playerName": {
"type": "string" "type": "string"
}, },
"playerNameEn": {
"type": "string"
},
"playerNumber": { "playerNumber": {
"type": "string" "type": "string"
}, },
...@@ -7036,6 +7039,9 @@ var doc = `{ ...@@ -7036,6 +7039,9 @@ var doc = `{
}, },
"updateBy": { "updateBy": {
"type": "integer" "type": "integer"
},
"username": {
"type": "string"
} }
} }
}, },
...@@ -7060,6 +7066,9 @@ var doc = `{ ...@@ -7060,6 +7066,9 @@ var doc = `{
"playerName": { "playerName": {
"type": "string" "type": "string"
}, },
"playerNameEn": {
"type": "string"
},
"playerNumber": { "playerNumber": {
"type": "string" "type": "string"
}, },
...@@ -7080,6 +7089,9 @@ var doc = `{ ...@@ -7080,6 +7089,9 @@ var doc = `{
}, },
"updateBy": { "updateBy": {
"type": "integer" "type": "integer"
},
"username": {
"type": "string"
} }
} }
}, },
...@@ -7214,6 +7226,12 @@ var doc = `{ ...@@ -7214,6 +7226,12 @@ var doc = `{
"dto.OrgTeamGetPageReq": { "dto.OrgTeamGetPageReq": {
"type": "object", "type": "object",
"properties": { "properties": {
"clubId": {
"type": "string"
},
"createBy": {
"type": "string"
},
"createEndTime": { "createEndTime": {
"description": "结束时间", "description": "结束时间",
"type": "string" "type": "string"
...@@ -7222,6 +7240,15 @@ var doc = `{ ...@@ -7222,6 +7240,15 @@ var doc = `{
"description": "开始时间", "description": "开始时间",
"type": "string" "type": "string"
}, },
"createdAt": {
"type": "string"
},
"deletedAt": {
"type": "string"
},
"id": {
"type": "integer"
},
"pageIndex": { "pageIndex": {
"type": "integer" "type": "integer"
}, },
...@@ -7229,7 +7256,12 @@ var doc = `{ ...@@ -7229,7 +7256,12 @@ var doc = `{
"type": "integer" "type": "integer"
}, },
"teamName": { "teamName": {
"description": "球队名称", "type": "string"
},
"updateBy": {
"type": "string"
},
"updatedAt": {
"type": "string" "type": "string"
} }
} }
...@@ -8438,21 +8470,12 @@ var doc = `{ ...@@ -8438,21 +8470,12 @@ var doc = `{
"models.SysDept": { "models.SysDept": {
"type": "object", "type": "object",
"properties": { "properties": {
"children": {
"type": "array",
"items": {
"$ref": "#/definitions/models.SysDept"
}
},
"createBy": { "createBy": {
"type": "integer" "type": "integer"
}, },
"createdAt": { "createdAt": {
"type": "string" "type": "string"
}, },
"dataScope": {
"type": "string"
},
"deptId": { "deptId": {
"description": "部门编码", "description": "部门编码",
"type": "integer" "type": "integer"
...@@ -8472,9 +8495,6 @@ var doc = `{ ...@@ -8472,9 +8495,6 @@ var doc = `{
"description": "负责人", "description": "负责人",
"type": "string" "type": "string"
}, },
"params": {
"type": "string"
},
"parentId": { "parentId": {
"description": "上级部门", "description": "上级部门",
"type": "integer" "type": "integer"
...@@ -8505,9 +8525,21 @@ var doc = `{ ...@@ -8505,9 +8525,21 @@ var doc = `{
"action": { "action": {
"type": "string" "type": "string"
}, },
"apis": {
"type": "array",
"items": {
"type": "integer"
}
},
"breadcrumb": { "breadcrumb": {
"type": "string" "type": "string"
}, },
"children": {
"type": "array",
"items": {
"$ref": "#/definitions/models.SysMenu"
}
},
"component": { "component": {
"type": "string" "type": "string"
}, },
...@@ -8517,12 +8549,18 @@ var doc = `{ ...@@ -8517,12 +8549,18 @@ var doc = `{
"createdAt": { "createdAt": {
"type": "string" "type": "string"
}, },
"dataScope": {
"type": "string"
},
"icon": { "icon": {
"type": "string" "type": "string"
}, },
"isFrame": { "isFrame": {
"type": "string" "type": "string"
}, },
"is_select": {
"type": "boolean"
},
"menuId": { "menuId": {
"type": "integer" "type": "integer"
}, },
...@@ -8535,6 +8573,9 @@ var doc = `{ ...@@ -8535,6 +8573,9 @@ var doc = `{
"noCache": { "noCache": {
"type": "boolean" "type": "boolean"
}, },
"params": {
"type": "string"
},
"parentId": { "parentId": {
"type": "integer" "type": "integer"
}, },
...@@ -8547,6 +8588,9 @@ var doc = `{ ...@@ -8547,6 +8588,9 @@ var doc = `{
"permission": { "permission": {
"type": "string" "type": "string"
}, },
"roleId": {
"type": "integer"
},
"sort": { "sort": {
"type": "integer" "type": "integer"
}, },
......
docs/swagger.json
View file @ e5105abb
...@@ -1931,11 +1931,11 @@ ...@@ -1931,11 +1931,11 @@
"Bearer": [] "Bearer": []
} }
], ],
"description": "\u003c赛事\u003e获取联赛列表", "description": "获取联赛列表",
"tags": [ "tags": [
"\u003c赛事\u003e联赛" "联赛"
], ],
"summary": "\u003c赛事\u003e获取联赛列表", "summary": "获取联赛列表",
"parameters": [ "parameters": [
{ {
"type": "integer", "type": "integer",
...@@ -1965,14 +1965,14 @@ ...@@ -1965,14 +1965,14 @@
"Bearer": [] "Bearer": []
} }
], ],
"description": "\u003c赛事\u003e创建联赛", "description": "创建联赛",
"consumes": [ "consumes": [
"application/json" "application/json"
], ],
"tags": [ "tags": [
"\u003c赛事\u003e联赛" "联赛"
], ],
"summary": "\u003c赛事\u003e创建联赛", "summary": "创建联赛",
"parameters": [ "parameters": [
{ {
"description": "data", "description": "data",
...@@ -1999,11 +1999,11 @@ ...@@ -1999,11 +1999,11 @@
"Bearer": [] "Bearer": []
} }
], ],
"description": "\u003c赛事\u003e删除联赛", "description": "删除联赛",
"tags": [ "tags": [
"\u003c赛事\u003e联赛" "联赛"
], ],
"summary": "\u003c赛事\u003e删除联赛", "summary": "删除联赛",
"parameters": [ "parameters": [
{ {
"description": "ids", "description": "ids",
...@@ -2034,11 +2034,11 @@ ...@@ -2034,11 +2034,11 @@
"Bearer": [] "Bearer": []
} }
], ],
"description": "\u003c赛事\u003e获取联赛", "description": "获取联赛",
"tags": [ "tags": [
"\u003c赛事\u003e联赛" "联赛"
], ],
"summary": "\u003c赛事\u003e获取联赛", "summary": "获取联赛",
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
...@@ -2062,14 +2062,14 @@ ...@@ -2062,14 +2062,14 @@
"Bearer": [] "Bearer": []
} }
], ],
"description": "\u003c赛事\u003e修改联赛", "description": "修改联赛",
"consumes": [ "consumes": [
"application/json" "application/json"
], ],
"tags": [ "tags": [
"\u003c赛事\u003e联赛" "联赛"
], ],
"summary": "\u003c赛事\u003e修改联赛", "summary": "修改联赛",
"parameters": [ "parameters": [
{ {
"description": "body", "description": "body",
...@@ -6999,6 +6999,9 @@ ...@@ -6999,6 +6999,9 @@
"playerName": { "playerName": {
"type": "string" "type": "string"
}, },
"playerNameEn": {
"type": "string"
},
"playerNumber": { "playerNumber": {
"type": "string" "type": "string"
}, },
...@@ -7019,6 +7022,9 @@ ...@@ -7019,6 +7022,9 @@
}, },
"updateBy": { "updateBy": {
"type": "integer" "type": "integer"
},
"username": {
"type": "string"
} }
} }
}, },
...@@ -7043,6 +7049,9 @@ ...@@ -7043,6 +7049,9 @@
"playerName": { "playerName": {
"type": "string" "type": "string"
}, },
"playerNameEn": {
"type": "string"
},
"playerNumber": { "playerNumber": {
"type": "string" "type": "string"
}, },
...@@ -7063,6 +7072,9 @@ ...@@ -7063,6 +7072,9 @@
}, },
"updateBy": { "updateBy": {
"type": "integer" "type": "integer"
},
"username": {
"type": "string"
} }
} }
}, },
...@@ -7197,6 +7209,12 @@ ...@@ -7197,6 +7209,12 @@
"dto.OrgTeamGetPageReq": { "dto.OrgTeamGetPageReq": {
"type": "object", "type": "object",
"properties": { "properties": {
"clubId": {
"type": "string"
},
"createBy": {
"type": "string"
},
"createEndTime": { "createEndTime": {
"description": "结束时间", "description": "结束时间",
"type": "string" "type": "string"
...@@ -7205,6 +7223,15 @@ ...@@ -7205,6 +7223,15 @@
"description": "开始时间", "description": "开始时间",
"type": "string" "type": "string"
}, },
"createdAt": {
"type": "string"
},
"deletedAt": {
"type": "string"
},
"id": {
"type": "integer"
},
"pageIndex": { "pageIndex": {
"type": "integer" "type": "integer"
}, },
...@@ -7212,7 +7239,12 @@ ...@@ -7212,7 +7239,12 @@
"type": "integer" "type": "integer"
}, },
"teamName": { "teamName": {
"description": "球队名称", "type": "string"
},
"updateBy": {
"type": "string"
},
"updatedAt": {
"type": "string" "type": "string"
} }
} }
...@@ -8421,21 +8453,12 @@ ...@@ -8421,21 +8453,12 @@
"models.SysDept": { "models.SysDept": {
"type": "object", "type": "object",
"properties": { "properties": {
"children": {
"type": "array",
"items": {
"$ref": "#/definitions/models.SysDept"
}
},
"createBy": { "createBy": {
"type": "integer" "type": "integer"
}, },
"createdAt": { "createdAt": {
"type": "string" "type": "string"
}, },
"dataScope": {
"type": "string"
},
"deptId": { "deptId": {
"description": "部门编码", "description": "部门编码",
"type": "integer" "type": "integer"
...@@ -8455,9 +8478,6 @@ ...@@ -8455,9 +8478,6 @@
"description": "负责人", "description": "负责人",
"type": "string" "type": "string"
}, },
"params": {
"type": "string"
},
"parentId": { "parentId": {
"description": "上级部门", "description": "上级部门",
"type": "integer" "type": "integer"
...@@ -8488,9 +8508,21 @@ ...@@ -8488,9 +8508,21 @@
"action": { "action": {
"type": "string" "type": "string"
}, },
"apis": {
"type": "array",
"items": {
"type": "integer"
}
},
"breadcrumb": { "breadcrumb": {
"type": "string" "type": "string"
}, },
"children": {
"type": "array",
"items": {
"$ref": "#/definitions/models.SysMenu"
}
},
"component": { "component": {
"type": "string" "type": "string"
}, },
...@@ -8500,12 +8532,18 @@ ...@@ -8500,12 +8532,18 @@
"createdAt": { "createdAt": {
"type": "string" "type": "string"
}, },
"dataScope": {
"type": "string"
},
"icon": { "icon": {
"type": "string" "type": "string"
}, },
"isFrame": { "isFrame": {
"type": "string" "type": "string"
}, },
"is_select": {
"type": "boolean"
},
"menuId": { "menuId": {
"type": "integer" "type": "integer"
}, },
...@@ -8518,6 +8556,9 @@ ...@@ -8518,6 +8556,9 @@
"noCache": { "noCache": {
"type": "boolean" "type": "boolean"
}, },
"params": {
"type": "string"
},
"parentId": { "parentId": {
"type": "integer" "type": "integer"
}, },
...@@ -8530,6 +8571,9 @@ ...@@ -8530,6 +8571,9 @@
"permission": { "permission": {
"type": "string" "type": "string"
}, },
"roleId": {
"type": "integer"
},
"sort": { "sort": {
"type": "integer" "type": "integer"
}, },
......
docs/swagger.yaml
View file @ e5105abb
...@@ -464,6 +464,8 @@ definitions: ...@@ -464,6 +464,8 @@ definitions:
type: string type: string
playerName: playerName:
type: string type: string
playerNameEn:
type: string
playerNumber: playerNumber:
type: string type: string
playerUserId: playerUserId:
...@@ -478,6 +480,8 @@ definitions: ...@@ -478,6 +480,8 @@ definitions:
type: string type: string
updateBy: updateBy:
type: integer type: integer
username:
type: string
type: object type: object
dto.OrgPlayerUpdateReq: dto.OrgPlayerUpdateReq:
properties: properties:
...@@ -493,6 +497,8 @@ definitions: ...@@ -493,6 +497,8 @@ definitions:
type: string type: string
playerName: playerName:
type: string type: string
playerNameEn:
type: string
playerNumber: playerNumber:
type: string type: string
playerUserId: playerUserId:
...@@ -507,6 +513,8 @@ definitions: ...@@ -507,6 +513,8 @@ definitions:
type: string type: string
updateBy: updateBy:
type: integer type: integer
username:
type: string
type: object type: object
dto.OrgPlayerUserInsertReq: dto.OrgPlayerUserInsertReq:
properties: properties:
...@@ -594,18 +602,31 @@ definitions: ...@@ -594,18 +602,31 @@ definitions:
type: object type: object
dto.OrgTeamGetPageReq: dto.OrgTeamGetPageReq:
properties: properties:
clubId:
type: string
createBy:
type: string
createEndTime: createEndTime:
description: 结束时间 description: 结束时间
type: string type: string
createStartTime: createStartTime:
description: 开始时间 description: 开始时间
type: string type: string
createdAt:
type: string
deletedAt:
type: string
id:
type: integer
pageIndex: pageIndex:
type: integer type: integer
pageSize: pageSize:
type: integer type: integer
teamName: teamName:
description: 球队名称 type: string
updateBy:
type: string
updatedAt:
type: string type: string
type: object type: object
dto.OrgTeamInsertReq: dto.OrgTeamInsertReq:
...@@ -1425,16 +1446,10 @@ definitions: ...@@ -1425,16 +1446,10 @@ definitions:
type: object type: object
models.SysDept: models.SysDept:
properties: properties:
children:
items:
$ref: '#/definitions/models.SysDept'
type: array
createBy: createBy:
type: integer type: integer
createdAt: createdAt:
type: string type: string
dataScope:
type: string
deptId: deptId:
description: 部门编码 description: 部门编码
type: integer type: integer
...@@ -1449,8 +1464,6 @@ definitions: ...@@ -1449,8 +1464,6 @@ definitions:
leader: leader:
description: 负责人 description: 负责人
type: string type: string
params:
type: string
parentId: parentId:
description: 上级部门 description: 上级部门
type: integer type: integer
...@@ -1472,16 +1485,28 @@ definitions: ...@@ -1472,16 +1485,28 @@ definitions:
properties: properties:
action: action:
type: string type: string
apis:
items:
type: integer
type: array
breadcrumb: breadcrumb:
type: string type: string
children:
items:
$ref: '#/definitions/models.SysMenu'
type: array
component: component:
type: string type: string
createBy: createBy:
type: integer type: integer
createdAt: createdAt:
type: string type: string
dataScope:
type: string
icon: icon:
type: string type: string
is_select:
type: boolean
isFrame: isFrame:
type: string type: string
menuId: menuId:
...@@ -1492,6 +1517,8 @@ definitions: ...@@ -1492,6 +1517,8 @@ definitions:
type: string type: string
noCache: noCache:
type: boolean type: boolean
params:
type: string
parentId: parentId:
type: integer type: integer
path: path:
...@@ -1500,6 +1527,8 @@ definitions: ...@@ -1500,6 +1527,8 @@ definitions:
type: string type: string
permission: permission:
type: string type: string
roleId:
type: integer
sort: sort:
type: integer type: integer
sysApi: sysApi:
...@@ -2891,7 +2920,7 @@ paths: ...@@ -2891,7 +2920,7 @@ paths:
- <赛事>赛区 - <赛事>赛区
/api/v1/org-league: /api/v1/org-league:
delete: delete:
description: <赛事>删除联赛 description: 删除联赛
parameters: parameters:
- description: ids - description: ids
in: body in: body
...@@ -2907,11 +2936,11 @@ paths: ...@@ -2907,11 +2936,11 @@ paths:
type: string type: string
security: security:
- Bearer: [] - Bearer: []
summary: <赛事>删除联赛 summary: 删除联赛
tags: tags:
- <赛事>联赛 - 联赛
get: get:
description: <赛事>获取联赛列表 description: 获取联赛列表
parameters: parameters:
- description: 页条数 - description: 页条数
in: query in: query
...@@ -2928,13 +2957,13 @@ paths: ...@@ -2928,13 +2957,13 @@ paths:
type: string type: string
security: security:
- Bearer: [] - Bearer: []
summary: <赛事>获取联赛列表 summary: 获取联赛列表
tags: tags:
- <赛事>联赛 - 联赛
post: post:
consumes: consumes:
- application/json - application/json
description: <赛事>创建联赛 description: 创建联赛
parameters: parameters:
- description: data - description: data
in: body in: body
...@@ -2949,12 +2978,12 @@ paths: ...@@ -2949,12 +2978,12 @@ paths:
type: string type: string
security: security:
- Bearer: [] - Bearer: []
summary: <赛事>创建联赛 summary: 创建联赛
tags: tags:
- <赛事>联赛 - 联赛
/api/v1/org-league/{id}: /api/v1/org-league/{id}:
get: get:
description: <赛事>获取联赛 description: 获取联赛
parameters: parameters:
- description: id - description: id
in: path in: path
...@@ -2967,13 +2996,13 @@ paths: ...@@ -2967,13 +2996,13 @@ paths:
type: string type: string
security: security:
- Bearer: [] - Bearer: []
summary: <赛事>获取联赛 summary: 获取联赛
tags: tags:
- <赛事>联赛 - 联赛
put: put:
consumes: consumes:
- application/json - application/json
description: <赛事>修改联赛 description: 修改联赛
parameters: parameters:
- description: body - description: body
in: body in: body
...@@ -2988,9 +3017,9 @@ paths: ...@@ -2988,9 +3017,9 @@ paths:
type: string type: string
security: security:
- Bearer: [] - Bearer: []
summary: <赛事>修改联赛 summary: 修改联赛
tags: tags:
- <赛事>联赛 - 联赛
/api/v1/org-match: /api/v1/org-match:
delete: delete:
description: <赛事>删除比赛 description: <赛事>删除比赛
......
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