Skip to content

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

1

parent fda74e92
Hide whitespace changes
Inline Side-by-side
Showing with 2569 additions and 628 deletions
app/admin/models/sys_user.go
View file @ f4300b15
......@@ -7,24 +7,25 @@ import (
)
type SysUser struct {
UserId int `gorm:"primaryKey;autoIncrement;comment:编码" json:"userId"`
Username string `json:"username" gorm:"size:64;comment:用户名"`
Password string `json:"-" gorm:"size:128;comment:密码"`
NickName string `json:"nickName" gorm:"size:128;comment:昵称"`
Phone string `json:"phone" gorm:"size:11;comment:手机号"`
RoleId int `json:"roleId" gorm:"size:20;comment:角色ID"`
Salt string `json:"-" gorm:"size:255;comment:加盐"`
Avatar string `json:"avatar" gorm:"size:255;comment:头像"`
Sex string `json:"sex" gorm:"size:255;comment:性别"`
Email string `json:"email" gorm:"size:128;comment:邮箱"`
DeptId int `json:"deptId" gorm:"size:20;comment:部门"`
PostId int `json:"postId" gorm:"size:20;comment:岗位"`
Remark string `json:"remark" gorm:"size:255;comment:备注"`
Status string `json:"status" gorm:"size:4;comment:状态"`
DeptIds []int `json:"deptIds" gorm:"-"`
PostIds []int `json:"postIds" gorm:"-"`
RoleIds []int `json:"roleIds" gorm:"-"`
Dept *SysDept `json:"dept"`
UserId int `gorm:"primaryKey;autoIncrement;comment:编码" json:"userId"`
Username string `json:"username" gorm:"size:64;comment:用户名"`
Password string `json:"-" gorm:"size:128;comment:密码"`
NickName string `json:"nickName" gorm:"size:128;comment:昵称"`
NickNameEn string `json:"nickNameEn" gorm:"size:128;comment:昵称"`
Phone string `json:"phone" gorm:"size:11;comment:手机号"`
RoleId int `json:"roleId" gorm:"size:20;comment:角色ID"`
Salt string `json:"-" gorm:"size:255;comment:加盐"`
Avatar string `json:"avatar" gorm:"size:255;comment:头像"`
Sex string `json:"sex" gorm:"size:255;comment:性别"`
Email string `json:"email" gorm:"size:128;comment:邮箱"`
DeptId int `json:"deptId" gorm:"size:20;comment:部门"`
PostId int `json:"postId" gorm:"size:20;comment:岗位"`
Remark string `json:"remark" gorm:"size:255;comment:备注"`
Status string `json:"status" gorm:"size:4;comment:状态"`
DeptIds []int `json:"deptIds" gorm:"-"`
PostIds []int `json:"postIds" gorm:"-"`
RoleIds []int `json:"roleIds" gorm:"-"`
Dept *SysDept `json:"dept"`
models.ControlBy
models.ModelTime
}
......
app/admin/service/dto/sys_user.go
View file @ f4300b15
......@@ -89,19 +89,20 @@ func (s *UpdateSysUserStatusReq) Generate(model *models.SysUser) {
}
type SysUserInsertReq struct {
UserId int `json:"userId" comment:"用户ID"` // 用户ID
Username string `json:"username" comment:"用户名" vd:"len($)>0"`
Password string `json:"password" comment:"密码"`
NickName string `json:"nickName" comment:"昵称" vd:"len($)>0"`
Phone string `json:"phone" comment:"手机号" vd:"len($)>0"`
RoleId int `json:"roleId" comment:"角色ID"`
Avatar string `json:"avatar" comment:"头像"`
Sex string `json:"sex" comment:"性别"`
Email string `json:"email" comment:"邮箱" vd:"len($)>0,email"`
DeptId int `json:"deptId" comment:"部门" vd:"$>0"`
PostId int `json:"postId" comment:"岗位"`
Remark string `json:"remark" comment:"备注"`
Status string `json:"status" comment:"状态" vd:"len($)>0" default:"1"`
UserId int `json:"userId" comment:"用户ID"` // 用户ID
Username string `json:"username" comment:"用户名" vd:"len($)>0"`
Password string `json:"password" comment:"密码"`
NickName string `json:"nickName" comment:"昵称" vd:"len($)>0"`
NickNameEn string `json:"nickNameEn" comment:"昵称" vd:"len($)>0"`
Phone string `json:"phone" comment:"手机号" vd:"len($)>0"`
RoleId int `json:"roleId" comment:"角色ID"`
Avatar string `json:"avatar" comment:"头像"`
Sex string `json:"sex" comment:"性别"`
Email string `json:"email" comment:"邮箱" vd:"len($)>0,email"`
DeptId int `json:"deptId" comment:"部门" vd:"$>0"`
PostId int `json:"postId" comment:"岗位"`
Remark string `json:"remark" comment:"备注"`
Status string `json:"status" comment:"状态" vd:"len($)>0" default:"1"`
common.ControlBy
}
......@@ -128,18 +129,19 @@ func (s *SysUserInsertReq) GetId() interface{} {
}
type SysUserUpdateReq struct {
UserId int `json:"userId" comment:"用户ID"` // 用户ID
Username string `json:"username" comment:"用户名" vd:"len($)>0"`
NickName string `json:"nickName" comment:"昵称" vd:"len($)>0"`
Phone string `json:"phone" comment:"手机号" vd:"len($)>0"`
RoleId int `json:"roleId" comment:"角色ID"`
Avatar string `json:"avatar" comment:"头像"`
Sex string `json:"sex" comment:"性别"`
Email string `json:"email" comment:"邮箱" vd:"len($)>0,email"`
DeptId int `json:"deptId" comment:"部门" vd:"$>0"`
PostId int `json:"postId" comment:"岗位"`
Remark string `json:"remark" comment:"备注"`
Status string `json:"status" comment:"状态" default:"1"`
UserId int `json:"userId" comment:"用户ID"` // 用户ID
Username string `json:"username" comment:"用户名" vd:"len($)>0"`
NickName string `json:"nickName" comment:"昵称" vd:"len($)>0"`
NickNameEn string `json:"nickNameEn" comment:"昵称" vd:"len($)>0"`
Phone string `json:"phone" comment:"手机号" vd:"len($)>0"`
RoleId int `json:"roleId" comment:"角色ID"`
Avatar string `json:"avatar" comment:"头像"`
Sex string `json:"sex" comment:"性别"`
Email string `json:"email" comment:"邮箱" vd:"len($)>0,email"`
DeptId int `json:"deptId" comment:"部门" vd:"$>0"`
PostId int `json:"postId" comment:"岗位"`
Remark string `json:"remark" comment:"备注"`
Status string `json:"status" comment:"状态" default:"1"`
common.ControlBy
}
......@@ -149,6 +151,7 @@ func (s *SysUserUpdateReq) Generate(model *models.SysUser) {
}
model.Username = s.Username
model.NickName = s.NickName
model.NickNameEn = s.NickNameEn
model.Phone = s.Phone
model.RoleId = s.RoleId
model.Avatar = s.Avatar
......@@ -185,4 +188,4 @@ func (s *SysUserById) GenerateM() (common.ActiveRecord, error) {
type PassWord struct {
NewPassword string `json:"newPassword" vd:"len($)>0"`
OldPassword string `json:"oldPassword" vd:"len($)>0"`
}
\ No newline at end of file
}
app/operate/apis/org_club.go
View file @ f4300b15
package apis
import (
"fmt"
"fmt"
"strconv"
"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"
sService "go-admin/app/admin/service"
sDto "go-admin/app/admin/service/dto"
"go-admin/app/operate/models"
"go-admin/app/operate/service"
"go-admin/app/operate/service/dto"
......@@ -28,18 +31,18 @@ type OrgClub struct {
// @Router /api/v1/org-club [get]
// @Security Bearer
func (e OrgClub) GetPage(c *gin.Context) {
req := dto.OrgClubGetPageReq{}
s := service.OrgClub{}
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.OrgClubGetPageReq{}
s := service.OrgClub{}
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.OrgClub, 0)
......@@ -48,7 +51,7 @@ func (e OrgClub) 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,7 +68,7 @@ func (e OrgClub) GetPage(c *gin.Context) {
func (e OrgClub) Get(c *gin.Context) {
req := dto.OrgClubGetReq{}
s := service.OrgClub{}
err := e.MakeContext(c).
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
......@@ -81,10 +84,10 @@ func (e OrgClub) Get(c *gin.Context) {
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 +101,75 @@ func (e OrgClub) Get(c *gin.Context) {
// @Router /api/v1/org-club [post]
// @Security Bearer
func (e OrgClub) Insert(c *gin.Context) {
req := dto.OrgClubInsertReq{}
s := service.OrgClub{}
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.OrgClubInsertReq{}
s := service.OrgClub{}
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
}
sSysUser := sService.SysUser{}
reqSysUser := sDto.SysUserInsertReq{}
reqSysUser.Username = req.ClubUserName
reqSysUser.Password = "123456"
reqSysUser.NickName = req.ClubContacts
reqSysUser.NickNameEn = req.ClubContactsEn
reqSysUser.Phone = req.ClubMobile
reqSysUser.RoleId = 1
reqSysUser.Avatar = ""
reqSysUser.Sex = "0"
reqSysUser.Email = ""
reqSysUser.DeptId = 1
reqSysUser.PostId = 1
reqSysUser.Remark = "俱乐部"
reqSysUser.Status = "2"
// 设置创建人
reqSysUser.SetCreateBy(user.GetUserId(c))
err = sSysUser.Insert(&reqSysUser)
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
//关联表添加
reqClubUser := dto.OrgClubUserInsertReq{}
sClubUser := service.OrgClubUser{}
errClubUser := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
Errors
if errClubUser != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
reqClubUser.UserId = strconv.Itoa(reqSysUser.GetId().(int))
reqClubUser.ClubId = strconv.Itoa(req.GetId().(int))
// 设置创建人
reqClubUser.SetCreateBy(user.GetUserId(c))
err = sClubUser.Insert(&reqClubUser)
if err != nil {
e.Error(500, err, fmt.Sprintf("创建俱乐部 失败，\r\n失败信息 %s", err.Error()))
return
}
e.OK(req.GetId(), "创建成功")
......@@ -133,27 +186,44 @@ func (e OrgClub) Insert(c *gin.Context) {
// @Router /api/v1/org-club/{id} [put]
// @Security Bearer
func (e OrgClub) Update(c *gin.Context) {
req := dto.OrgClubUpdateReq{}
s := service.OrgClub{}
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.OrgClubUpdateReq{}
s := service.OrgClub{}
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(), "修改成功")
sSysUser := sService.SysUser{}
reqSysUser := sDto.SysUserUpdateReq{}
reqSysUser.Username = req.ClubUserName
reqSysUser.NickName = req.ClubContacts
reqSysUser.NickNameEn = req.ClubContactsEn
reqSysUser.Phone = req.ClubMobile
// 设置创建人
reqSysUser.SetCreateBy(user.GetUserId(c))
err = sSysUser.Update(&reqSysUser, p)
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
e.OK(req.GetId(), "修改成功")
}
// Delete <俱乐部>删除俱乐部
......@@ -165,18 +235,18 @@ func (e OrgClub) Update(c *gin.Context) {
// @Router /api/v1/org-club [delete]
// @Security Bearer
func (e OrgClub) Delete(c *gin.Context) {
s := service.OrgClub{}
req := dto.OrgClubDeleteReq{}
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.OrgClub{}
req := dto.OrgClubDeleteReq{}
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 +254,22 @@ func (e OrgClub) 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
}
sOrgClubUser := service.OrgClubUser{}
_, userId := sOrgClubUser.GetUserId(req.GetId().(int))
sSysUser := sService.SysUser{}
reqSysUser := sDto.SysUserById{}
reqSysUser.Id, _ = strconv.Atoi(userId)
// 设置编辑人
reqSysUser.SetUpdateBy(user.GetUserId(c))
err = sSysUser.Remove(&reqSysUser, p)
if err != nil {
e.Logger.Error(err)
return
}
e.OK( req.GetId(), "删除成功")
}
\ No newline at end of file
e.OK(req.GetId(), "删除成功")
}
app/operate/apis/org_club_player.go
View file @ f4300b15
......@@ -2,12 +2,13 @@ package apis
import (
"fmt"
cDto "go-admin/common/dto"
"strconv"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"go-admin/app/operate/models"
"go-admin/app/operate/service"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
......@@ -27,27 +28,27 @@ type OrgClubPlayer struct {
// @Router /api/v1/org-player [get]
// @Security Bearer
func (e OrgClubPlayer) 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.OrgClubPlayerGetPageReq{}
s := service.OrgClubPlayer{}
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.OrgClubPlayerGetPageReply, 0)
var count int64
err = s.GetPage(&req, p, &list, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球员 失败，\r\n失败信息 %s", err.Error()))
return
e.Error(500, err, fmt.Sprintf("获取球队 失败，\r\n失败信息 %s", err.Error()))
return
}
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
......@@ -60,11 +61,11 @@ func (e OrgClubPlayer) GetPage(c *gin.Context) {
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-player/get-match [get]
// @Router /api/v1/org-club-player/get-match [get]
// @Security Bearer
func (e OrgClubPlayer) GetPageMatch(c *gin.Context) {
req := dto.OrgPlayerGetPageReq{}
s := service.OrgPlayer{}
req := dto.GetPageMatchClubPlayerReq{}
s := service.OrgClubPlayer{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
......@@ -77,16 +78,33 @@ func (e OrgClubPlayer) GetPageMatch(c *gin.Context) {
}
p := actions.GetPermissionFromContext(c)
list := make([]models.OrgPlayer, 0)
var count int64
reply := new(dto.GetPageMatchReply)
err = s.GetPage(&req, p, &list, &count)
replyGetMatchInfo := new(cDto.PageMatchInfo)
err = s.GetMatchInfo(req.Id, p, replyGetMatchInfo)
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
}
reply.MatchInfo = *replyGetMatchInfo
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
replyGetRoundsScoring := make([]cDto.RoundsScoring, 0)
err = s.GetRoundsScoring(replyGetMatchInfo.PlayerId, replyGetMatchInfo.Rounds, "0", &replyGetRoundsScoring)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
return
}
reply.RoundsScoring = replyGetRoundsScoring
replyGetTotalScoring := make([]cDto.TotalScoring, 0)
err = s.GetTotalScoring(replyGetMatchInfo.PlayerId, replyGetMatchInfo.Rounds, replyGetMatchInfo.SeasonId, &replyGetTotalScoring)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
return
}
reply.TotalScoring = replyGetTotalScoring
e.OK(reply, "查询成功")
}
// Get <俱乐部>获取球员比赛详情
......@@ -95,12 +113,12 @@ func (e OrgClubPlayer) GetPageMatch(c *gin.Context) {
// @Tags <俱乐部>球员
// @Param id path string false "id"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-player/{id} [get]
// @Router /api/v1/org-club-player/get [get]
// @Security Bearer
func (e OrgClubPlayer) Get(c *gin.Context) {
req := dto.OrgPlayerGetReq{}
s := service.OrgPlayer{}
err := e.MakeContext(c).
req := dto.OrgClubPlayerGetReq{}
s := service.OrgClubPlayer{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
......@@ -110,14 +128,26 @@ func (e OrgClubPlayer) Get(c *gin.Context) {
e.Error(500, err, err.Error())
return
}
var object models.OrgPlayer
p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object)
reply := new(dto.OrgMatchEvaluateGetReply)
replyGetMatchInfo := new(cDto.PageMatchInfo)
err = s.GetMatchInfo(strconv.Itoa(req.Id), p, replyGetMatchInfo)
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
}
reply.MatchInfo = *replyGetMatchInfo
replyGetRoundsScoring := make([]cDto.RoundsScoring, 0)
err = s.GetRoundsScoring(replyGetMatchInfo.PlayerId, replyGetMatchInfo.Rounds, strconv.Itoa(req.Id), &replyGetRoundsScoring)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
return
}
reply.RoundsScoring = replyGetRoundsScoring
e.OK( object, "查询成功")
e.OK(reply, "查询成功")
}
app/operate/apis/org_club_team.go
View file @ f4300b15
......@@ -2,12 +2,14 @@ package apis
import (
"fmt"
"go-admin/app/operate/models"
cDto "go-admin/common/dto"
"strconv"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"go-admin/app/operate/models"
"go-admin/app/operate/service"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
......@@ -27,27 +29,27 @@ type OrgClubTeam struct {
// @Router /api/v1/org-club-team [get]
// @Security Bearer
func (e OrgClubTeam) GetPage(c *gin.Context) {
req := dto.OrgTeamGetPageReq{}
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
}
req := dto.OrgClubTeamGetPageReq{}
s := service.OrgClubTeam{}
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.OrgTeam, 0)
list := make([]dto.OrgClubTeamGetPageReply, 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(), "查询成功")
......@@ -63,8 +65,8 @@ func (e OrgClubTeam) GetPage(c *gin.Context) {
// @Router /api/v1/org-club-team/get-match [get]
// @Security Bearer
func (e OrgClubTeam) GetPageMatch(c *gin.Context) {
req := dto.OrgTeamGetPageReq{}
s := service.OrgTeam{}
req := dto.GetPageMatchClubTeamReq{}
s := service.OrgClubTeam{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
......@@ -77,16 +79,33 @@ func (e OrgClubTeam) GetPageMatch(c *gin.Context) {
}
p := actions.GetPermissionFromContext(c)
list := make([]models.OrgTeam, 0)
var count int64
reply := new(dto.GetPageMatchReply)
err = s.GetPage(&req, p, &list, &count)
replyGetMatchInfo := new(cDto.PageMatchInfo)
err = s.GetMatchInfo(strconv.Itoa(req.TeamId), p, replyGetMatchInfo)
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
}
reply.MatchInfo = *replyGetMatchInfo
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
replyGetRoundsScoring := make([]cDto.RoundsScoring, 0)
err = s.GetRoundsScoring(replyGetMatchInfo.PlayerId, replyGetMatchInfo.Rounds, &replyGetRoundsScoring)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
return
}
reply.RoundsScoring = replyGetRoundsScoring
replyGetTotalScoring := make([]cDto.TotalScoring, 0)
err = s.GetTotalScoring(replyGetMatchInfo.PlayerId, replyGetMatchInfo.Rounds, replyGetMatchInfo.SeasonId, &replyGetTotalScoring)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
return
}
reply.TotalScoring = replyGetTotalScoring
e.OK(reply, "查询成功")
}
// Get <俱乐部>获取球队比赛详情
......@@ -95,12 +114,12 @@ func (e OrgClubTeam) GetPageMatch(c *gin.Context) {
// @Tags <俱乐部>球队
// @Param id path string false "id"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-club-team/{id} [get]
// @Router /api/v1/org-club-team/get [get]
// @Security Bearer
func (e OrgClubTeam) Get(c *gin.Context) {
req := dto.OrgTeamGetReq{}
s := service.OrgTeam{}
err := e.MakeContext(c).
req := dto.OrgClubTeamGetReq{}
s := service.OrgClubTeam{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
......@@ -110,14 +129,132 @@ func (e OrgClubTeam) Get(c *gin.Context) {
e.Error(500, err, err.Error())
return
}
var object models.OrgTeam
p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object)
reply := new(dto.OrgMatchEvaluateGetReply)
replyGetMatchInfo := new(cDto.PageMatchInfo)
err = s.GetMatchInfo(strconv.Itoa(req.TeamId), p, replyGetMatchInfo)
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
}
reply.MatchInfo = *replyGetMatchInfo
replyGetRoundsScoring := make([]cDto.RoundsScoring, 0)
err = s.GetRoundsScoring(replyGetMatchInfo.TeamId, replyGetMatchInfo.Rounds, &replyGetRoundsScoring)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
return
}
reply.RoundsScoring = replyGetRoundsScoring
e.OK( object, "查询成功")
}
\ No newline at end of file
e.OK(reply, "查询成功")
}
// Get <赛事>获取比赛附加数据（比赛详情，联赛，赛区，赛季，球队）
// @Summary <赛事>获取比赛附加数据（比赛详情，联赛，赛区，赛季，球队）
// @Description <赛事>获取比赛附加数据（比赛详情，联赛，赛区，赛季，球队）
// @Tags <赛事>比赛
// @Param id path string false "id"
// @Success 200 {string} string {data=models.OrgMatchGetInfoReq} "{"code": 200, "data": [...]}"
// @Router /api/v1/org-club-team/info [get]
// @Security Bearer
func (e OrgClubTeam) GetInfo(c *gin.Context) {
req := dto.OrgClubTeamGetInfoReq{}
s := service.OrgClubTeam{}
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)
//联赛级别列表
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
}
//赛季列表
sOrgSeason := service.OrgSeason{}
listOrgSeason := make([]models.OrgSeason, 0)
var countOrgSeason int64 = 0
err = e.MakeContext(c).MakeOrm().MakeService(&sOrgSeason.Service).Errors
reqOrgSeason := new(dto.OrgSeasonGetPageReq)
reqOrgSeason.PageIndex = 1
reqOrgSeason.PageSize = 999
err = sOrgSeason.GetPage(reqOrgSeason, p, &listOrgSeason, &countOrgSeason)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取联赛 失败，\r\n失败信息 %s", err.Error()))
return
}
//赛区列表
sOrgDivision := service.OrgDivision{}
listOrgDivision := make([]models.OrgDivision, 0)
var countOrgDivision int64 = 0
err = e.MakeContext(c).MakeOrm().MakeService(&sOrgDivision.Service).Errors
reqOrgDivision := new(dto.OrgDivisionGetPageReq)
reqOrgDivision.PageIndex = 1
reqOrgDivision.PageSize = 999
err = sOrgDivision.GetPage(reqOrgDivision, p, &listOrgDivision, &countOrgDivision)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取联赛 失败，\r\n失败信息 %s", err.Error()))
return
}
//球队列表
sOrgTeam := service.OrgTeam{}
listOrgTeam := make([]models.OrgTeam, 0)
var countOrgTeam int64 = 0
err = e.MakeContext(c).MakeOrm().MakeService(&sOrgTeam.Service).Errors
reqOrgTeam := new(dto.OrgTeamGetPageReq)
reqOrgTeam.PageIndex = 1
reqOrgTeam.PageSize = 999
err = sOrgTeam.GetPage(reqOrgTeam, p, &listOrgTeam, &countOrgTeam)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取联赛 失败，\r\n失败信息 %s", err.Error()))
return
}
reply := dto.OrgMatchGetInfoReply{
OrgLeagueList: listOrgLeague,
OrgSeasonList: listOrgSeason,
OrgDivisionList: listOrgDivision,
OrgTeamList: listOrgTeam,
}
e.OK(reply, "查询成功")
}
app/operate/apis/org_team.go
View file @ f4300b15
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"
......@@ -28,18 +28,18 @@ type OrgTeam struct {
// @Router /api/v1/org-team [get]
// @Security Bearer
func (e OrgTeam) GetPage(c *gin.Context) {
req := dto.OrgTeamGetPageReq{}
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
}
req := dto.OrgTeamGetPageReq{}
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
}
p := actions.GetPermissionFromContext(c)
list := make([]models.OrgTeam, 0)
......@@ -48,7 +48,7 @@ func (e OrgTeam) 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,7 +65,7 @@ func (e OrgTeam) GetPage(c *gin.Context) {
func (e OrgTeam) Get(c *gin.Context) {
req := dto.OrgTeamGetReq{}
s := service.OrgTeam{}
err := e.MakeContext(c).
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
......@@ -81,10 +81,26 @@ func (e OrgTeam) Get(c *gin.Context) {
err = s.Get(&req, p, &object)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球队失败，\r\n失败信息 %s", err.Error()))
return
return
}
if object.ClubId == "" {
sOrgClubUser := service.OrgClubUser{}
_, object.ClubId = sOrgClubUser.GetClubId(user.GetUserId(c))
}
reqClub := dto.OrgClubGetReq{}
sClub := service.OrgClub{}
var objectClub models.OrgClub
reqClub.Id, _ = strconv.Atoi(object.ClubId)
err = sClub.Get(&reqClub, p, &objectClub)
reply := dto.OrgTeamGetReply{}
reply.ClubId = object.ClubId
reply.ClubName = objectClub.ClubName
reply.TeamName = object.TeamName
e.OK( object, "查询成功")
e.OK(object, "查询成功")
}
// Insert <球队>创建球队
......@@ -98,25 +114,25 @@ func (e OrgTeam) Get(c *gin.Context) {
// @Router /api/v1/org-team [post]
// @Security Bearer
func (e OrgTeam) Insert(c *gin.Context) {
req := dto.OrgTeamInsertReq{}
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
}
req := dto.OrgTeamInsertReq{}
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
}
// 设置创建人
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,27 @@ func (e OrgTeam) Insert(c *gin.Context) {
// @Router /api/v1/org-team/{id} [put]
// @Security Bearer
func (e OrgTeam) Update(c *gin.Context) {
req := dto.OrgTeamUpdateReq{}
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
}
req := dto.OrgTeamUpdateReq{}
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
}
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 +181,18 @@ func (e OrgTeam) Update(c *gin.Context) {
// @Router /api/v1/org-team [delete]
// @Security Bearer
func (e OrgTeam) Delete(c *gin.Context) {
s := service.OrgTeam{}
req := dto.OrgTeamDeleteReq{}
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.OrgTeam{}
req := dto.OrgTeamDeleteReq{}
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 +200,7 @@ func (e OrgTeam) 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/apis/org_team_player.go
View file @ f4300b15
......@@ -2,12 +2,13 @@ package apis
import (
"fmt"
cDto "go-admin/common/dto"
"strconv"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"go-admin/app/operate/models"
"go-admin/app/operate/service"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
......@@ -27,27 +28,27 @@ type OrgTeamPlayer struct {
// @Router /api/v1/org-team-player [get]
// @Security Bearer
func (e OrgTeamPlayer) 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.OrgTeamPlayerGetPageReq{}
s := service.OrgTeamPlayer{}
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.OrgTeamPlayerGetPageReply, 0)
var count int64
err = s.GetPage(&req, p, &list, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球员 失败，\r\n失败信息 %s", err.Error()))
return
e.Error(500, err, fmt.Sprintf("获取球队 失败，\r\n失败信息 %s", err.Error()))
return
}
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
......@@ -63,8 +64,8 @@ func (e OrgTeamPlayer) GetPage(c *gin.Context) {
// @Router /api/v1/org-team-player/get-match [get]
// @Security Bearer
func (e OrgTeamPlayer) GetPageMatch(c *gin.Context) {
req := dto.OrgPlayerGetPageReq{}
s := service.OrgPlayer{}
req := dto.GetPageMatchTeamPlayerReq{}
s := service.OrgTeamPlayer{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
......@@ -77,16 +78,33 @@ func (e OrgTeamPlayer) GetPageMatch(c *gin.Context) {
}
p := actions.GetPermissionFromContext(c)
list := make([]models.OrgPlayer, 0)
var count int64
reply := new(dto.GetPageMatchReply)
err = s.GetPage(&req, p, &list, &count)
replyGetMatchInfo := new(cDto.PageMatchInfo)
err = s.GetMatchInfo(req.Id, p, replyGetMatchInfo)
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
}
reply.MatchInfo = *replyGetMatchInfo
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
replyGetRoundsScoring := make([]cDto.RoundsScoring, 0)
err = s.GetRoundsScoring(replyGetMatchInfo.PlayerId, replyGetMatchInfo.Rounds, "0", &replyGetRoundsScoring)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
return
}
reply.RoundsScoring = replyGetRoundsScoring
replyGetTotalScoring := make([]cDto.TotalScoring, 0)
err = s.GetTotalScoring(replyGetMatchInfo.PlayerId, replyGetMatchInfo.Rounds, replyGetMatchInfo.SeasonId, &replyGetTotalScoring)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
return
}
reply.TotalScoring = replyGetTotalScoring
e.OK(reply, "查询成功")
}
// Get <球队>获取球员表现比赛详情
......@@ -98,9 +116,9 @@ func (e OrgTeamPlayer) GetPageMatch(c *gin.Context) {
// @Router /api/v1/org-team-player/{id} [get]
// @Security Bearer
func (e OrgTeamPlayer) Get(c *gin.Context) {
req := dto.OrgPlayerGetReq{}
s := service.OrgPlayer{}
err := e.MakeContext(c).
req := dto.OrgTeamPlayerGetReq{}
s := service.OrgTeamPlayer{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
......@@ -110,14 +128,26 @@ func (e OrgTeamPlayer) Get(c *gin.Context) {
e.Error(500, err, err.Error())
return
}
var object models.OrgPlayer
p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object)
reply := new(dto.OrgMatchEvaluateGetReply)
replyGetMatchInfo := new(cDto.PageMatchInfo)
err = s.GetMatchInfo(strconv.Itoa(req.Id), p, replyGetMatchInfo)
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
}
reply.MatchInfo = *replyGetMatchInfo
replyGetRoundsScoring := make([]cDto.RoundsScoring, 0)
err = s.GetRoundsScoring(replyGetMatchInfo.PlayerId, replyGetMatchInfo.Rounds, strconv.Itoa(req.Id), &replyGetRoundsScoring)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
return
}
reply.RoundsScoring = replyGetRoundsScoring
e.OK( object, "查询成功")
e.OK(reply, "查询成功")
}
app/operate/apis/org_team_team.go
View file @ f4300b15
......@@ -27,27 +27,27 @@ type OrgTeamTeam struct {
// @Router /api/v1/org-team-team [get]
// @Security Bearer
func (e OrgTeamTeam) GetPage(c *gin.Context) {
req := dto.OrgTeamGetPageReq{}
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
}
req := dto.OrgTeamTeamGetPageReq{}
s := service.OrgTeamTeam{}
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.OrgTeam, 0)
list := make([]dto.OrgTeamTeamGetPageReply, 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(), "查询成功")
......@@ -100,7 +100,7 @@ func (e OrgTeamTeam) GetPageMatch(c *gin.Context) {
func (e OrgTeamTeam) Get(c *gin.Context) {
req := dto.OrgTeamGetReq{}
s := service.OrgTeam{}
err := e.MakeContext(c).
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
......@@ -116,8 +116,8 @@ func (e OrgTeamTeam) Get(c *gin.Context) {
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, "查询成功")
}
app/operate/apis/org_team_user.go
View file @ f4300b15
package apis
import (
"fmt"
"fmt"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
......@@ -28,27 +28,27 @@ type OrgTeamUser struct {
// @Router /api/v1/org-team-user [get]
// @Security Bearer
func (e OrgTeamUser) GetPage(c *gin.Context) {
req := dto.OrgTeamUserGetPageReq{}
s := service.OrgTeamUser{}
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.OrgTeamUserGetPageReq{}
s := service.OrgTeamUser{}
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.OrgTeamUser, 0)
list := make([]dto.OrgTeamUserGetPageReply, 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 +65,7 @@ func (e OrgTeamUser) GetPage(c *gin.Context) {
func (e OrgTeamUser) Get(c *gin.Context) {
req := dto.OrgTeamUserGetReq{}
s := service.OrgTeamUser{}
err := e.MakeContext(c).
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
......@@ -81,10 +81,10 @@ func (e OrgTeamUser) Get(c *gin.Context) {
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 +98,25 @@ func (e OrgTeamUser) Get(c *gin.Context) {
// @Router /api/v1/org-team-user [post]
// @Security Bearer
func (e OrgTeamUser) Insert(c *gin.Context) {
req := dto.OrgTeamUserInsertReq{}
s := service.OrgTeamUser{}
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.OrgTeamUserInsertReq{}
s := service.OrgTeamUser{}
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 +133,27 @@ func (e OrgTeamUser) Insert(c *gin.Context) {
// @Router /api/v1/org-team-user/{id} [put]
// @Security Bearer
func (e OrgTeamUser) Update(c *gin.Context) {
req := dto.OrgTeamUserUpdateReq{}
s := service.OrgTeamUser{}
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.OrgTeamUserUpdateReq{}
s := service.OrgTeamUser{}
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 +165,18 @@ func (e OrgTeamUser) Update(c *gin.Context) {
// @Router /api/v1/org-team-user [delete]
// @Security Bearer
func (e OrgTeamUser) Delete(c *gin.Context) {
s := service.OrgTeamUser{}
req := dto.OrgTeamUserDeleteReq{}
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.OrgTeamUser{}
req := dto.OrgTeamUserDeleteReq{}
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 +184,7 @@ func (e OrgTeamUser) 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_club.go
View file @ f4300b15
package models
import (
// "gorm.io/gorm"
// "gorm.io/gorm"
"go-admin/common/models"
)
type OrgClub struct {
models.Model
ClubName string `json:"clubName" gorm:"type:varchar(255);comment:俱乐部名称"`
ClubContacts string `json:"clubContacts" gorm:"type:varchar(60);comment:俱乐部联系人"`
ClubMobile string `json:"clubMobile" gorm:"type:varchar(30);comment:俱乐部联系电话"`
ClubLogo string `json:"clubLogo" gorm:"type:varchar(255);comment:俱乐部logo"`
ClubQrcode string `json:"clubQrcode" gorm:"type:varchar(255);comment:俱乐部二维码"`
models.ModelTime
models.ControlBy
models.Model
ClubName string `json:"clubName" gorm:"type:varchar(255);comment:俱乐部名称"`
ClubUserName string `json:"clubUserName" gorm:"type:varchar(120);comment:俱乐部账号"`
ClubContacts string `json:"clubContacts" gorm:"type:varchar(120);comment:俱乐部联系人"`
ClubContactsEn string `json:"clubContactsEn" gorm:"type:varchar(120);comment:俱乐部联系人"`
ClubMobile string `json:"clubMobile" gorm:"type:varchar(30);comment:俱乐部联系电话"`
ClubLogo string `json:"clubLogo" gorm:"type:varchar(255);comment:俱乐部logo"`
ClubQrcode string `json:"clubQrcode" gorm:"type:varchar(255);comment:俱乐部二维码"`
models.ModelTime
models.ControlBy
}
func (OrgClub) TableName() string {
return "org_club"
return "org_club"
}
func (e *OrgClub) Generate() models.ActiveRecord {
......@@ -29,4 +30,4 @@ func (e *OrgClub) Generate() models.ActiveRecord {
func (e *OrgClub) GetId() interface{} {
return e.Id
}
\ No newline at end of file
}
app/operate/models/org_player.go
View file @ f4300b15
......@@ -8,7 +8,6 @@ import (
type OrgPlayer struct {
models.Model
ClubId string `json:"clubId" gorm:"type:bigint(20);comment:org_club表id"`
TeamId string `json:"teamId" gorm:"type:bigint(20);comment:org_team表id"`
PlayerName string `json:"playerName" gorm:"type:varchar(60);comment:球员姓名"`
......
app/operate/router/org_club_player.go
View file @ f4300b15
......@@ -18,7 +18,7 @@ func registerOrgClubPlayerRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWT
r := v1.Group("/org-club-player").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
{
r.GET("", api.GetPage)
r.GET("get-match", api.GetPageMatch)
r.GET("/:id", api.Get)
r.GET("/get-match", api.GetPageMatch)
r.GET("/get", api.Get)
}
}
\ No newline at end of file
}
app/operate/router/org_club_team.go
View file @ f4300b15
......@@ -18,7 +18,8 @@ func registerOrgClubTeamRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi
r := v1.Group("/org-club-team").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
{
r.GET("", api.GetPage)
r.GET("get-match", api.GetPageMatch)
r.GET("/:id", api.Get)
r.GET("/get-match", api.GetPageMatch)
r.GET("/get", api.Get)
r.GET("/info", api.GetInfo)
}
}
\ No newline at end of file
}
app/operate/router/org_team_player.go
View file @ f4300b15
......@@ -18,7 +18,7 @@ func registerOrgTeamPlayerRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWT
r := v1.Group("/org-team-player").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
{
r.GET("", api.GetPage)
r.GET("get-match", api.GetPageMatch)
r.GET("/:id", api.Get)
r.GET("/get-match", api.GetPageMatch)
r.GET("/get", api.Get)
}
}
\ No newline at end of file
}
app/operate/router/org_team_team.go
View file @ f4300b15
......@@ -18,7 +18,7 @@ func registerOrgTeamTeamRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi
r := v1.Group("/org-team-team").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
{
r.GET("", api.GetPage)
r.GET("get-match", api.GetPageMatch)
r.GET("/:id", api.Get)
r.GET("/get-match", api.GetPageMatch)
r.GET("/get", api.Get)
}
}
\ No newline at end of file
}
app/operate/service/dto/org_club.go
View file @ f4300b15
......@@ -4,26 +4,11 @@ import (
"go-admin/app/operate/models"
"go-admin/common/dto"
common "go-admin/common/models"
"time"
)
type OrgClubGetPageReq struct {
dto.Pagination `search:"-"`
OrgClubOrder
}
type OrgClubOrder struct {Id int `form:"idOrder" search:"type:order;column:id;table:org_club"`
ClubName string `form:"clubNameOrder" search:"type:order;column:club_name;table:org_club"`
ClubContacts string `form:"clubContactsOrder" search:"type:order;column:club_contacts;table:org_club"`
ClubMobile string `form:"clubMobileOrder" search:"type:order;column:club_mobile;table:org_club"`
ClubLogo string `form:"clubLogoOrder" search:"type:order;column:club_logo;table:org_club"`
ClubQrcode string `form:"clubQrcodeOrder" search:"type:order;column:club_qrcode;table:org_club"`
CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_club"`
UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_club"`
CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_club"`
UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_club"`
DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_club"`
dto.Pagination `search:"-"`
ClubName string `form:"clubNameOrder" json:"clubName" comment:"俱乐部名称"`
}
func (m *OrgClubGetPageReq) GetNeedSearch() interface{} {
......@@ -31,24 +16,28 @@ func (m *OrgClubGetPageReq) GetNeedSearch() interface{} {
}
type OrgClubInsertReq struct {
Id int `json:"-" comment:""` //
ClubName string `json:"clubName" comment:"俱乐部名称"`
ClubContacts string `json:"clubContacts" comment:"俱乐部联系人"`
ClubMobile string `json:"clubMobile" comment:"俱乐部联系电话"`
ClubLogo string `json:"clubLogo" comment:"俱乐部logo"`
ClubQrcode string `json:"clubQrcode" comment:"俱乐部二维码"`
common.ControlBy
Id int `json:"-" comment:""` //
ClubName string `json:"clubName" comment:"俱乐部名称"`
ClubUserName string `json:"clubUserName" comment:"俱乐部账号"`
ClubContacts string `json:"clubContacts" comment:"俱乐部联系人"`
ClubContactsEn string `json:"clubContactsEn" comment:"俱乐部联系人"`
ClubMobile string `json:"clubMobile" comment:"俱乐部联系电话"`
ClubLogo string `json:"clubLogo" comment:"俱乐部logo"`
ClubQrcode string `json:"clubQrcode" comment:"俱乐部二维码"`
common.ControlBy
}
func (s *OrgClubInsertReq) Generate(model *models.OrgClub) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.ClubName = s.ClubName
model.ClubContacts = s.ClubContacts
model.ClubMobile = s.ClubMobile
model.ClubLogo = s.ClubLogo
model.ClubQrcode = s.ClubQrcode
func (s *OrgClubInsertReq) Generate(model *models.OrgClub) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.ClubName = s.ClubName
model.ClubUserName = s.ClubUserName
model.ClubContacts = s.ClubContacts
model.ClubContactsEn = s.ClubContactsEn
model.ClubMobile = s.ClubMobile
model.ClubLogo = s.ClubLogo
model.ClubQrcode = s.ClubQrcode
}
func (s *OrgClubInsertReq) GetId() interface{} {
......@@ -56,24 +45,28 @@ func (s *OrgClubInsertReq) GetId() interface{} {
}
type OrgClubUpdateReq struct {
Id int `uri:"id" comment:""` //
ClubName string `json:"clubName" comment:"俱乐部名称"`
ClubContacts string `json:"clubContacts" comment:"俱乐部联系人"`
ClubMobile string `json:"clubMobile" comment:"俱乐部联系电话"`
ClubLogo string `json:"clubLogo" comment:"俱乐部logo"`
ClubQrcode string `json:"clubQrcode" comment:"俱乐部二维码"`
common.ControlBy
Id int `uri:"id" comment:""` //
ClubName string `json:"clubName" comment:"俱乐部名称"`
ClubUserName string `json:"clubUserName" comment:"俱乐部账号"`
ClubContacts string `json:"clubContacts" comment:"俱乐部联系人"`
ClubContactsEn string `json:"clubContactsEn" comment:"俱乐部联系人"`
ClubMobile string `json:"clubMobile" comment:"俱乐部联系电话"`
ClubLogo string `json:"clubLogo" comment:"俱乐部logo"`
ClubQrcode string `json:"clubQrcode" comment:"俱乐部二维码"`
common.ControlBy
}
func (s *OrgClubUpdateReq) Generate(model *models.OrgClub) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.ClubName = s.ClubName
model.ClubContacts = s.ClubContacts
model.ClubMobile = s.ClubMobile
model.ClubLogo = s.ClubLogo
model.ClubQrcode = s.ClubQrcode
func (s *OrgClubUpdateReq) Generate(model *models.OrgClub) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.ClubName = s.ClubName
model.ClubUserName = s.ClubUserName
model.ClubContacts = s.ClubContacts
model.ClubContactsEn = s.ClubContactsEn
model.ClubMobile = s.ClubMobile
model.ClubLogo = s.ClubLogo
model.ClubQrcode = s.ClubQrcode
}
func (s *OrgClubUpdateReq) GetId() interface{} {
......@@ -82,17 +75,18 @@ func (s *OrgClubUpdateReq) GetId() interface{} {
// OrgClubGetReq 功能获取请求参数
type OrgClubGetReq struct {
Id int `uri:"id"`
Id int `uri:"id"`
}
func (s *OrgClubGetReq) GetId() interface{} {
return s.Id
}
// OrgClubDeleteReq 功能删除请求参数
type OrgClubDeleteReq struct {
Ids []int `json:"ids"`
Ids int `json:"ids"`
}
func (s *OrgClubDeleteReq) GetId() interface{} {
return s.Ids
}
\ No newline at end of file
}
app/operate/service/dto/org_club_player.go 0 → 100644
View file @ f4300b15
package dto
import (
"go-admin/common/dto"
)
type OrgClubPlayerGetPageReq struct {
dto.Pagination `search:"-"`
LeagueId string `form:"leagueId" search:"type:exact;column:league_id;table:om" comment:"联赛级别id"` //联赛级别id
DivisionId string `form:"divisionId" search:"type:exact;column:division_id;table:om" comment:"赛区id"` //赛区id
SeasonId string `form:"seasonId" search:"type:exact;column:season_id;table:om" comment:"赛季id"` //赛季id
Rounds string `form:"rounds" search:"type:exact;column:rounds;table:omtp" comment:"轮次"` //轮次
PlayerName string `form:"playerName" search:"type:contains;column:player_name;table:omtp" comment:"球员名称"` //球员名称
}
type OrgClubPlayerGetPageReply struct {
Id string `json:"id"`
Rank string `json:"rank"`
LeagueName string `json:"leagueName"`
SeasonName string `json:"seasonName"`
Rounds string `json:"rounds"`
PlayerName string `json:"playerName"`
PlayerNumber string `json:"playerNumber" comment:"球衣号码"`
Position string `json:"position" comment:"场上位置"`
dto.TotalScoring
}
type GetPageMatchClubPlayerReq struct {
Id string `form:"id" json:"id"`
}
type GetPageMatchClubPlayerReply struct {
MatchInfo dto.PageMatchInfo `json:"matchInfo"`
TotalScoring []dto.TotalScoring `json:"totalScoring"`
RoundsScoring []dto.RoundsScoring `json:"roundsScoring"`
}
func (m *OrgClubPlayerGetPageReq) GetNeedSearch() interface{} {
return *m
}
// OrgMatchEvaluateGetReq 功能获取请求参数
type OrgClubPlayerGetReq struct {
Id int `uri:"id"`
}
type OrgClubPlayerGetReply struct {
MatchInfo dto.PageMatchInfo `json:"matchInfo"`
RoundsScoring []dto.RoundsScoring `json:"roundsScoring"`
}
func (s *OrgClubPlayerGetReq) GetId() interface{} {
return s.Id
}
app/operate/service/dto/org_club_team.go 0 → 100644
View file @ f4300b15
package dto
import (
"go-admin/app/operate/models"
"go-admin/common/dto"
)
type OrgClubTeamGetPageReq struct {
dto.Pagination `search:"-"`
TeamId string `form:"teamId" search:"type:exact;column:team_id;table:ot" comment:""`
LeagueId string `form:"leagueId" search:"type:exact;column:league_id;table:om" comment:""`
DivisionId string `form:"divisionId" search:"type:exact;column:division_id;table:om" comment:""`
SeasonId string `form:"seasonId" search:"type:exact;column:season_id;table:om" comment:""`
Rounds string `form:"rounds" search:"type:exact;column:rounds;table:om" comment:""`
}
type OrgClubTeamGetPageReply struct {
TeamId string `json:"teamId"`
Rank string `json:"rank"`
LeagueName string `json:"leagueName"`
DivisionName string `json:"divisionName"`
SeasonName string `json:"seasonName"`
Rounds string `json:"rounds"`
dto.TotalScoring
}
type OrgClubTeamGetInfoReq struct {
}
type OrgClubTeamGetInfoReply struct {
OrgMatch models.OrgMatch `form:"orgMatch"`
OrgLeagueList []models.OrgLeague `form:"orgLeagueList"`
OrgSeasonList []models.OrgSeason `form:"orgSeasonList"`
OrgDivisionList []models.OrgDivision `form:"orgDivisionList"`
OrgTeamList []models.OrgTeam `form:"orgTeamList"`
}
func (m *OrgClubTeamGetPageReq) GetNeedSearch() interface{} {
return *m
}
// OrgMatchGetReq 功能获取请求参数
type OrgClubTeamGetReq struct {
TeamId int `form:"teamId" json:"teamId"`
Rounds int `form:"rounds" json:"rounds"`
}
type OrgClubTeamGetReply struct {
OrgMatch models.OrgMatch `form:"orgMatch" json:"orgMatch"`
OrgMatchTeamAPlayer []models.OrgMatchTeamPlayer `form:"orgMatchTeamAPlayer" json:"orgMatchTeamAPlayer"`
OrgMatchTeamBPlayer []models.OrgMatchTeamPlayer `form:"orgMatchTeamBPlayer" json:"orgMatchTeamBPlayer"`
}
func (s *OrgClubTeamGetReq) GetId() interface{} {
return s.TeamId
}
type GetPageMatchClubTeamReq struct {
TeamId int `form:"teamId" json:"teamId"`
}
type GetPageMatchClubTeamReply struct {
MatchInfo dto.PageMatchInfo `json:"matchInfo"`
TotalScoring []dto.TotalScoring `json:"totalScoring"`
RoundsScoring []dto.RoundsScoring `json:"roundsScoring"`
}
app/operate/service/dto/org_club_user.go
View file @ f4300b15
......@@ -8,19 +8,19 @@ import (
)
type OrgClubUserGetPageReq struct {
dto.Pagination `search:"-"`
OrgClubUserOrder
dto.Pagination `search:"-"`
OrgClubUserOrder
}
type OrgClubUserOrder struct {Id int `form:"idOrder" search:"type:order;column:id;table:org_club_user"`
UserId string `form:"userIdOrder" search:"type:order;column:user_id;table:org_club_user"`
ClubId string `form:"clubIdOrder" search:"type:order;column:club_id;table:org_club_user"`
CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_club_user"`
UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_club_user"`
CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_club_user"`
UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_club_user"`
DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_club_user"`
type OrgClubUserOrder struct {
Id int `form:"idOrder" search:"type:order;column:id;table:org_club_user"`
UserId string `form:"userIdOrder" search:"type:order;column:user_id;table:org_club_user"`
ClubId string `form:"clubIdOrder" search:"type:order;column:club_id;table:org_club_user"`
CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_club_user"`
UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_club_user"`
CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_club_user"`
UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_club_user"`
DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_club_user"`
}
func (m *OrgClubUserGetPageReq) GetNeedSearch() interface{} {
......@@ -28,18 +28,18 @@ func (m *OrgClubUserGetPageReq) GetNeedSearch() interface{} {
}
type OrgClubUserInsertReq struct {
Id int `json:"-" comment:""` //
UserId string `json:"userId" comment:""`
ClubId string `json:"clubId" comment:""`
common.ControlBy
Id int `json:"-" comment:""` //
UserId string `json:"userId" comment:""`
ClubId string `json:"clubId" comment:""`
common.ControlBy
}
func (s *OrgClubUserInsertReq) Generate(model *models.OrgClubUser) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.UserId = s.UserId
model.ClubId = s.ClubId
func (s *OrgClubUserInsertReq) Generate(model *models.OrgClubUser) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.UserId = s.UserId
model.ClubId = s.ClubId
}
func (s *OrgClubUserInsertReq) GetId() interface{} {
......@@ -47,18 +47,18 @@ func (s *OrgClubUserInsertReq) GetId() interface{} {
}
type OrgClubUserUpdateReq struct {
Id int `uri:"id" comment:""` //
UserId string `json:"userId" comment:""`
ClubId string `json:"clubId" comment:""`
common.ControlBy
Id int `uri:"id" comment:""` //
UserId string `json:"userId" comment:""`
ClubId string `json:"clubId" comment:""`
common.ControlBy
}
func (s *OrgClubUserUpdateReq) Generate(model *models.OrgClubUser) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.UserId = s.UserId
model.ClubId = s.ClubId
func (s *OrgClubUserUpdateReq) Generate(model *models.OrgClubUser) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.UserId = s.UserId
model.ClubId = s.ClubId
}
func (s *OrgClubUserUpdateReq) GetId() interface{} {
......@@ -67,8 +67,9 @@ func (s *OrgClubUserUpdateReq) GetId() interface{} {
// OrgClubUserGetReq 功能获取请求参数
type OrgClubUserGetReq struct {
Id int `uri:"id"`
Id int `uri:"id"`
}
func (s *OrgClubUserGetReq) GetId() interface{} {
return s.Id
}
......@@ -80,4 +81,4 @@ type OrgClubUserDeleteReq struct {
func (s *OrgClubUserDeleteReq) GetId() interface{} {
return s.Ids
}
\ No newline at end of file
}
app/operate/service/dto/org_team.go
View file @ f4300b15
......@@ -8,19 +8,19 @@ import (
)
type OrgTeamGetPageReq struct {
dto.Pagination `search:"-"`
OrgTeamOrder
dto.Pagination `search:"-"`
OrgTeamOrder
}
type OrgTeamOrder struct {Id int `form:"idOrder" search:"type:order;column:id;table:org_team"`
ClubId string `form:"clubIdOrder" search:"type:order;column:club_id;table:org_team"`
TeamName string `form:"teamNameOrder" search:"type:order;column:team_name;table:org_team"`
CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_team"`
UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_team"`
CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_team"`
UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_team"`
DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_team"`
type OrgTeamOrder struct {
Id int `form:"idOrder" search:"type:order;column:id;table:org_team"`
ClubId string `form:"clubIdOrder" search:"type:order;column:club_id;table:org_team"`
TeamName string `form:"teamNameOrder" search:"type:order;column:team_name;table:org_team"`
CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_team"`
UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_team"`
CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_team"`
UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_team"`
DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_team"`
}
func (m *OrgTeamGetPageReq) GetNeedSearch() interface{} {
......@@ -28,18 +28,18 @@ func (m *OrgTeamGetPageReq) GetNeedSearch() interface{} {
}
type OrgTeamInsertReq struct {
Id int `json:"-" comment:""` //
ClubId string `json:"clubId" comment:"org_club表id"`
TeamName string `json:"teamName" comment:"球队名称"`
common.ControlBy
Id int `json:"-" comment:""` //
ClubId string `json:"clubId" comment:"org_club表id"`
TeamName string `json:"teamName" comment:"球队名称"`
common.ControlBy
}
func (s *OrgTeamInsertReq) Generate(model *models.OrgTeam) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.ClubId = s.ClubId
model.TeamName = s.TeamName
func (s *OrgTeamInsertReq) Generate(model *models.OrgTeam) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.ClubId = s.ClubId
model.TeamName = s.TeamName
}
func (s *OrgTeamInsertReq) GetId() interface{} {
......@@ -47,18 +47,18 @@ func (s *OrgTeamInsertReq) GetId() interface{} {
}
type OrgTeamUpdateReq struct {
Id int `uri:"id" comment:""` //
ClubId string `json:"clubId" comment:"org_club表id"`
TeamName string `json:"teamName" comment:"球队名称"`
common.ControlBy
Id int `uri:"id" comment:""` //
ClubId string `json:"clubId" comment:"org_club表id"`
TeamName string `json:"teamName" comment:"球队名称"`
common.ControlBy
}
func (s *OrgTeamUpdateReq) Generate(model *models.OrgTeam) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.ClubId = s.ClubId
model.TeamName = s.TeamName
func (s *OrgTeamUpdateReq) Generate(model *models.OrgTeam) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.ClubId = s.ClubId
model.TeamName = s.TeamName
}
func (s *OrgTeamUpdateReq) GetId() interface{} {
......@@ -67,8 +67,15 @@ func (s *OrgTeamUpdateReq) GetId() interface{} {
// OrgTeamGetReq 功能获取请求参数
type OrgTeamGetReq struct {
Id int `uri:"id"`
Id int `uri:"id"`
}
type OrgTeamGetReply struct {
ClubId string `json:"club_id"`
ClubName string `json:"club_name"`
TeamName string `json:"team_name"`
}
func (s *OrgTeamGetReq) GetId() interface{} {
return s.Id
}
......@@ -80,4 +87,4 @@ type OrgTeamDeleteReq struct {
func (s *OrgTeamDeleteReq) GetId() interface{} {
return s.Ids
}
\ No newline at end of file
}
app/operate/service/dto/org_team_player.go 0 → 100644
View file @ f4300b15
package dto
import (
"go-admin/common/dto"
)
type OrgTeamPlayerGetPageReq struct {
dto.Pagination `search:"-"`
LeagueId string `form:"leagueId" search:"type:exact;column:league_id;table:om" comment:"联赛级别id"` //联赛级别id
DivisionId string `form:"divisionId" search:"type:exact;column:division_id;table:om" comment:"赛区id"` //赛区id
SeasonId string `form:"seasonId" search:"type:exact;column:season_id;table:om" comment:"赛季id"` //赛季id
Rounds string `form:"rounds" search:"type:exact;column:rounds;table:omtp" comment:"轮次"` //轮次
PlayerName string `form:"playerName" search:"type:contains;column:player_name;table:omtp" comment:"球员名称"` //球员名称
}
type OrgTeamPlayerGetPageReply struct {
Id string `json:"id"`
Rank string `json:"rank"`
LeagueName string `json:"leagueName"`
SeasonName string `json:"seasonName"`
Rounds string `json:"rounds"`
PlayerName string `json:"playerName"`
PlayerNumber string `json:"playerNumber" comment:"球衣号码"`
Position string `json:"position" comment:"场上位置"`
dto.TotalScoring
}
type GetPageMatchTeamPlayerReq struct {
Id string `form:"id" json:"id"`
}
type GetPageMatchTeamPlayerReply struct {
MatchInfo dto.PageMatchInfo `json:"matchInfo"`
TotalScoring []dto.TotalScoring `json:"totalScoring"`
RoundsScoring []dto.RoundsScoring `json:"roundsScoring"`
}
func (m *OrgTeamPlayerGetPageReq) GetNeedSearch() interface{} {
return *m
}
// OrgMatchEvaluateGetReq 功能获取请求参数
type OrgTeamPlayerGetReq struct {
Id int `uri:"id"`
}
type OrgTeamPlayerGetReply struct {
MatchInfo dto.PageMatchInfo `json:"matchInfo"`
RoundsScoring []dto.RoundsScoring `json:"roundsScoring"`
}
func (s *OrgTeamPlayerGetReq) GetId() interface{} {
return s.Id
}
app/operate/service/dto/org_team_team.go 0 → 100644
View file @ f4300b15
package dto
import (
"go-admin/app/operate/models"
"go-admin/common/dto"
)
type OrgTeamTeamGetPageReq struct {
dto.Pagination `search:"-"`
TeamId string `form:"teamId" search:"type:exact;column:team_id;table:ot" comment:""`
LeagueId string `form:"leagueId" search:"type:exact;column:league_id;table:om" comment:""`
DivisionId string `form:"divisionId" search:"type:exact;column:division_id;table:om" comment:""`
SeasonId string `form:"seasonId" search:"type:exact;column:season_id;table:om" comment:""`
Rounds string `form:"rounds" search:"type:exact;column:rounds;table:om" comment:""`
}
type OrgTeamTeamGetPageReply struct {
TeamId string `json:"teamId"`
Rank string `json:"rank"`
LeagueName string `json:"leagueName"`
DivisionName string `json:"divisionName"`
SeasonName string `json:"seasonName"`
Rounds string `json:"rounds"`
dto.TotalScoring
}
type OrgTeamTeamGetInfoReq struct {
}
type OrgTeamTeamGetInfoReply struct {
OrgMatch models.OrgMatch `form:"orgMatch"`
OrgLeagueList []models.OrgLeague `form:"orgLeagueList"`
OrgSeasonList []models.OrgSeason `form:"orgSeasonList"`
OrgDivisionList []models.OrgDivision `form:"orgDivisionList"`
OrgTeamList []models.OrgTeam `form:"orgTeamList"`
}
func (m *OrgTeamTeamGetPageReq) GetNeedSearch() interface{} {
return *m
}
// OrgMatchGetReq 功能获取请求参数
type OrgTeamTeamGetReq struct {
TeamId int `form:"teamId" json:"teamId"`
Rounds int `form:"rounds" json:"rounds"`
}
type OrgTeamTeamGetReply struct {
OrgMatch models.OrgMatch `form:"orgMatch" json:"orgMatch"`
OrgMatchTeamAPlayer []models.OrgMatchTeamPlayer `form:"orgMatchTeamAPlayer" json:"orgMatchTeamAPlayer"`
OrgMatchTeamBPlayer []models.OrgMatchTeamPlayer `form:"orgMatchTeamBPlayer" json:"orgMatchTeamBPlayer"`
}
func (s *OrgTeamTeamGetReq) GetId() interface{} {
return s.TeamId
}
type GetPageMatchTeamTeamReq struct {
TeamId int `form:"teamId" json:"teamId"`
}
type GetPageMatchTeamTeamReply struct {
MatchInfo dto.PageMatchInfo `json:"matchInfo"`
TotalScoring []dto.TotalScoring `json:"totalScoring"`
RoundsScoring []dto.RoundsScoring `json:"roundsScoring"`
}
app/operate/service/dto/org_team_user.go
View file @ f4300b15
......@@ -4,28 +4,23 @@ import (
"go-admin/app/operate/models"
"go-admin/common/dto"
common "go-admin/common/models"
"time"
)
type OrgTeamUserGetPageReq struct {
dto.Pagination `search:"-"`
OrgTeamUserOrder
dto.Pagination `search:"-"`
TeamName string `form:"teamName" search:"type:contains;column:team_name;table:ot" comment:"球队名称"` //球队名称
Name string `form:"name" search:"type:contains;column:name;table:otu" comment:"姓名"` //姓名
Status string `form:"status" search:"type:exact;column:status;table:su" comment:"状态"` //状态
}
type OrgTeamUserOrder struct {Id int `form:"idOrder" search:"type:order;column:id;table:org_team_user"`
ClubId string `form:"clubIdOrder" search:"type:order;column:club_id;table:org_team_user"`
TeamId string `form:"teamIdOrder" search:"type:order;column:team_id;table:org_team_user"`
UserId string `form:"userIdOrder" search:"type:order;column:user_id;table:org_team_user"`
Name string `form:"nameOrder" search:"type:order;column:name;table:org_team_user"`
Sex string `form:"sexOrder" search:"type:order;column:sex;table:org_team_user"`
UserImg string `form:"userImgOrder" search:"type:order;column:user_img;table:org_team_user"`
SignImg string `form:"signImgOrder" search:"type:order;column:sign_img;table:org_team_user"`
CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_team_user"`
UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_team_user"`
CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_team_user"`
UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_team_user"`
DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_team_user"`
type OrgTeamUserGetPageReply struct {
Id string `json:"id"`
ClubName string `json:"clubName"`
TeamName string `json:"teamName"`
Name string `json:"name"`
Sex string `json:"sex"`
RoleName string `json:"roleName"`
Status string `json:"status"`
}
func (m *OrgTeamUserGetPageReq) GetNeedSearch() interface{} {
......@@ -33,28 +28,28 @@ func (m *OrgTeamUserGetPageReq) GetNeedSearch() interface{} {
}
type OrgTeamUserInsertReq struct {
Id int `json:"-" comment:""` //
ClubId string `json:"clubId" comment:"org_club表id"`
TeamId string `json:"teamId" comment:"org_team表id"`
UserId string `json:"userId" comment:"sys_user表id"`
Name string `json:"name" comment:"姓名"`
Sex string `json:"sex" comment:"性别"`
UserImg string `json:"userImg" comment:"用户照片"`
SignImg string `json:"signImg" comment:"签名照片"`
common.ControlBy
Id int `json:"-" comment:""` //
ClubId string `json:"clubId" comment:"org_club表id"`
TeamId string `json:"teamId" comment:"org_team表id"`
UserId string `json:"userId" comment:"sys_user表id"`
Name string `json:"name" comment:"姓名"`
Sex string `json:"sex" comment:"性别"`
UserImg string `json:"userImg" comment:"用户照片"`
SignImg string `json:"signImg" comment:"签名照片"`
common.ControlBy
}
func (s *OrgTeamUserInsertReq) Generate(model *models.OrgTeamUser) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.ClubId = s.ClubId
model.TeamId = s.TeamId
model.UserId = s.UserId
model.Name = s.Name
model.Sex = s.Sex
model.UserImg = s.UserImg
model.SignImg = s.SignImg
func (s *OrgTeamUserInsertReq) Generate(model *models.OrgTeamUser) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.ClubId = s.ClubId
model.TeamId = s.TeamId
model.UserId = s.UserId
model.Name = s.Name
model.Sex = s.Sex
model.UserImg = s.UserImg
model.SignImg = s.SignImg
}
func (s *OrgTeamUserInsertReq) GetId() interface{} {
......@@ -62,28 +57,28 @@ func (s *OrgTeamUserInsertReq) GetId() interface{} {
}
type OrgTeamUserUpdateReq struct {
Id int `uri:"id" comment:""` //
ClubId string `json:"clubId" comment:"org_club表id"`
TeamId string `json:"teamId" comment:"org_team表id"`
UserId string `json:"userId" comment:"sys_user表id"`
Name string `json:"name" comment:"姓名"`
Sex string `json:"sex" comment:"性别"`
UserImg string `json:"userImg" comment:"用户照片"`
SignImg string `json:"signImg" comment:"签名照片"`
common.ControlBy
Id int `uri:"id" comment:""` //
ClubId string `json:"clubId" comment:"org_club表id"`
TeamId string `json:"teamId" comment:"org_team表id"`
UserId string `json:"userId" comment:"sys_user表id"`
Name string `json:"name" comment:"姓名"`
Sex string `json:"sex" comment:"性别"`
UserImg string `json:"userImg" comment:"用户照片"`
SignImg string `json:"signImg" comment:"签名照片"`
common.ControlBy
}
func (s *OrgTeamUserUpdateReq) Generate(model *models.OrgTeamUser) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.ClubId = s.ClubId
model.TeamId = s.TeamId
model.UserId = s.UserId
model.Name = s.Name
model.Sex = s.Sex
model.UserImg = s.UserImg
model.SignImg = s.SignImg
func (s *OrgTeamUserUpdateReq) Generate(model *models.OrgTeamUser) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.ClubId = s.ClubId
model.TeamId = s.TeamId
model.UserId = s.UserId
model.Name = s.Name
model.Sex = s.Sex
model.UserImg = s.UserImg
model.SignImg = s.SignImg
}
func (s *OrgTeamUserUpdateReq) GetId() interface{} {
......@@ -92,8 +87,24 @@ func (s *OrgTeamUserUpdateReq) GetId() interface{} {
// OrgTeamUserGetReq 功能获取请求参数
type OrgTeamUserGetReq struct {
Id int `uri:"id"`
Id int `uri:"id"`
}
type OrgTeamUserGetReply struct {
Id string `json:"id"`
ClubName string `json:"clubName"`
TeamId string `json:"teamId"`
TeamName string `json:"teamName"`
Name string `json:"name"`
Sex string `json:"sex"`
UserImg string `json:"userImg" comment:"用户照片"`
SignImg string `json:"signImg" comment:"签名照片"`
RoleId string `json:"roleId"`
RoleName string `json:"roleName"`
Username string `json:"username"`
Status string `json:"status"`
}
func (s *OrgTeamUserGetReq) GetId() interface{} {
return s.Id
}
......@@ -105,4 +116,4 @@ type OrgTeamUserDeleteReq struct {
func (s *OrgTeamUserDeleteReq) GetId() interface{} {
return s.Ids
}
\ No newline at end of file
}
app/operate/service/org_club.go
View file @ f4300b15
......@@ -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 *OrgClub) Get(d *dto.OrgClubGetReq, p *actions.DataPermission, model *mo
// Insert 创建OrgClub对象
func (e *OrgClub) Insert(c *dto.OrgClubInsertReq) error {
var err error
var data models.OrgClub
c.Generate(&data)
var err error
var data models.OrgClub
c.Generate(&data)
err = e.Orm.Create(&data).Error
if err != nil {
e.Log.Errorf("OrgClubService Insert error:%s \r\n", err)
......@@ -72,22 +72,22 @@ func (e *OrgClub) Insert(c *dto.OrgClubInsertReq) error {
// Update 修改OrgClub对象
func (e *OrgClub) Update(c *dto.OrgClubUpdateReq, p *actions.DataPermission) error {
var err error
var data = models.OrgClub{}
e.Orm.Scopes(
actions.Permission(data.TableName(), p),
).First(&data, c.GetId())
c.Generate(&data)
var err error
var data = models.OrgClub{}
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("OrgClubService 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("OrgClubService Save error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
return nil
}
// Remove 删除OrgClub
......@@ -99,11 +99,11 @@ func (e *OrgClub) Remove(d *dto.OrgClubDeleteReq, p *actions.DataPermission) err
actions.Permission(data.TableName(), p),
).Delete(&data, d.GetId())
if err := db.Error; err != nil {
e.Log.Errorf("Service RemoveOrgClub error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
e.Log.Errorf("Service RemoveOrgClub error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
return nil
}
\ No newline at end of file
}
app/operate/service/org_club_player.go 0 → 100644
View file @ f4300b15
package service
import (
"errors"
"github.com/go-admin-team/go-admin-core/sdk/service"
cDto "go-admin/common/dto"
"gorm.io/gorm"
"sort"
"strconv"
"go-admin/app/operate/models"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
)
type OrgClubPlayer struct {
service.Service
}
// GetPage 获取OrgMatchEvaluate列表
func (e *OrgClubPlayer) GetPage(c *dto.OrgClubPlayerGetPageReq, p *actions.DataPermission, list *[]dto.OrgClubPlayerGetPageReply, count *int64) error {
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").
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").
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
actions.Permission("omtp", p),
).
Find(list).Limit(-1).Offset(-1).
Count(count).Error
if err != nil {
e.Log.Errorf("OrgClubPlayer GetPage error:%s \r\n", err)
return err
}
return nil
}
// GetPage 获取OrgMatchEvaluate列表
func (e *OrgClubPlayer) GetMatchInfo(id string, p *actions.DataPermission, data *cDto.PageMatchInfo) error {
var err error
err = e.Orm.Table("org_match_team_player as omtp").
Select("omtp.id, ol.league_name, os.season_name,"+
"oc.club_name, ot.team_name, omtp.player_name, omtp.player_number, omtp.position,"+
"omtp.player_id, om.rounds, om.season_id").
Joins("left join org_club as oc on omtp.club_id = oc.id").
Joins("left join org_team as ot on omtp.team_id = ot.id").
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").
Scopes(
actions.Permission("omtp", p),
).
First(data, id).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetMatchInfo error:%s \r\n", err)
return err
}
return nil
}
func (e *OrgClubPlayer) GetRoundsScoring(playerId string, rounds string, teamPlayerId string, data *[]cDto.RoundsScoring) error {
var err error
err = e.Orm.Table("org_match_team_player as omtp").
Select("omtp.id, om.match_start_time, om.rounds, om.grouping, ot.team_name as other_team, "+
"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_team as ot on omtp.other_team_id = ot.id").
Scopes(
cDto.SetWhere("omtp", "player_id", playerId),
cDto.SetWhere("omtp", "rounds", rounds),
cDto.SetWhere("omtp", "id", teamPlayerId),
).
Find(data).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetRoundsScoring error:%s \r\n", err)
return err
}
return nil
}
func (e *OrgClubPlayer) statisticsScoring(playerId string, rounds string, seasonId string, statistics string, data *cDto.TotalScoring) error {
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 == "avg" {
field += "avg(omtp.scoring)as scoring," +
"avg(omtp.rebound)as rebound," +
"avg(omtp.assist)as assist," +
"avg(omtp.steal)as steal," +
"avg(omtp.free_throw)as free_throw," +
"avg(omtp.block_shot)as block_shot," +
"avg(omtp.foul)as foul," +
"avg(omtp.two_point_shot)as two_point_shot," +
"avg(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").
Select(field).
Where("omtp.player_id = ?", playerId).
Where("omtp.rounds = ?", rounds).
Scopes(cDto.SetWhere("om", "season_id", seasonId)).
First(data).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetTotalScoring error:%s \r\n", err)
return err
}
return nil
}
// Get 获取OrgMatchEvaluate对象
func (e *OrgClubPlayer) GetTotalScoring(playerId string, rounds string, seasonId string, data *[]cDto.TotalScoring) error {
replyGetTotalScoring1 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, "0", "sum", replyGetTotalScoring1)
*data = append(*data, *replyGetTotalScoring1)
replyGetTotalScoring2 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, "0", "avg", replyGetTotalScoring2)
*data = append(*data, *replyGetTotalScoring2)
replyGetTotalScoring3 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, seasonId, "sum", replyGetTotalScoring3)
*data = append(*data, *replyGetTotalScoring3)
replyGetTotalScoring4 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, seasonId, "avg", replyGetTotalScoring4)
*data = append(*data, *replyGetTotalScoring4)
replyGetTotalScoring5 := new(cDto.TotalScoring)
e.statisticsRankingList(playerId, seasonId, replyGetTotalScoring5)
*data = append(*data, *replyGetTotalScoring5)
return nil
}
func (e *OrgClubPlayer) statisticsRankingList(playerId string, seasonId string, scoring *cDto.TotalScoring) error {
replyGetPlayerRank := make([]models.OrgMatchTeamPlayer, 0)
err := e.statisticsRanking(seasonId, &replyGetPlayerRank)
if err != nil {
e.Log.Errorf("OrgMatchService GetTotalScoring error:%s \r\n", err)
return err
}
e.rankingScoring(replyGetPlayerRank, playerId, scoring)
e.rankingRebound(replyGetPlayerRank, playerId, scoring)
e.rankingAssist(replyGetPlayerRank, playerId, scoring)
e.rankingSteal(replyGetPlayerRank, playerId, scoring)
e.rankingFreeThrow(replyGetPlayerRank, playerId, scoring)
e.rankingBlockShot(replyGetPlayerRank, playerId, scoring)
e.rankingFoul(replyGetPlayerRank, playerId, scoring)
e.rankingTwoPointShot(replyGetPlayerRank, playerId, scoring)
e.rankingThreePointShot(replyGetPlayerRank, playerId, scoring)
return nil
}
func (e *OrgClubPlayer) rankingScoring(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Scoring > replyGetPlayerRank[j].Scoring
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Scoring = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubPlayer) rankingRebound(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Rebound > replyGetPlayerRank[j].Rebound
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Rebound = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubPlayer) rankingAssist(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Assist > replyGetPlayerRank[j].Assist
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Assist = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubPlayer) rankingSteal(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Steal > replyGetPlayerRank[j].Steal
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Steal = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubPlayer) rankingFreeThrow(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].FreeThrow > replyGetPlayerRank[j].FreeThrow
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.FreeThrow = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubPlayer) rankingBlockShot(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].BlockShot > replyGetPlayerRank[j].BlockShot
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.BlockShot = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubPlayer) rankingFoul(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Foul > replyGetPlayerRank[j].Foul
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Foul = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubPlayer) rankingTwoPointShot(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].TwoPointShot > replyGetPlayerRank[j].TwoPointShot
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.TwoPointShot = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubPlayer) rankingThreePointShot(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].ThreePointShot > replyGetPlayerRank[j].ThreePointShot
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.ThreePointShot = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubPlayer) statisticsRanking(seasonId string, data *[]models.OrgMatchTeamPlayer) error {
var err error
field := "player_id," +
"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").
Select(field).
Joins("left join org_match as om on omtp.match_id = om.id").
Where("om.season_id = ?", seasonId).
Order("player_id asc").
Group("player_id").
Find(&data).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetTotalScoring error:%s \r\n", err)
return err
}
return nil
}
// Get 获取OrgMatchEvaluate对象
func (e *OrgClubPlayer) Get(d *dto.OrgMatchEvaluateGetReq, p *actions.DataPermission, model *models.OrgMatchEvaluate) error {
var data models.OrgMatchEvaluate
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 GetOrgMatchEvaluate error:%s \r\n", err)
return err
}
if err != nil {
e.Log.Errorf("db error:%s", err)
return err
}
return nil
}
app/operate/service/org_club_team.go 0 → 100644
View file @ f4300b15
package service
import (
"errors"
"go-admin/common/utils"
"sort"
"strconv"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"go-admin/app/operate/models"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
cDto "go-admin/common/dto"
)
type OrgClubTeam struct {
service.Service
}
// GetPage 获取OrgMatch列表
func (e *OrgClubTeam) GetPage(c *dto.OrgClubTeamGetPageReq, p *actions.DataPermission, list *[]dto.OrgClubTeamGetPageReply, count *int64) error {
var err error
var data models.OrgMatch
err = e.Orm.Table("org_match_team_player as omtp").
Select("omtp.team_id, ol.league_name, os.season_name, omtp.rounds,"+
"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").
Joins("left join org_match as om on om.id = omtp.match_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").
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
actions.Permission(data.TableName(), p),
).
Group("omtp.team_id").
Find(list).Limit(-1).Offset(-1).
Count(count).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetPage error:%s \r\n", err)
return err
}
return nil
}
// GetPage 获取OrgMatch列表
func (e *OrgClubTeam) GetPageForTeam(seasonId string) (error, []models.OrgMatchTeamPlayer, int64) {
var err error
list := make([]models.OrgMatchTeamPlayer, 0)
var count int64 = 0
err = e.Orm.Table("org_match_team_player as omtp").
Select("omtp.team_id, om.match_start_time, om.rounds, om.grouping," +
"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").
Joins("left join org_match as om on om.id = omtp.match_id and omtp.rounds = om.rounds").
Scopes(cDto.SetWhere("om", "season_id", seasonId)).
Group("omtp.team_id").
Find(list).Count(&count).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetPage error:%s \r\n", err)
return err, nil, 0
}
return nil, list, count
}
// GetPage 获取OrgMatchEvaluate列表
func (e *OrgClubTeam) GetMatchInfo(id string, p *actions.DataPermission, data *cDto.PageMatchInfo) error {
var err error
err = e.Orm.Table("org_match_team_player as omtp").
Select("omtp.team_id, ol.league_name, os.season_name,"+
"oc.club_name, ot.team_name, omtp.player_id, om.season_id").
Joins("left join org_club as oc on omtp.club_id = oc.id").
Joins("left join org_team as ot on omtp.team_id = ot.id").
Joins("left join org_match as om on omtp.match_id = om.id").
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").
Scopes(
actions.Permission("omtp", p),
).
Where("omtp.team_id=?", id).
First(data).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetMatchInfo error:%s \r\n", err)
return err
}
return nil
}
func (e *OrgClubTeam) GetRoundsScoring(teamId string, rounds string, data *[]cDto.RoundsScoring) error {
var err error
err = e.Orm.Table("org_match_team_player as omtp").
Select("omtp.team_id, om.match_start_time, om.rounds, om.grouping, ot.team_name as other_team_name,"+
"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").
Joins("left join org_team as ot on omtp.other_team_id = ot.id").
Joins("left join org_match as om on om.id = omtp.match_id and omtp.rounds = om.rounds").
Scopes(
cDto.SetWhere("omtp", "team_id", teamId),
cDto.SetWhere("omtp", "rounds", rounds),
).
Group("omtp.rounds").
Find(data).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetRoundsScoring error:%s \r\n", err)
return err
}
return nil
}
func (e *OrgClubTeam) statisticsScoring(teamId string, rounds string, seasonId string, statistics string, data *cDto.TotalScoring) error {
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"
}
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).
Where("omtp.team_id = ?", teamId).
Scopes(cDto.SetWhere("om", "season_id", seasonId)).
First(data).Error
if statistics == "avg" {
_, _, teamCount := e.GetPageForTeam(seasonId)
data.Scoring = utils.GetAvg(data.Scoring, teamCount)
data.Rebound = utils.GetAvg(data.Rebound, teamCount)
data.Assist = utils.GetAvg(data.Assist, teamCount)
data.Steal = utils.GetAvg(data.Steal, teamCount)
data.FreeThrow = utils.GetAvg(data.FreeThrow, teamCount)
data.BlockShot = utils.GetAvg(data.BlockShot, teamCount)
data.Foul = utils.GetAvg(data.Foul, teamCount)
data.TwoPointShot = utils.GetAvg(data.TwoPointShot, teamCount)
data.ThreePointShot = utils.GetAvg(data.ThreePointShot, teamCount)
}
if err != nil {
e.Log.Errorf("OrgMatchService GetTotalScoring error:%s \r\n", err)
return err
}
return nil
}
// Get 获取OrgMatchEvaluate对象
func (e *OrgClubTeam) GetTotalScoring(playerId string, rounds string, seasonId string, data *[]cDto.TotalScoring) error {
replyGetTotalScoring1 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, "0", "sum", replyGetTotalScoring1)
*data = append(*data, *replyGetTotalScoring1)
replyGetTotalScoring2 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, "0", "avg", replyGetTotalScoring2)
*data = append(*data, *replyGetTotalScoring2)
replyGetTotalScoring3 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, seasonId, "sum", replyGetTotalScoring3)
*data = append(*data, *replyGetTotalScoring3)
replyGetTotalScoring4 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, seasonId, "avg", replyGetTotalScoring4)
*data = append(*data, *replyGetTotalScoring4)
replyGetTotalScoring5 := new(cDto.TotalScoring)
e.statisticsRankingList(playerId, seasonId, replyGetTotalScoring5)
*data = append(*data, *replyGetTotalScoring5)
return nil
}
func (e *OrgClubTeam) statisticsRankingList(playerId string, seasonId string, scoring *cDto.TotalScoring) error {
replyGetPlayerRank := make([]models.OrgMatchTeamPlayer, 0)
err := e.statisticsRanking(seasonId, &replyGetPlayerRank)
if err != nil {
e.Log.Errorf("OrgMatchService GetTotalScoring error:%s \r\n", err)
return err
}
e.rankingScoring(replyGetPlayerRank, playerId, scoring)
e.rankingRebound(replyGetPlayerRank, playerId, scoring)
e.rankingAssist(replyGetPlayerRank, playerId, scoring)
e.rankingSteal(replyGetPlayerRank, playerId, scoring)
e.rankingFreeThrow(replyGetPlayerRank, playerId, scoring)
e.rankingBlockShot(replyGetPlayerRank, playerId, scoring)
e.rankingFoul(replyGetPlayerRank, playerId, scoring)
e.rankingTwoPointShot(replyGetPlayerRank, playerId, scoring)
e.rankingThreePointShot(replyGetPlayerRank, playerId, scoring)
return nil
}
func (e *OrgClubTeam) rankingScoring(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Scoring > replyGetPlayerRank[j].Scoring
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Scoring = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubTeam) rankingRebound(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Rebound > replyGetPlayerRank[j].Rebound
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Rebound = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubTeam) rankingAssist(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Assist > replyGetPlayerRank[j].Assist
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Assist = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubTeam) rankingSteal(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Steal > replyGetPlayerRank[j].Steal
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Steal = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubTeam) rankingFreeThrow(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].FreeThrow > replyGetPlayerRank[j].FreeThrow
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.FreeThrow = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubTeam) rankingBlockShot(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].BlockShot > replyGetPlayerRank[j].BlockShot
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.BlockShot = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubTeam) rankingFoul(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Foul > replyGetPlayerRank[j].Foul
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Foul = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubTeam) rankingTwoPointShot(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].TwoPointShot > replyGetPlayerRank[j].TwoPointShot
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.TwoPointShot = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubTeam) rankingThreePointShot(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].ThreePointShot > replyGetPlayerRank[j].ThreePointShot
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.ThreePointShot = strconv.Itoa(k + 1)
}
}
}
func (e *OrgClubTeam) statisticsRanking(seasonId string, data *[]models.OrgMatchTeamPlayer) error {
var err error
field := "team_id," +
"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").
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").
Find(&data).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetTotalScoring error:%s \r\n", err)
return err
}
return nil
}
// Get 获取OrgMatchEvaluate对象
func (e *OrgClubTeam) Get(d *dto.OrgMatchEvaluateGetReq, p *actions.DataPermission, model *models.OrgMatchEvaluate) error {
var data models.OrgMatchEvaluate
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 GetOrgMatchEvaluate error:%s \r\n", err)
return err
}
if err != nil {
e.Log.Errorf("db error:%s", err)
return err
}
return nil
}
app/operate/service/org_club_user.go
View file @ f4300b15
......@@ -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"
......@@ -57,11 +57,39 @@ func (e *OrgClubUser) Get(d *dto.OrgClubUserGetReq, p *actions.DataPermission, m
return nil
}
// Get 获取OrgClubUser对象
func (e *OrgClubUser) GetUserId(clubId int) (error, string) {
var data models.OrgClubUser
err := e.Orm.Table("org_club_user").
Where("club_id=?", clubId).
First(data).Error
if err != nil {
e.Log.Errorf("db error:%s", err)
return err, ""
}
return nil, data.UserId
}
// Get 获取OrgClubUser对象
func (e *OrgClubUser) GetClubId(userId int) (error, string) {
var data models.OrgClubUser
err := e.Orm.Table("org_club_user").
Where("user_id=?", userId).
First(data).Error
if err != nil {
e.Log.Errorf("db error:%s", err)
return err, ""
}
return nil, data.ClubId
}
// Insert 创建OrgClubUser对象
func (e *OrgClubUser) Insert(c *dto.OrgClubUserInsertReq) error {
var err error
var data models.OrgClubUser
c.Generate(&data)
var err error
var data models.OrgClubUser
c.Generate(&data)
err = e.Orm.Create(&data).Error
if err != nil {
e.Log.Errorf("OrgClubUserService Insert error:%s \r\n", err)
......@@ -72,22 +100,22 @@ func (e *OrgClubUser) Insert(c *dto.OrgClubUserInsertReq) error {
// Update 修改OrgClubUser对象
func (e *OrgClubUser) Update(c *dto.OrgClubUserUpdateReq, p *actions.DataPermission) error {
var err error
var data = models.OrgClubUser{}
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("OrgClubUserService Save error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
return nil
var err error
var data = models.OrgClubUser{}
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("OrgClubUserService Save error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
return nil
}
// Remove 删除OrgClubUser
......@@ -99,11 +127,11 @@ func (e *OrgClubUser) Remove(d *dto.OrgClubUserDeleteReq, p *actions.DataPermiss
actions.Permission(data.TableName(), p),
).Delete(&data, d.GetId())
if err := db.Error; err != nil {
e.Log.Errorf("Service RemoveOrgClubUser error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
e.Log.Errorf("Service RemoveOrgClubUser error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
return nil
}
\ No newline at end of file
}
app/operate/service/org_match_evaluate.go
View file @ f4300b15
......@@ -24,7 +24,7 @@ func (e *OrgMatchEvaluate) GetPage(c *dto.OrgMatchEvaluateGetPageReq, p *actions
err = e.Orm.Table("org_match_team_player as omtp").
Select("omtp.id, ol.league_name, od.division_name, os.season_name, om.rounds, omtp.player_name, om.match_start_time, om.match_end_time, ome.mv_status, ome.status, ome.remark").
Joins("left join org_match_evaluate as ome on omtp.player_id = ome.player_id").
Joins("left join org_match as om on omtp.match_id = om.id").
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_division as od on od.id = om.division_id").
Joins("left join org_season as os on os.id = om.season_id").
......@@ -55,7 +55,7 @@ func (e *OrgMatchEvaluate) GetMatchInfo(id string, p *actions.DataPermission, da
Joins("left join org_match_evaluate as ome on omtp.player_id = ome.player_id").
Joins("left join org_club as oc on omtp.club_id = oc.id").
Joins("left join org_team as ot on omtp.team_id = ot.id").
Joins("left join org_match as om on omtp.match_id = om.id").
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_division as od on od.id = om.division_id").
Joins("left join org_season as os on os.id = om.season_id").
......@@ -79,7 +79,7 @@ func (e *OrgMatchEvaluate) GetRoundsScoring(playerId string, rounds string, team
Select("omtp.id, om.match_start_time, om.rounds, om.grouping, ot.team_name as other_team, "+
"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").
Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds").
Joins("left join org_team as ot on omtp.other_team_id = ot.id").
Scopes(
cDto.SetWhere("omtp", "player_id", playerId),
......@@ -123,7 +123,7 @@ func (e *OrgMatchEvaluate) statisticsScoring(playerId string, rounds string, sea
}
err = e.Orm.Table("org_match_team_player as omtp").
Joins("left join org_match as om on omtp.match_id = om.id").
Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds").
Select(field).
Where("omtp.player_id = ?", playerId).
Where("omtp.rounds = ?", rounds).
......
app/operate/service/org_team_player.go 0 → 100644
View file @ f4300b15
package service
import (
"errors"
"github.com/go-admin-team/go-admin-core/sdk/service"
cDto "go-admin/common/dto"
"gorm.io/gorm"
"sort"
"strconv"
"go-admin/app/operate/models"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
)
type OrgTeamPlayer struct {
service.Service
}
// GetPage 获取OrgMatchEvaluate列表
func (e *OrgTeamPlayer) GetPage(c *dto.OrgTeamPlayerGetPageReq, p *actions.DataPermission, list *[]dto.OrgTeamPlayerGetPageReply, count *int64) error {
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").
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").
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
actions.Permission("omtp", p),
).
Find(list).Limit(-1).Offset(-1).
Count(count).Error
if err != nil {
e.Log.Errorf("OrgClubPlayer GetPage error:%s \r\n", err)
return err
}
return nil
}
// GetPage 获取OrgMatchEvaluate列表
func (e *OrgTeamPlayer) GetMatchInfo(id string, p *actions.DataPermission, data *cDto.PageMatchInfo) error {
var err error
err = e.Orm.Table("org_match_team_player as omtp").
Select("omtp.id, ol.league_name, os.season_name,"+
"oc.club_name, ot.team_name, omtp.player_name, omtp.player_number, omtp.position,"+
"omtp.player_id, om.rounds, om.season_id").
Joins("left join org_club as oc on omtp.club_id = oc.id").
Joins("left join org_team as ot on omtp.team_id = ot.id").
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").
Scopes(
actions.Permission("omtp", p),
).
First(data, id).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetMatchInfo error:%s \r\n", err)
return err
}
return nil
}
func (e *OrgTeamPlayer) GetRoundsScoring(playerId string, rounds string, teamPlayerId string, data *[]cDto.RoundsScoring) error {
var err error
err = e.Orm.Table("org_match_team_player as omtp").
Select("omtp.id, om.match_start_time, om.rounds, om.grouping, ot.team_name as other_team, "+
"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_team as ot on omtp.other_team_id = ot.id").
Scopes(
cDto.SetWhere("omtp", "player_id", playerId),
cDto.SetWhere("omtp", "rounds", rounds),
cDto.SetWhere("omtp", "id", teamPlayerId),
).
Find(data).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetRoundsScoring error:%s \r\n", err)
return err
}
return nil
}
func (e *OrgTeamPlayer) statisticsScoring(playerId string, rounds string, seasonId string, statistics string, data *cDto.TotalScoring) error {
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 == "avg" {
field += "avg(omtp.scoring)as scoring," +
"avg(omtp.rebound)as rebound," +
"avg(omtp.assist)as assist," +
"avg(omtp.steal)as steal," +
"avg(omtp.free_throw)as free_throw," +
"avg(omtp.block_shot)as block_shot," +
"avg(omtp.foul)as foul," +
"avg(omtp.two_point_shot)as two_point_shot," +
"avg(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").
Select(field).
Where("omtp.player_id = ?", playerId).
Where("omtp.rounds = ?", rounds).
Scopes(cDto.SetWhere("om", "season_id", seasonId)).
First(data).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetTotalScoring error:%s \r\n", err)
return err
}
return nil
}
// Get 获取OrgMatchEvaluate对象
func (e *OrgTeamPlayer) GetTotalScoring(playerId string, rounds string, seasonId string, data *[]cDto.TotalScoring) error {
replyGetTotalScoring1 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, "0", "sum", replyGetTotalScoring1)
*data = append(*data, *replyGetTotalScoring1)
replyGetTotalScoring2 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, "0", "avg", replyGetTotalScoring2)
*data = append(*data, *replyGetTotalScoring2)
replyGetTotalScoring3 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, seasonId, "sum", replyGetTotalScoring3)
*data = append(*data, *replyGetTotalScoring3)
replyGetTotalScoring4 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, seasonId, "avg", replyGetTotalScoring4)
*data = append(*data, *replyGetTotalScoring4)
replyGetTotalScoring5 := new(cDto.TotalScoring)
e.statisticsRankingList(playerId, seasonId, replyGetTotalScoring5)
*data = append(*data, *replyGetTotalScoring5)
return nil
}
func (e *OrgTeamPlayer) statisticsRankingList(playerId string, seasonId string, scoring *cDto.TotalScoring) error {
replyGetPlayerRank := make([]models.OrgMatchTeamPlayer, 0)
err := e.statisticsRanking(seasonId, &replyGetPlayerRank)
if err != nil {
e.Log.Errorf("OrgMatchService GetTotalScoring error:%s \r\n", err)
return err
}
e.rankingScoring(replyGetPlayerRank, playerId, scoring)
e.rankingRebound(replyGetPlayerRank, playerId, scoring)
e.rankingAssist(replyGetPlayerRank, playerId, scoring)
e.rankingSteal(replyGetPlayerRank, playerId, scoring)
e.rankingFreeThrow(replyGetPlayerRank, playerId, scoring)
e.rankingBlockShot(replyGetPlayerRank, playerId, scoring)
e.rankingFoul(replyGetPlayerRank, playerId, scoring)
e.rankingTwoPointShot(replyGetPlayerRank, playerId, scoring)
e.rankingThreePointShot(replyGetPlayerRank, playerId, scoring)
return nil
}
func (e *OrgTeamPlayer) rankingScoring(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Scoring > replyGetPlayerRank[j].Scoring
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Scoring = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamPlayer) rankingRebound(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Rebound > replyGetPlayerRank[j].Rebound
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Rebound = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamPlayer) rankingAssist(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Assist > replyGetPlayerRank[j].Assist
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Assist = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamPlayer) rankingSteal(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Steal > replyGetPlayerRank[j].Steal
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Steal = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamPlayer) rankingFreeThrow(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].FreeThrow > replyGetPlayerRank[j].FreeThrow
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.FreeThrow = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamPlayer) rankingBlockShot(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].BlockShot > replyGetPlayerRank[j].BlockShot
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.BlockShot = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamPlayer) rankingFoul(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Foul > replyGetPlayerRank[j].Foul
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Foul = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamPlayer) rankingTwoPointShot(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].TwoPointShot > replyGetPlayerRank[j].TwoPointShot
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.TwoPointShot = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamPlayer) rankingThreePointShot(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].ThreePointShot > replyGetPlayerRank[j].ThreePointShot
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.ThreePointShot = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamPlayer) statisticsRanking(seasonId string, data *[]models.OrgMatchTeamPlayer) error {
var err error
field := "player_id," +
"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").
Select(field).
Joins("left join org_match as om on omtp.match_id = om.id").
Where("om.season_id = ?", seasonId).
Order("player_id asc").
Group("player_id").
Find(&data).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetTotalScoring error:%s \r\n", err)
return err
}
return nil
}
// Get 获取OrgMatchEvaluate对象
func (e *OrgTeamPlayer) Get(d *dto.OrgMatchEvaluateGetReq, p *actions.DataPermission, model *models.OrgMatchEvaluate) error {
var data models.OrgMatchEvaluate
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 GetOrgMatchEvaluate error:%s \r\n", err)
return err
}
if err != nil {
e.Log.Errorf("db error:%s", err)
return err
}
return nil
}
app/operate/service/org_team_team.go 0 → 100644
View file @ f4300b15
package service
import (
"errors"
"go-admin/common/utils"
"sort"
"strconv"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"go-admin/app/operate/models"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
cDto "go-admin/common/dto"
)
type OrgTeamTeam struct {
service.Service
}
// GetPage 获取OrgMatch列表
func (e *OrgTeamTeam) GetPage(c *dto.OrgTeamTeamGetPageReq, p *actions.DataPermission, list *[]dto.OrgTeamTeamGetPageReply, count *int64) error {
var err error
var data models.OrgMatch
err = e.Orm.Table("org_match_team_player as omtp").
Select("omtp.team_id, ol.league_name, os.season_name, omtp.rounds,"+
"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").
Joins("left join org_match as om on om.id = omtp.match_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").
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
actions.Permission(data.TableName(), p),
).
Group("omtp.team_id").
Find(list).Limit(-1).Offset(-1).
Count(count).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetPage error:%s \r\n", err)
return err
}
return nil
}
// GetPage 获取OrgMatch列表
func (e *OrgTeamTeam) GetPageForTeam(seasonId string) (error, []models.OrgMatchTeamPlayer, int64) {
var err error
list := make([]models.OrgMatchTeamPlayer, 0)
var count int64 = 0
err = e.Orm.Table("org_match_team_player as omtp").
Select("omtp.team_id, om.match_start_time, om.rounds, om.grouping," +
"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").
Joins("left join org_match as om on om.id = omtp.match_id and omtp.rounds = om.rounds").
Scopes(cDto.SetWhere("om", "season_id", seasonId)).
Group("omtp.team_id").
Find(list).Count(&count).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetPage error:%s \r\n", err)
return err, nil, 0
}
return nil, list, count
}
// GetPage 获取OrgMatchEvaluate列表
func (e *OrgTeamTeam) GetMatchInfo(id string, p *actions.DataPermission, data *cDto.PageMatchInfo) error {
var err error
err = e.Orm.Table("org_match_team_player as omtp").
Select("omtp.team_id, ol.league_name, os.season_name,"+
"oc.club_name, ot.team_name, omtp.player_id, om.season_id").
Joins("left join org_club as oc on omtp.club_id = oc.id").
Joins("left join org_team as ot on omtp.team_id = ot.id").
Joins("left join org_match as om on omtp.match_id = om.id").
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").
Scopes(
actions.Permission("omtp", p),
).
Where("omtp.team_id=?", id).
First(data).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetMatchInfo error:%s \r\n", err)
return err
}
return nil
}
func (e *OrgTeamTeam) GetRoundsScoring(teamId string, rounds string, data *[]cDto.RoundsScoring) error {
var err error
err = e.Orm.Table("org_match_team_player as omtp").
Select("omtp.team_id, om.match_start_time, om.rounds, om.grouping, ot.team_name as other_team_name,"+
"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").
Joins("left join org_team as ot on omtp.other_team_id = ot.id").
Joins("left join org_match as om on om.id = omtp.match_id and omtp.rounds = om.rounds").
Scopes(
cDto.SetWhere("omtp", "team_id", teamId),
cDto.SetWhere("omtp", "rounds", rounds),
).
Group("omtp.rounds").
Find(data).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetRoundsScoring error:%s \r\n", err)
return err
}
return nil
}
func (e *OrgTeamTeam) statisticsScoring(teamId string, rounds string, seasonId string, statistics string, data *cDto.TotalScoring) error {
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"
}
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).
Where("omtp.team_id = ?", teamId).
Scopes(cDto.SetWhere("om", "season_id", seasonId)).
First(data).Error
if statistics == "avg" {
_, _, teamCount := e.GetPageForTeam(seasonId)
data.Scoring = utils.GetAvg(data.Scoring, teamCount)
data.Rebound = utils.GetAvg(data.Rebound, teamCount)
data.Assist = utils.GetAvg(data.Assist, teamCount)
data.Steal = utils.GetAvg(data.Steal, teamCount)
data.FreeThrow = utils.GetAvg(data.FreeThrow, teamCount)
data.BlockShot = utils.GetAvg(data.BlockShot, teamCount)
data.Foul = utils.GetAvg(data.Foul, teamCount)
data.TwoPointShot = utils.GetAvg(data.TwoPointShot, teamCount)
data.ThreePointShot = utils.GetAvg(data.ThreePointShot, teamCount)
}
if err != nil {
e.Log.Errorf("OrgMatchService GetTotalScoring error:%s \r\n", err)
return err
}
return nil
}
// Get 获取OrgMatchEvaluate对象
func (e *OrgTeamTeam) GetTotalScoring(playerId string, rounds string, seasonId string, data *[]cDto.TotalScoring) error {
replyGetTotalScoring1 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, "0", "sum", replyGetTotalScoring1)
*data = append(*data, *replyGetTotalScoring1)
replyGetTotalScoring2 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, "0", "avg", replyGetTotalScoring2)
*data = append(*data, *replyGetTotalScoring2)
replyGetTotalScoring3 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, seasonId, "sum", replyGetTotalScoring3)
*data = append(*data, *replyGetTotalScoring3)
replyGetTotalScoring4 := new(cDto.TotalScoring)
e.statisticsScoring(playerId, rounds, seasonId, "avg", replyGetTotalScoring4)
*data = append(*data, *replyGetTotalScoring4)
replyGetTotalScoring5 := new(cDto.TotalScoring)
e.statisticsRankingList(playerId, seasonId, replyGetTotalScoring5)
*data = append(*data, *replyGetTotalScoring5)
return nil
}
func (e *OrgTeamTeam) statisticsRankingList(playerId string, seasonId string, scoring *cDto.TotalScoring) error {
replyGetPlayerRank := make([]models.OrgMatchTeamPlayer, 0)
err := e.statisticsRanking(seasonId, &replyGetPlayerRank)
if err != nil {
e.Log.Errorf("OrgMatchService GetTotalScoring error:%s \r\n", err)
return err
}
e.rankingScoring(replyGetPlayerRank, playerId, scoring)
e.rankingRebound(replyGetPlayerRank, playerId, scoring)
e.rankingAssist(replyGetPlayerRank, playerId, scoring)
e.rankingSteal(replyGetPlayerRank, playerId, scoring)
e.rankingFreeThrow(replyGetPlayerRank, playerId, scoring)
e.rankingBlockShot(replyGetPlayerRank, playerId, scoring)
e.rankingFoul(replyGetPlayerRank, playerId, scoring)
e.rankingTwoPointShot(replyGetPlayerRank, playerId, scoring)
e.rankingThreePointShot(replyGetPlayerRank, playerId, scoring)
return nil
}
func (e *OrgTeamTeam) rankingScoring(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Scoring > replyGetPlayerRank[j].Scoring
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Scoring = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamTeam) rankingRebound(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Rebound > replyGetPlayerRank[j].Rebound
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Rebound = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamTeam) rankingAssist(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Assist > replyGetPlayerRank[j].Assist
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Assist = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamTeam) rankingSteal(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Steal > replyGetPlayerRank[j].Steal
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Steal = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamTeam) rankingFreeThrow(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].FreeThrow > replyGetPlayerRank[j].FreeThrow
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.FreeThrow = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamTeam) rankingBlockShot(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].BlockShot > replyGetPlayerRank[j].BlockShot
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.BlockShot = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamTeam) rankingFoul(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].Foul > replyGetPlayerRank[j].Foul
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.Foul = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamTeam) rankingTwoPointShot(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].TwoPointShot > replyGetPlayerRank[j].TwoPointShot
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.TwoPointShot = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamTeam) rankingThreePointShot(replyGetPlayerRank []models.OrgMatchTeamPlayer, playerId string, scoring *cDto.TotalScoring) {
sort.Slice(replyGetPlayerRank, func(i, j int) bool {
return replyGetPlayerRank[i].ThreePointShot > replyGetPlayerRank[j].ThreePointShot
})
for k, v := range replyGetPlayerRank {
if v.PlayerId == playerId {
scoring.ThreePointShot = strconv.Itoa(k + 1)
}
}
}
func (e *OrgTeamTeam) statisticsRanking(seasonId string, data *[]models.OrgMatchTeamPlayer) error {
var err error
field := "team_id," +
"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").
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").
Find(&data).Error
if err != nil {
e.Log.Errorf("OrgMatchService GetTotalScoring error:%s \r\n", err)
return err
}
return nil
}
// Get 获取OrgMatchEvaluate对象
func (e *OrgTeamTeam) Get(d *dto.OrgMatchEvaluateGetReq, p *actions.DataPermission, model *models.OrgMatchEvaluate) error {
var data models.OrgMatchEvaluate
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 GetOrgMatchEvaluate error:%s \r\n", err)
return err
}
if err != nil {
e.Log.Errorf("db error:%s", err)
return err
}
return nil
}
app/operate/service/org_team_user.go
View file @ f4300b15
......@@ -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"
......@@ -17,11 +17,17 @@ type OrgTeamUser struct {
}
// GetPage 获取OrgTeamUser列表
func (e *OrgTeamUser) GetPage(c *dto.OrgTeamUserGetPageReq, p *actions.DataPermission, list *[]models.OrgTeamUser, count *int64) error {
func (e *OrgTeamUser) GetPage(c *dto.OrgTeamUserGetPageReq, p *actions.DataPermission, list *[]dto.OrgTeamUserGetPageReply, count *int64) error {
var err error
var data models.OrgTeamUser
field := "oc.club_name, ot.team_name, otu.name, otu.sex, sr.role_name, su.status"
err = e.Orm.Model(&data).
err = e.Orm.Table("org_team_user as otu").
Select(field).
Joins("org_team as ot on otu.team_id=ot.id").
Joins("org_club as oc on otu.club_id=oc.id").
Joins("sys_user as su on otu.user_id=su.user_id").
Joins("sys_role as sr on su.role_id=sr.role_id").
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
......@@ -38,12 +44,14 @@ func (e *OrgTeamUser) GetPage(c *dto.OrgTeamUserGetPageReq, p *actions.DataPermi
// Get 获取OrgTeamUser对象
func (e *OrgTeamUser) Get(d *dto.OrgTeamUserGetReq, p *actions.DataPermission, model *models.OrgTeamUser) error {
var data models.OrgTeamUser
field := "oc.club_name, ot.team_id, ot.team_name, otu.name, otu.sex, otu.user_img, otu.sign_img, sr.role_id, sr.role_name, su.username, su.status"
err := e.Orm.Model(&data).
Scopes(
actions.Permission(data.TableName(), p),
).
err := e.Orm.Table("org_team_user as otu").
Select(field).
Joins("org_team as ot on otu.team_id=ot.id").
Joins("org_club as oc on otu.club_id=oc.id").
Joins("sys_user as su on otu.user_id=su.id").
Joins("sys_role as sr on su.role_id=sr.role_id").
First(model, d.GetId()).Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看")
......@@ -59,9 +67,9 @@ func (e *OrgTeamUser) Get(d *dto.OrgTeamUserGetReq, p *actions.DataPermission, m
// Insert 创建OrgTeamUser对象
func (e *OrgTeamUser) Insert(c *dto.OrgTeamUserInsertReq) error {
var err error
var data models.OrgTeamUser
c.Generate(&data)
var err error
var data models.OrgTeamUser
c.Generate(&data)
err = e.Orm.Create(&data).Error
if err != nil {
e.Log.Errorf("OrgTeamUserService Insert error:%s \r\n", err)
......@@ -72,22 +80,22 @@ func (e *OrgTeamUser) Insert(c *dto.OrgTeamUserInsertReq) error {
// Update 修改OrgTeamUser对象
func (e *OrgTeamUser) Update(c *dto.OrgTeamUserUpdateReq, p *actions.DataPermission) error {
var err error
var data = models.OrgTeamUser{}
e.Orm.Scopes(
actions.Permission(data.TableName(), p),
).First(&data, c.GetId())
c.Generate(&data)
var err error
var data = models.OrgTeamUser{}
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("OrgTeamUserService 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("OrgTeamUserService Save error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
return nil
}
// Remove 删除OrgTeamUser
......@@ -99,11 +107,11 @@ func (e *OrgTeamUser) Remove(d *dto.OrgTeamUserDeleteReq, p *actions.DataPermiss
actions.Permission(data.TableName(), p),
).Delete(&data, d.GetId())
if err := db.Error; err != nil {
e.Log.Errorf("Service RemoveOrgTeamUser error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
e.Log.Errorf("Service RemoveOrgTeamUser error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
return nil
}
\ No newline at end of file
}
common/dto/match.go
View file @ f4300b15
......@@ -10,6 +10,7 @@ type PageMatchInfo struct {
SeasonName string `json:"seasonName"`
Rounds string `json:"rounds"`
ClubName string `json:"clubName"`
TeamId string `json:"teamId"`
TeamName string `json:"teamName"`
PlayerId string `json:"playerId"`
PlayerName string `json:"playerName"`
......
common/utils/common.go 0 → 100644
View file @ f4300b15
package utils
import "strconv"
func StringToInt(data string) int {
reply, _ := strconv.Atoi(data)
return reply
}
func GetAvg(data string, count int64) string {
return strconv.Itoa(StringToInt(data) / int(count))
}
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