diff --git a/app/operate/apis/org_match.go b/app/operate/apis/org_match.go index 35d27d3f692c16948f53f764de2098dcdd4f146a..dc79b65ace03e8a48644ebefd11452691553a28f 100644 --- a/app/operate/apis/org_match.go +++ b/app/operate/apis/org_match.go @@ -358,7 +358,7 @@ func (e OrgMatch) GetPlayer(c *gin.Context) { } p := actions.GetPermissionFromContext(c) - list := make([]models.OrgPlayer, 0) + list := make([]dto.OrgPlayerGetPageReply, 0) var count int64 req.PageIndex = 1 @@ -449,7 +449,7 @@ func (e OrgMatch) UpdatePlayer(c *gin.Context) { teamId := "" for _, v := range playersIds { - orgPlayer := new(models.OrgPlayer) + orgPlayer := new(dto.OrgPlayerGetReply) id, _ := strconv.Atoi(v) reqOrgPlayer := new(dto.OrgPlayerGetReq) reqOrgPlayer.Id = id diff --git a/app/operate/apis/org_player.go b/app/operate/apis/org_player.go index 885f6f713fc24ca46502a2eaea6b4a3f0ef6bc04..58ece8b8652f7e7983fcde4be5e4847aae0cf613 100644 --- a/app/operate/apis/org_player.go +++ b/app/operate/apis/org_player.go @@ -1,14 +1,13 @@ 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" _ "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/dto" "go-admin/common/actions" @@ -28,27 +27,27 @@ type OrgPlayer struct { // @Router /api/v1/org-player [get] // @Security Bearer func (e OrgPlayer) GetPage(c *gin.Context) { - req := dto.OrgPlayerGetPageReq{} - s := service.OrgPlayer{} - 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.OrgPlayerGetPageReq{} + s := service.OrgPlayer{} + 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.OrgPlayer, 0) + list := make([]dto.OrgPlayerGetPageReply, 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 + return } e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询æˆåŠŸ") @@ -65,7 +64,7 @@ func (e OrgPlayer) GetPage(c *gin.Context) { func (e OrgPlayer) Get(c *gin.Context) { req := dto.OrgPlayerGetReq{} s := service.OrgPlayer{} - err := e.MakeContext(c). + err := e.MakeContext(c). MakeOrm(). Bind(&req). MakeService(&s.Service). @@ -75,16 +74,16 @@ func (e OrgPlayer) Get(c *gin.Context) { e.Error(500, err, err.Error()) return } - var object models.OrgPlayer + var object dto.OrgPlayerGetReply 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 + return } - e.OK( object, "查询æˆåŠŸ") + e.OK(object, "查询æˆåŠŸ") } // Insert <çƒé˜Ÿ>创建çƒå‘˜ @@ -98,25 +97,42 @@ func (e OrgPlayer) Get(c *gin.Context) { // @Router /api/v1/org-player [post] // @Security Bearer func (e OrgPlayer) Insert(c *gin.Context) { - req := dto.OrgPlayerInsertReq{} - s := service.OrgPlayer{} - 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.OrgPlayerInsertReq{} + s := service.OrgPlayer{} + 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 + } + + 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)) 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 +149,43 @@ func (e OrgPlayer) Insert(c *gin.Context) { // @Router /api/v1/org-player/{id} [put] // @Security Bearer func (e OrgPlayer) Update(c *gin.Context) { - req := dto.OrgPlayerUpdateReq{} - s := service.OrgPlayer{} - 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.OrgPlayerUpdateReq{} + s := service.OrgPlayer{} + 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) + 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) 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 +197,18 @@ func (e OrgPlayer) Update(c *gin.Context) { // @Router /api/v1/org-player [delete] // @Security Bearer func (e OrgPlayer) Delete(c *gin.Context) { - s := service.OrgPlayer{} - req := dto.OrgPlayerDeleteReq{} - 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.OrgPlayer{} + req := dto.OrgPlayerDeleteReq{} + 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 +216,7 @@ func (e OrgPlayer) 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(), "åˆ é™¤æˆåŠŸ") +} diff --git a/app/operate/apis/org_team_match.go b/app/operate/apis/org_team_match.go index aa39033220214f25cbdb38d6221602a83b15f543..948a1fb9f3cc2f82752ce44fcfa44ea02275c8d0 100644 --- a/app/operate/apis/org_team_match.go +++ b/app/operate/apis/org_team_match.go @@ -78,11 +78,11 @@ func (e OrgTeamMatch) GetPlayers(c *gin.Context) { } p := actions.GetPermissionFromContext(c) - list := make([]models.OrgPlayer, 0) + list := make([]dto.OrgPlayerGetPageReply, 0) var count int64 req.PageIndex = 1 - req.PageSize = 999 + req.PageSize = 9999 err = s.GetPage(&req, p, &list, &count) if err != nil { @@ -167,7 +167,7 @@ func (e OrgTeamMatch) UpdatePlayers(c *gin.Context) { teamId := "" for _, v := range playersIds { - orgPlayer := new(models.OrgPlayer) + orgPlayer := new(dto.OrgPlayerGetReply) id, _ := strconv.Atoi(v) reqOrgPlayer := new(dto.OrgPlayerGetReq) reqOrgPlayer.Id = id diff --git a/app/operate/service/dto/org_player.go b/app/operate/service/dto/org_player.go index 3ec2e9abc2aff7b9773129c7753e25eb406b119d..84bc1825a70989c1917ce3b5801b03b7073ca72f 100644 --- a/app/operate/service/dto/org_player.go +++ b/app/operate/service/dto/org_player.go @@ -4,12 +4,29 @@ import ( "go-admin/app/operate/models" "go-admin/common/dto" common "go-admin/common/models" + "golang.org/x/crypto/bcrypt" "time" ) type OrgPlayerGetPageReq struct { 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 { @@ -47,6 +64,8 @@ type OrgPlayerInsertReq struct { PlayerImg string `json:"playerImg" comment:"çƒå‘˜ç…§ç‰‡"` PlayerUserId string `json:"playerUserId" comment:"org_player_user表id"` ShareConf string `json:"shareConf" comment:"分享功能 1 å¼€å¯ 2 å…³é—"` + PlayerNameEn string `json:"playerNameEn" comment:"çƒå‘˜å称英文"` + Username string `json:"username" comment:"è´¦å·"` common.ControlBy } @@ -82,6 +101,8 @@ type OrgPlayerUpdateReq struct { PlayerImg string `json:"playerImg" comment:"çƒå‘˜ç…§ç‰‡"` PlayerUserId string `json:"playerUserId" comment:"org_player_user表id"` ShareConf string `json:"shareConf" comment:"分享功能 1 å¼€å¯ 2 å…³é—"` + PlayerNameEn string `json:"playerNameEn" comment:"çƒå‘˜å称英文"` + Username string `json:"username" comment:"è´¦å·"` common.ControlBy } @@ -110,6 +131,24 @@ type OrgPlayerGetReq struct { 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{} { return s.Id } @@ -122,3 +161,18 @@ type OrgPlayerDeleteReq struct { func (s *OrgPlayerDeleteReq) GetId() interface{} { 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) + + } +} diff --git a/app/operate/service/org_player.go b/app/operate/service/org_player.go index 3baa7cff3c91344711c72f2fbf3056456cb333c0..d3e16a18e5b73aee92b558c13adb3bd3b923cb54 100644 --- a/app/operate/service/org_player.go +++ b/app/operate/service/org_player.go @@ -16,16 +16,22 @@ type OrgPlayer struct { } // 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 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( cDto.MakeCondition(c.GetNeedSearch()), cDto.Paginate(c.GetPageSize(), c.GetPageIndex()), 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). Count(count).Error @@ -37,10 +43,16 @@ func (e *OrgPlayer) GetPage(c *dto.OrgPlayerGetPageReq, p *actions.DataPermissio } // 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 - 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( actions.Permission(data.TableName(), p), ). diff --git a/app/operate/service/org_player_user.go b/app/operate/service/org_player_user.go index fb5bc8320aa2b7344838fa57973e594d327cae6d..92e461f35df0944bade10863087625789ab8a121 100644 --- a/app/operate/service/org_player_user.go +++ b/app/operate/service/org_player_user.go @@ -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,35 +59,36 @@ func (e *OrgPlayerUser) Get(d *dto.OrgPlayerUserGetReq, p *actions.DataPermissio // Insert 创建OrgPlayerUser对象 func (e *OrgPlayerUser) Insert(c *dto.OrgPlayerUserInsertReq) error { - var err error - var data models.OrgPlayerUser - c.Generate(&data) + var err error + var data models.OrgPlayerUser + c.Generate(&data) err = e.Orm.Create(&data).Error if err != nil { e.Log.Errorf("OrgPlayerUserService Insert error:%s \r\n", err) return err } + c.Id = data.Id return nil } // Update 修改OrgPlayerUser对象 func (e *OrgPlayerUser) Update(c *dto.OrgPlayerUserUpdateReq, p *actions.DataPermission) error { - var err error - var data = models.OrgPlayerUser{} - e.Orm.Scopes( - actions.Permission(data.TableName(), p), - ).First(&data, c.GetId()) - c.Generate(&data) + var err error + var data = models.OrgPlayerUser{} + 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("OrgPlayerUserService 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("OrgPlayerUserService Save error:%s \r\n", err) + return err + } + if db.RowsAffected == 0 { + return errors.New("æ— æƒæ›´æ–°è¯¥æ•°æ®") + } + return nil } // Remove åˆ é™¤OrgPlayerUser @@ -99,11 +100,29 @@ func (e *OrgPlayerUser) Remove(d *dto.OrgPlayerUserDeleteReq, p *actions.DataPer actions.Permission(data.TableName(), p), ).Delete(&data, d.GetId()) if err := db.Error; err != nil { - e.Log.Errorf("Service RemoveOrgPlayerUser error:%s \r\n", err) - return err - } - if db.RowsAffected == 0 { - return errors.New("æ— æƒåˆ 除该数æ®") - } + e.Log.Errorf("Service RemoveOrgPlayerUser error:%s \r\n", err) + return err + } + if db.RowsAffected == 0 { + return errors.New("æ— æƒåˆ 除该数æ®") + } 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 +} diff --git a/docs/docs.go b/docs/docs.go index fd735c9e88cf5d899a10de95e0316420dd683346..edde05a21251b9ed40a9fb270bd69e2d589864ed 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -1948,11 +1948,11 @@ var doc = `{ "Bearer": [] } ], - "description": "\u003c赛事\u003e获å–è”赛列表", + "description": "获å–è”赛列表", "tags": [ - "\u003c赛事\u003eè”èµ›" + "è”èµ›" ], - "summary": "\u003c赛事\u003e获å–è”赛列表", + "summary": "获å–è”赛列表", "parameters": [ { "type": "integer", @@ -1982,14 +1982,14 @@ var doc = `{ "Bearer": [] } ], - "description": "\u003c赛事\u003e创建è”èµ›", + "description": "创建è”èµ›", "consumes": [ "application/json" ], "tags": [ - "\u003c赛事\u003eè”èµ›" + "è”èµ›" ], - "summary": "\u003c赛事\u003e创建è”èµ›", + "summary": "创建è”èµ›", "parameters": [ { "description": "data", @@ -2016,11 +2016,11 @@ var doc = `{ "Bearer": [] } ], - "description": "\u003c赛事\u003eåˆ é™¤è”èµ›", + "description": "åˆ é™¤è”èµ›", "tags": [ - "\u003c赛事\u003eè”èµ›" + "è”èµ›" ], - "summary": "\u003c赛事\u003eåˆ é™¤è”èµ›", + "summary": "åˆ é™¤è”èµ›", "parameters": [ { "description": "ids", @@ -2051,11 +2051,11 @@ var doc = `{ "Bearer": [] } ], - "description": "\u003c赛事\u003e获å–è”èµ›", + "description": "获å–è”èµ›", "tags": [ - "\u003c赛事\u003eè”èµ›" + "è”èµ›" ], - "summary": "\u003c赛事\u003e获å–è”èµ›", + "summary": "获å–è”èµ›", "parameters": [ { "type": "string", @@ -2079,14 +2079,14 @@ var doc = `{ "Bearer": [] } ], - "description": "\u003c赛事\u003e修改è”èµ›", + "description": "修改è”èµ›", "consumes": [ "application/json" ], "tags": [ - "\u003c赛事\u003eè”èµ›" + "è”èµ›" ], - "summary": "\u003c赛事\u003e修改è”èµ›", + "summary": "修改è”èµ›", "parameters": [ { "description": "body", @@ -7016,6 +7016,9 @@ var doc = `{ "playerName": { "type": "string" }, + "playerNameEn": { + "type": "string" + }, "playerNumber": { "type": "string" }, @@ -7036,6 +7039,9 @@ var doc = `{ }, "updateBy": { "type": "integer" + }, + "username": { + "type": "string" } } }, @@ -7060,6 +7066,9 @@ var doc = `{ "playerName": { "type": "string" }, + "playerNameEn": { + "type": "string" + }, "playerNumber": { "type": "string" }, @@ -7080,6 +7089,9 @@ var doc = `{ }, "updateBy": { "type": "integer" + }, + "username": { + "type": "string" } } }, @@ -7214,6 +7226,12 @@ var doc = `{ "dto.OrgTeamGetPageReq": { "type": "object", "properties": { + "clubId": { + "type": "string" + }, + "createBy": { + "type": "string" + }, "createEndTime": { "description": "ç»“æŸæ—¶é—´", "type": "string" @@ -7222,6 +7240,15 @@ var doc = `{ "description": "开始时间", "type": "string" }, + "createdAt": { + "type": "string" + }, + "deletedAt": { + "type": "string" + }, + "id": { + "type": "integer" + }, "pageIndex": { "type": "integer" }, @@ -7229,7 +7256,12 @@ var doc = `{ "type": "integer" }, "teamName": { - "description": "çƒé˜Ÿåç§°", + "type": "string" + }, + "updateBy": { + "type": "string" + }, + "updatedAt": { "type": "string" } } @@ -8438,21 +8470,12 @@ 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" @@ -8472,9 +8495,6 @@ var doc = `{ "description": "负责人", "type": "string" }, - "params": { - "type": "string" - }, "parentId": { "description": "上级部门", "type": "integer" @@ -8505,9 +8525,21 @@ 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" }, @@ -8517,12 +8549,18 @@ var doc = `{ "createdAt": { "type": "string" }, + "dataScope": { + "type": "string" + }, "icon": { "type": "string" }, "isFrame": { "type": "string" }, + "is_select": { + "type": "boolean" + }, "menuId": { "type": "integer" }, @@ -8535,6 +8573,9 @@ var doc = `{ "noCache": { "type": "boolean" }, + "params": { + "type": "string" + }, "parentId": { "type": "integer" }, @@ -8547,6 +8588,9 @@ var doc = `{ "permission": { "type": "string" }, + "roleId": { + "type": "integer" + }, "sort": { "type": "integer" }, diff --git a/docs/swagger.json b/docs/swagger.json index b048679ad99eb90e2f59f92d58086ad47489e0a7..416a95c6b98708f409aa3bddba5acb5b2700b010 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -1931,11 +1931,11 @@ "Bearer": [] } ], - "description": "\u003c赛事\u003e获å–è”赛列表", + "description": "获å–è”赛列表", "tags": [ - "\u003c赛事\u003eè”èµ›" + "è”èµ›" ], - "summary": "\u003c赛事\u003e获å–è”赛列表", + "summary": "获å–è”赛列表", "parameters": [ { "type": "integer", @@ -1965,14 +1965,14 @@ "Bearer": [] } ], - "description": "\u003c赛事\u003e创建è”èµ›", + "description": "创建è”èµ›", "consumes": [ "application/json" ], "tags": [ - "\u003c赛事\u003eè”èµ›" + "è”èµ›" ], - "summary": "\u003c赛事\u003e创建è”èµ›", + "summary": "创建è”èµ›", "parameters": [ { "description": "data", @@ -1999,11 +1999,11 @@ "Bearer": [] } ], - "description": "\u003c赛事\u003eåˆ é™¤è”èµ›", + "description": "åˆ é™¤è”èµ›", "tags": [ - "\u003c赛事\u003eè”èµ›" + "è”èµ›" ], - "summary": "\u003c赛事\u003eåˆ é™¤è”èµ›", + "summary": "åˆ é™¤è”èµ›", "parameters": [ { "description": "ids", @@ -2034,11 +2034,11 @@ "Bearer": [] } ], - "description": "\u003c赛事\u003e获å–è”èµ›", + "description": "获å–è”èµ›", "tags": [ - "\u003c赛事\u003eè”èµ›" + "è”èµ›" ], - "summary": "\u003c赛事\u003e获å–è”èµ›", + "summary": "获å–è”èµ›", "parameters": [ { "type": "string", @@ -2062,14 +2062,14 @@ "Bearer": [] } ], - "description": "\u003c赛事\u003e修改è”èµ›", + "description": "修改è”èµ›", "consumes": [ "application/json" ], "tags": [ - "\u003c赛事\u003eè”èµ›" + "è”èµ›" ], - "summary": "\u003c赛事\u003e修改è”èµ›", + "summary": "修改è”èµ›", "parameters": [ { "description": "body", @@ -6999,6 +6999,9 @@ "playerName": { "type": "string" }, + "playerNameEn": { + "type": "string" + }, "playerNumber": { "type": "string" }, @@ -7019,6 +7022,9 @@ }, "updateBy": { "type": "integer" + }, + "username": { + "type": "string" } } }, @@ -7043,6 +7049,9 @@ "playerName": { "type": "string" }, + "playerNameEn": { + "type": "string" + }, "playerNumber": { "type": "string" }, @@ -7063,6 +7072,9 @@ }, "updateBy": { "type": "integer" + }, + "username": { + "type": "string" } } }, @@ -7197,6 +7209,12 @@ "dto.OrgTeamGetPageReq": { "type": "object", "properties": { + "clubId": { + "type": "string" + }, + "createBy": { + "type": "string" + }, "createEndTime": { "description": "ç»“æŸæ—¶é—´", "type": "string" @@ -7205,6 +7223,15 @@ "description": "开始时间", "type": "string" }, + "createdAt": { + "type": "string" + }, + "deletedAt": { + "type": "string" + }, + "id": { + "type": "integer" + }, "pageIndex": { "type": "integer" }, @@ -7212,7 +7239,12 @@ "type": "integer" }, "teamName": { - "description": "çƒé˜Ÿåç§°", + "type": "string" + }, + "updateBy": { + "type": "string" + }, + "updatedAt": { "type": "string" } } @@ -8421,21 +8453,12 @@ "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" @@ -8455,9 +8478,6 @@ "description": "负责人", "type": "string" }, - "params": { - "type": "string" - }, "parentId": { "description": "上级部门", "type": "integer" @@ -8488,9 +8508,21 @@ "action": { "type": "string" }, + "apis": { + "type": "array", + "items": { + "type": "integer" + } + }, "breadcrumb": { "type": "string" }, + "children": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysMenu" + } + }, "component": { "type": "string" }, @@ -8500,12 +8532,18 @@ "createdAt": { "type": "string" }, + "dataScope": { + "type": "string" + }, "icon": { "type": "string" }, "isFrame": { "type": "string" }, + "is_select": { + "type": "boolean" + }, "menuId": { "type": "integer" }, @@ -8518,6 +8556,9 @@ "noCache": { "type": "boolean" }, + "params": { + "type": "string" + }, "parentId": { "type": "integer" }, @@ -8530,6 +8571,9 @@ "permission": { "type": "string" }, + "roleId": { + "type": "integer" + }, "sort": { "type": "integer" }, diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 7ed4a3e67ebcdf60f18f5d5df8898d81740fec81..dcd9848f586b8495d644a9dc3ff9735b4d985794 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -464,6 +464,8 @@ definitions: type: string playerName: type: string + playerNameEn: + type: string playerNumber: type: string playerUserId: @@ -478,6 +480,8 @@ definitions: type: string updateBy: type: integer + username: + type: string type: object dto.OrgPlayerUpdateReq: properties: @@ -493,6 +497,8 @@ definitions: type: string playerName: type: string + playerNameEn: + type: string playerNumber: type: string playerUserId: @@ -507,6 +513,8 @@ definitions: type: string updateBy: type: integer + username: + type: string type: object dto.OrgPlayerUserInsertReq: properties: @@ -594,18 +602,31 @@ definitions: type: object dto.OrgTeamGetPageReq: properties: + clubId: + type: string + createBy: + type: string createEndTime: description: ç»“æŸæ—¶é—´ type: string createStartTime: description: 开始时间 type: string + createdAt: + type: string + deletedAt: + type: string + id: + type: integer pageIndex: type: integer pageSize: type: integer teamName: - description: çƒé˜Ÿåç§° + type: string + updateBy: + type: string + updatedAt: type: string type: object dto.OrgTeamInsertReq: @@ -1425,16 +1446,10 @@ 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 @@ -1449,8 +1464,6 @@ definitions: leader: description: 负责人 type: string - params: - type: string parentId: description: 上级部门 type: integer @@ -1472,16 +1485,28 @@ 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: @@ -1492,6 +1517,8 @@ definitions: type: string noCache: type: boolean + params: + type: string parentId: type: integer path: @@ -1500,6 +1527,8 @@ definitions: type: string permission: type: string + roleId: + type: integer sort: type: integer sysApi: @@ -2891,7 +2920,7 @@ paths: - <赛事>赛区 /api/v1/org-league: delete: - description: <赛事>åˆ é™¤è”èµ› + description: åˆ é™¤è”èµ› parameters: - description: ids in: body @@ -2907,11 +2936,11 @@ paths: type: string security: - Bearer: [] - summary: <赛事>åˆ é™¤è”èµ› + summary: åˆ é™¤è”èµ› tags: - - <赛事>è”èµ› + - è”èµ› get: - description: <赛事>获å–è”赛列表 + description: 获å–è”赛列表 parameters: - description: é¡µæ¡æ•° in: query @@ -2928,13 +2957,13 @@ paths: type: string security: - Bearer: [] - summary: <赛事>获å–è”赛列表 + summary: 获å–è”赛列表 tags: - - <赛事>è”èµ› + - è”èµ› post: consumes: - application/json - description: <赛事>创建è”èµ› + description: 创建è”èµ› parameters: - description: data in: body @@ -2949,12 +2978,12 @@ paths: type: string security: - Bearer: [] - summary: <赛事>创建è”èµ› + summary: 创建è”èµ› tags: - - <赛事>è”èµ› + - è”èµ› /api/v1/org-league/{id}: get: - description: <赛事>获å–è”èµ› + description: 获å–è”èµ› parameters: - description: id in: path @@ -2967,13 +2996,13 @@ paths: type: string security: - Bearer: [] - summary: <赛事>获å–è”èµ› + summary: 获å–è”èµ› tags: - - <赛事>è”èµ› + - è”èµ› put: consumes: - application/json - description: <赛事>修改è”èµ› + description: 修改è”èµ› parameters: - description: body in: body @@ -2988,9 +3017,9 @@ paths: type: string security: - Bearer: [] - summary: <赛事>修改è”èµ› + summary: 修改è”èµ› tags: - - <赛事>è”èµ› + - è”èµ› /api/v1/org-match: delete: description: <赛事>åˆ é™¤æ¯”èµ›