Skip to content

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

影像

parent 4c65477e
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 25 deletions
app/operate/apis/org_team_match_evaluate.go
View file @ 3a9c02be
......@@ -29,8 +29,8 @@ type OrgTeamMatchEvaluate struct {
// @Router /api/v1/org-team-match-evaluate [get]
// @Security Bearer
func (e OrgTeamMatchEvaluate) GetPage(c *gin.Context) {
req := dto.OrgMatchEvaluateGetPageReq{}
s := service.OrgMatchEvaluate{}
req := dto.OrgTeamMatchEvaluateGetPageReq{}
s := service.OrgTeamMatchEvaluate{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
......@@ -43,9 +43,15 @@ func (e OrgTeamMatchEvaluate) GetPage(c *gin.Context) {
}
p := actions.GetPermissionFromContext(c)
list := make([]dto.OrgMatchEvaluateGetPageReply, 0)
list := make([]dto.OrgTeamMatchEvaluateGetPageReply, 0)
var count int64
sOrgTeamUser := service.OrgTeamUser{}
e.MakeContext(c).MakeOrm().MakeService(&sOrgTeamUser.Service)
_, teamId := sOrgTeamUser.GetTeamId(user.GetUserId(c))
req.TeamId = teamId
err = s.GetPage(&req, p, &list, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取比赛球员信息 失败，\r\n失败信息 %s", err.Error()))
......@@ -65,8 +71,8 @@ func (e OrgTeamMatchEvaluate) GetPage(c *gin.Context) {
// @Router /api/v1/org-team-match-evaluate/get-match [get]
// @Security Bearer
func (e OrgTeamMatchEvaluate) GetPageMatch(c *gin.Context) {
req := dto.GetPageMatchReq{}
s := service.OrgMatchEvaluate{}
req := dto.GetPageTeamMatchReq{}
s := service.OrgTeamMatchEvaluate{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
......@@ -79,7 +85,7 @@ func (e OrgTeamMatchEvaluate) GetPageMatch(c *gin.Context) {
}
p := actions.GetPermissionFromContext(c)
reply := new(dto.GetPageMatchReply)
reply := new(dto.GetPageTeamMatchReply)
replyGetMatchInfo := new(cDto.PageMatchInfo)
err = s.GetMatchInfo(req.Id, p, replyGetMatchInfo)
......@@ -164,8 +170,8 @@ func (e OrgTeamMatchEvaluate) Get(c *gin.Context) {
// @Router /api/v1/org-team-match-evaluate/{id} [put]
// @Security Bearer
func (e OrgTeamMatchEvaluate) Update(c *gin.Context) {
req := dto.OrgMatchEvaluateUpdateReq{}
s := service.OrgMatchEvaluate{}
req := dto.OrgTeamMatchEvaluateUpdateReq{}
s := service.OrgTeamMatchEvaluate{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
......@@ -179,6 +185,12 @@ func (e OrgTeamMatchEvaluate) Update(c *gin.Context) {
req.SetUpdateBy(user.GetUserId(c))
p := actions.GetPermissionFromContext(c)
if req.MatchId == "" || req.Rounds == "" || req.PlayerId == "" {
e.Logger.Error(err)
e.Error(500, err, "数据有误")
return
}
err = s.Update(&req, p)
if err != nil {
......
app/operate/service/dto/org_match_evaluate.go
View file @ 3a9c02be
......@@ -9,6 +9,7 @@ import (
type OrgMatchEvaluateGetPageReq struct {
dto.Pagination `search:"-"`
TeamId string `form:"teamId" search:"-"` //联赛级别id
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
......
app/operate/service/dto/org_team_match_evaluate.go 0 → 100644
View file @ 3a9c02be
package dto
import (
"go-admin/app/operate/models"
"go-admin/common/dto"
common "go-admin/common/models"
"time"
)
type OrgTeamMatchEvaluateGetPageReq struct {
dto.Pagination `search:"-"`
TeamId string `form:"teamId" search:"-"` //联赛级别id
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:"球员名称"` //球员名称
ContentStatus string `form:"contentStatus" search:"type:exact;column:content_status;table:ome" comment:"教练评价状态 1 待评价 2 评价完成"` //教练评价状态 1 待评价 2 评价完成
MvStatus string `form:"mvStatus" search:"type:exact;column:mv_status;table:ome" comment:"视频维护状态 1 待维护 2 维护完成 3 驳回 4 维护完成"` //视频维护状态 1 待维护 2 维护完成 3 驳回 4 维护完成
Status string `form:"status" search:"type:exact;column:status;table:ome" comment:"发布状态 0 保存 1 待审核 3 驳回 4 发布完成"` //发布状态 0 保存 1 待审核 3 驳回 4 发布完成
}
type OrgTeamMatchEvaluateGetPageReply struct {
Id string `json:"id"`
LeagueName string `json:"leagueName"`
DivisionName string `json:"divisionName"`
SeasonName string `json:"seasonName"`
Rounds string `json:"rounds"`
PlayerName string `json:"playerName"`
MatchStartTime time.Time `json:"matchStartTimeOrder"`
MatchEndTime time.Time `json:"matchEndTimeOrder"`
ContentStatus string `json:"contentStatus"`
MvStatus string `json:"mvStatus"`
Status string `json:"status"`
}
type GetPageTeamMatchReq struct {
Id string `form:"id" json:"id"`
}
type GetPageTeamMatchReply struct {
MatchInfo dto.PageMatchInfo `json:"matchInfo"`
TotalScoring []dto.TotalScoring `json:"totalScoring"`
RoundsScoring []dto.RoundsScoring `json:"roundsScoring"`
}
func (m *OrgTeamMatchEvaluateGetPageReq) GetNeedSearch() interface{} {
return *m
}
type OrgTeamMatchEvaluateUpdateReq struct {
Id int `uri:"id" comment:""` //
MatchId string `json:"matchId" comment:""`
Rounds string `json:"rounds" comment:""`
TeamUserId string `json:"teamUserId" comment:"org_team_user表id（教练id）"`
PlayerId string `json:"playerId" comment:"org_player表id（球员id）"`
Content string `json:"content" comment:"教练评价内容"`
ContentStatus string `json:"contentStatus" comment:"教练评价状态 1 待评价 2 评价完成"`
common.ControlBy
}
func (s *OrgTeamMatchEvaluateUpdateReq) Generate(model *models.OrgMatchEvaluate) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.MatchId = s.MatchId
model.Rounds = s.Rounds
model.TeamUserId = s.TeamUserId
model.PlayerId = s.PlayerId
model.Content = s.Content
model.ContentStatus = s.ContentStatus
}
func (s *OrgTeamMatchEvaluateUpdateReq) GetId() interface{} {
return s.Id
}
app/operate/service/org_match_evaluate.go
View file @ 3a9c02be
......@@ -22,7 +22,7 @@ func (e *OrgMatchEvaluate) GetPage(c *dto.OrgMatchEvaluateGetPageReq, p *actions
var err error
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").
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.content_status, 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 and omtp.rounds = om.rounds").
Joins("left join org_league as ol on ol.id = om.league_id").
......
app/operate/service/org_team_match_evaluate.go
View file @ 3a9c02be
......@@ -18,7 +18,7 @@ type OrgTeamMatchEvaluate struct {
}
// GetPage 获取OrgMatchEvaluate列表
func (e *OrgTeamMatchEvaluate) GetPage(c *dto.OrgMatchEvaluateGetPageReq, p *actions.DataPermission, list *[]dto.OrgMatchEvaluateGetPageReply, count *int64) error {
func (e *OrgTeamMatchEvaluate) GetPage(c *dto.OrgTeamMatchEvaluateGetPageReq, p *actions.DataPermission, list *[]dto.OrgTeamMatchEvaluateGetPageReply, count *int64) error {
var err error
err = e.Orm.Table("org_match_team_player as omtp").
......@@ -34,6 +34,7 @@ func (e *OrgTeamMatchEvaluate) GetPage(c *dto.OrgMatchEvaluateGetPageReq, p *act
actions.Permission("omtp", p),
cDto.PassDel("omtp"),
).
Where("omtp.team_id=?", c.TeamId).
Find(list).Limit(-1).Offset(-1).
Count(count).Error
if err != nil {
......@@ -48,20 +49,17 @@ func (e *OrgTeamMatchEvaluate) GetMatchInfo(id string, p *actions.DataPermission
var err error
err = e.Orm.Table("org_match_team_player as omtp").
Select("omtp.id, ol.league_name, od.division_name, os.season_name, om.rounds,"+
Select("omtp.id, omtp.match_id, ol.league_name, od.division_name, os.season_name, om.rounds,"+
"oc.club_name, ot.team_name, omtp.player_name, omtp.player_number, omtp.position,"+
"ome.wonderful_moment_img, ome.wonderful_moment_mv,ome.wonderful_moment_img_title,"+
"ome.wonderful_moment_mv_title, omtp.player_id, om.season_id,"+
"ota.team_name as team_a_name, otb.team_name as team_b_name").
Joins("left join org_match_evaluate as ome on omtp.player_id = ome.player_id").
"ome.wonderful_moment_mv_title, ome.content, omtp.player_id, om.season_id").
Joins("left join org_match_evaluate as ome on omtp.player_id = ome.player_id and omtp.match_id=ome.match_id and omtp.rounds=ome.rounds").
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_division as od on od.id = om.division_id").
Joins("left join org_season as os on os.id = om.season_id").
Joins("left join org_team as ota on ota.id = om.team_a_id").
Joins("left join org_team as otb on otb.id = om.team_b_id").
Scopes(
actions.Permission("omtp", p),
).
......@@ -337,23 +335,25 @@ func (e *OrgTeamMatchEvaluate) Insert(c *dto.OrgMatchEvaluateInsertReq) error {
}
// Update 修改OrgMatchEvaluate对象
func (e *OrgTeamMatchEvaluate) Update(c *dto.OrgMatchEvaluateUpdateReq, p *actions.DataPermission) error {
func (e *OrgTeamMatchEvaluate) Update(c *dto.OrgTeamMatchEvaluateUpdateReq, p *actions.DataPermission) error {
var err error
var data = models.OrgMatchEvaluate{}
e.Orm.Scopes(
actions.Permission(data.TableName(), p),
cDto.SetWhere("", "match_id", c.MatchId),
cDto.SetWhere("", "rounds", c.Rounds),
cDto.SetWhere("", "player_id", c.PlayerId),
).First(&data)
).
Where("match_id = ?", c.MatchId).
Where("rounds = ?", c.Rounds).
Where("player_id = ?", c.PlayerId).
First(&data)
c.Generate(&data)
db := e.Orm.Scopes(
actions.Permission(data.TableName(), p),
cDto.SetWhere("", "match_id", c.MatchId),
cDto.SetWhere("", "rounds", c.Rounds),
cDto.SetWhere("", "player_id", c.PlayerId),
).Updates(&data)
).
Where("match_id = ?", c.MatchId).
Where("rounds = ?", c.Rounds).
Where("player_id = ?", c.PlayerId).
Updates(&data)
if db.Error != nil {
e.Log.Errorf("OrgMatchEvaluateService Save error:%s \r\n", err)
return err
......
common/dto/match.go
View file @ 3a9c02be
......@@ -4,6 +4,7 @@ import "gorm.io/gorm"
type PageMatchInfo struct {
Id string `json:"id"`
MatchId string `json:"matchId"`
LeagueName string `json:"leagueName"`
DivisionName string `json:"divisionName"`
SeasonId string `json:"seasonId"`
......@@ -16,6 +17,7 @@ type PageMatchInfo struct {
PlayerName string `json:"playerName"`
PlayerNumber string `json:"playerNumber"`
Position string `json:"position"`
Content string `json:"content"`
WonderfulMomentImg string `json:"wonderfulMomentImg" comment:"精彩时刻图"`
WonderfulMomentMv string `json:"wonderfulMomentMv" comment:"精彩时刻视频"`
WonderfulMomentImgTitle string `json:"wonderfulMomentImgTitle" comment:"精彩时刻图标题"`
......
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