Skip to content

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

我的

parent 1255af4a
Show whitespace changes
Inline Side-by-side
Showing with 107 additions and 333 deletions
app/mobile/apis/org_player.go
View file @ c16cde2b
......@@ -4,13 +4,11 @@ import (
"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/service"
"go-admin/app/operate/service/dto"
"go-admin/app/mobile/service"
"go-admin/app/mobile/service/dto"
"go-admin/common/actions"
"strconv"
)
type OrgPlayer struct {
......@@ -25,7 +23,7 @@ type OrgPlayer struct {
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgPlayerGetPageReq true "body"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-player [get]
// @Router /mobile/v1/org-player [get]
// @Security Bearer
func (e OrgPlayer) GetPage(c *gin.Context) {
req := dto.OrgPlayerGetPageReq{}
......@@ -45,6 +43,9 @@ func (e OrgPlayer) GetPage(c *gin.Context) {
list := make([]dto.OrgPlayerGetPageReply, 0)
var count int64
userId := c.GetInt64("userId")
req.PlayerUserId = strconv.FormatInt(userId, 10)
err = s.GetPage(&req, p, &list, &count)
if err != nil {
e.Error(500, err, fmt.Sprintf("获取球员 失败，\r\n失败信息 %s", err.Error()))
......@@ -84,178 +85,42 @@ func (e OrgPlayer) Get(c *gin.Context) {
return
}
e.OK(object, "查询成功")
}
// Insert <球队>创建球员
// @Summary <球队>创建球员
// @Description <球队>创建球员
// @Tags <球队>球员
// @Accept application/json
// @Product application/json
// @Param data body dto.OrgPlayerInsertReq true "data"
// @Success 200 {string} string "{"code": 200, "message": "添加成功"}"
// @Router /api/v1/org-player [post]
// @Security Bearer
func (e OrgPlayer) Insert(c *gin.Context) {
req := dto.OrgPlayerInsertReq{}
s := service.OrgPlayer{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
reqUser := dto.OrgPlayerUserInsertReq{}
sUser := service.OrgPlayerUser{}
e.MakeContext(c).MakeOrm().MakeService(&sUser.Service)
_, userId := sUser.IsBeing(req.Username)
if userId > 0 {
req.PlayerUserId = strconv.Itoa(userId)
} else {
// 设置创建人
reqUser.SetCreateBy(user.GetUserId(c))
reqUser.Username = req.Username
reqUser.Password = dto.Pwd("123456")
err = sUser.Insert(&reqUser)
req.PlayerUserId = strconv.Itoa(reqUser.Id)
}
// 设置创建人
req.SetCreateBy(user.GetUserId(c))
err = s.Insert(&req)
if err != nil {
e.Error(500, err, fmt.Sprintf("创建球员 失败，\r\n失败信息 %s", err.Error()))
return
}
e.OK(req.GetId(), "创建成功")
}
// Update <球队>修改球员
// @Summary <球队>修改球员
// @Description <球队>修改球员
// @Tags <球队>球员
// @Accept application/json
// @Product application/json
// @Param data body dto.OrgPlayerUpdateReq true "body"
// @Success 200 {string} string "{"code": 200, "message": "修改成功"}"
// @Router /api/v1/org-player/{id} [put]
// @Security Bearer
func (e OrgPlayer) Update(c *gin.Context) {
req := dto.OrgPlayerUpdateReq{}
s := service.OrgPlayer{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
req.SetUpdateBy(user.GetUserId(c))
p := actions.GetPermissionFromContext(c)
reqUser := dto.OrgPlayerUserInsertReq{}
sUser := service.OrgPlayerUser{}
e.MakeContext(c).MakeOrm().MakeService(&sUser.Service)
_, userId := sUser.IsBeing(req.Username)
if userId > 0 {
req.PlayerUserId = strconv.Itoa(userId)
} else {
// 设置创建人
reqUser.SetCreateBy(user.GetUserId(c))
reqUser.Username = req.Username
reqUser.Password = dto.Pwd("123456")
err = sUser.Insert(&reqUser)
req.PlayerUserId = strconv.Itoa(reqUser.Id)
}
err = s.Update(&req, p)
if err != nil {
e.Error(500, err, fmt.Sprintf("修改球员 失败，\r\n失败信息 %s", err.Error()))
return
}
e.OK(req.GetId(), "修改成功")
}
// Delete <球队>删除球员
// @Summary <球队>删除球员
// @Description <球队>删除球员
// @Tags <球队>球员
// @Param ids body []int false "ids"
// @Success 200 {string} string "{"code": 200, "message": "删除成功"}"
// @Router /api/v1/org-player [delete]
// @Security Bearer
func (e OrgPlayer) Delete(c *gin.Context) {
s := service.OrgPlayer{}
req := dto.OrgPlayerDeleteReq{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
// req.SetUpdateBy(user.GetUserId(c))
p := actions.GetPermissionFromContext(c)
//总分
var reqTotalScoringGetData dto.OrgPlayerDataGetReq
reqTotalScoringGetData.PlayerId = strconv.Itoa(object.Id)
err = s.Remove(&req, p)
if err != nil {
e.Error(500, err, fmt.Sprintf("删除球员失败，\r\n失败信息 %s", err.Error()))
return
}
e.OK(req.GetId(), "删除成功")
}
// Update <球队>修改球员状态
// @Summary <球队>修改球员状态
// @Description <球队>修改球员状态
// @Tags <球队>工作人员
// @Accept application/json
// @Product application/json
// @Param data body dto.OrgPlayerUpdateStatusReq true "body"
// @Success 200 {string} string "{"code": 200, "message": "修改成功"}"
// @Router /api/v1/org-player/update-status [put]
// @Security Bearer
func (e OrgPlayer) UpdateStatus(c *gin.Context) {
req := dto.OrgPlayerUpdateStatusReq{}
s := service.OrgPlayer{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
Errors
var replyTotalScoringGetData dto.OrgPlayerDataGetReply
err = s.GetData(&reqTotalScoringGetData, p, &replyTotalScoringGetData)
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
e.Error(500, err, fmt.Sprintf("获取球员失败，\r\n失败信息 %s", err.Error()))
return
}
req.SetUpdateBy(user.GetUserId(c))
p := actions.GetPermissionFromContext(c)
reqUpdate := dto.OrgPlayerUpdateReq{}
reqUpdate.Id = req.Id
reqUpdate.Status = req.Status
err = s.Update(&reqUpdate, p)
object.TotalScoring = replyTotalScoringGetData.Scoring
//赛季总分
//var reqScoringGetData dto.OrgPlayerDataGetReq
//reqScoringGetData.PlayerId = strconv.Itoa(object.Id)
//reqScoringGetData.SeasonId = object.SeasonId
//
//var replyScoringGetData dto.OrgPlayerDataGetReply
//err = s.GetData(&reqScoringGetData, p, &replyScoringGetData)
//if err != nil {
// e.Error(500, err, fmt.Sprintf("获取球员失败，\r\n失败信息 %s", err.Error()))
// return
//}
//object.SeasonScoring = replyScoringGetData.Scoring
//出赛次数
var reqMatchGetData dto.OrgPlayerDataGetReq
reqMatchGetData.PlayerId = strconv.Itoa(object.Id)
var replyMatchGetData dto.OrgPlayerDataGetReply
err = s.GetDataMatch(&reqMatchGetData, p, &replyMatchGetData)
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
}
object.CountMatch = replyMatchGetData.CountMatch
e.OK(req.Id, "修改成功")
e.OK(object, "查询成功")
}
app/mobile/router/org_player.go
View file @ c16cde2b
......@@ -2,7 +2,7 @@ package router
import (
"github.com/gin-gonic/gin"
"go-admin/app/operate/apis"
"go-admin/app/mobile/apis"
)
func init() {
......@@ -16,9 +16,5 @@ func registerOrgPlayerRouter(v1 *gin.RouterGroup) {
{
r.GET("", api.GetPage)
r.GET("/:id", api.Get)
r.POST("", api.Insert)
r.PUT("/:id", api.Update)
r.PUT("/update-status", api.UpdateStatus)
r.DELETE("", api.Delete)
}
}
app/mobile/service/dto/org_player.go
View file @ c16cde2b
......@@ -3,14 +3,13 @@ package dto
import (
"crypto/md5"
"encoding/hex"
"go-admin/app/operate/models"
"go-admin/common/dto"
common "go-admin/common/models"
"time"
)
type OrgPlayerGetPageReq struct {
dto.Pagination `search:"-"`
PlayerUserId string `form:"playerUserId" search:"-"`
TeamId string `form:"teamId" search:"-"`
TeamName string `form:"teamName" search:"type:contains;column:team_name;table:ot" comment:""`
PlayerName string `form:"playerName" search:"type:contains;column:player_name;table:op" comment:""`
......@@ -23,6 +22,7 @@ type OrgPlayerGetPageReply struct {
TeamId string `json:"teamId" comment:"球队id"`
TeamName string `json:"teamName" comment:"球队名称"`
PlayerName string `json:"playerName" comment:"球员名称"`
PlayerImg string `json:"playerImg" comment:"球员照片"`
PlayerNameEn string `json:"playerNameEn" comment:"球员名称英文"`
PlayerNumber string `json:"playerNumber" comment:"球衣号"`
Position string `json:"position" comment:"场上位置"`
......@@ -53,87 +53,15 @@ func (m *OrgPlayerGetPageReq) GetNeedSearch() interface{} {
return *m
}
type OrgPlayerInsertReq struct {
Id int `json:"-" comment:""` //
ClubId string `json:"clubId" comment:"org_club表id"`
TeamId string `json:"teamId" comment:"org_team表id"`
PlayerName string `json:"playerName" comment:"球员姓名"`
IdCard string `json:"idCard" comment:"身份证号"`
Sex string `json:"sex" comment:"性别"`
PlayerNumber string `json:"playerNumber" comment:"球衣号码"`
Position string `json:"position" comment:"场上位置"`
PlayerImg string `json:"playerImg" comment:"球员照片"`
PlayerUserId string `json:"playerUserId" comment:"org_player_user表id"`
ShareConf string `json:"shareConf" comment:"分享功能 1 开启 2 关闭" default:"1"`
PlayerNameEn string `json:"playerNameEn" comment:"球员名称英文"`
Username string `json:"username" comment:"账号"`
common.ControlBy
}
func (s *OrgPlayerInsertReq) Generate(model *models.OrgPlayer) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.ClubId = s.ClubId
model.TeamId = s.TeamId
model.PlayerName = s.PlayerName
model.PlayerNameEn = s.PlayerNameEn
model.IdCard = s.IdCard
model.Sex = s.Sex
model.PlayerNumber = s.PlayerNumber
model.Position = s.Position
model.PlayerImg = s.PlayerImg
model.PlayerUserId = s.PlayerUserId
model.ShareConf = s.ShareConf
type OrgPlayerDataGetReq struct {
PlayerId string `json:"playerId"`
SeasonId string `json:"seasonId"`
Match string `json:"match"`
}
func (s *OrgPlayerInsertReq) GetId() interface{} {
return s.Id
}
type OrgPlayerUpdateReq struct {
Id int `uri:"id" comment:""` //
ClubId string `json:"clubId" comment:"org_club表id"`
TeamId string `json:"teamId" comment:"org_team表id"`
PlayerName string `json:"playerName" comment:"球员姓名"`
IdCard string `json:"idCard" comment:"身份证号"`
Sex string `json:"sex" comment:"性别"`
PlayerNumber string `json:"playerNumber" comment:"球衣号码"`
Position string `json:"position" comment:"场上位置"`
PlayerImg string `json:"playerImg" comment:"球员照片"`
PlayerUserId string `json:"playerUserId" comment:"org_player_user表id"`
ShareConf string `json:"shareConf" comment:"分享功能 1 开启 2 关闭" default:"1"`
PlayerNameEn string `json:"playerNameEn" comment:"球员名称英文"`
Username string `json:"username" comment:"账号"`
Status string `json:"status" comment:"状态 1 离队 2 在队" default:"2"` //状态 1 离队 2 在队
common.ControlBy
}
type OrgPlayerUpdateStatusReq struct {
Id int `json:"id" comment:""` //
Status string `json:"status" comment:"状态 1 离队 2 在队"` //状态 1 离队 2 在队
common.ControlBy
}
func (s *OrgPlayerUpdateReq) Generate(model *models.OrgPlayer) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.ClubId = s.ClubId
model.TeamId = s.TeamId
model.PlayerName = s.PlayerName
model.PlayerNameEn = s.PlayerNameEn
model.IdCard = s.IdCard
model.Sex = s.Sex
model.PlayerNumber = s.PlayerNumber
model.Position = s.Position
model.PlayerImg = s.PlayerImg
model.PlayerUserId = s.PlayerUserId
model.ShareConf = s.ShareConf
model.Status = s.Status
}
func (s *OrgPlayerUpdateReq) GetId() interface{} {
return s.Id
type OrgPlayerDataGetReply struct {
Scoring string `json:"scoring"`
CountMatch string `json:"countMatch"`
}
// OrgPlayerGetReq 功能获取请求参数
......@@ -147,6 +75,7 @@ type OrgPlayerGetReply struct {
ClubName string `json:"clubName" comment:"俱乐部名称"`
TeamId string `json:"teamId" comment:"球队id"`
TeamName string `json:"teamName" comment:"球队名称"`
SeasonId string `json:"seasonId" comment:"赛季id"`
PlayerName string `json:"playerName" comment:"球员名称"`
PlayerNameEn string `json:"playerNameEn" comment:"球员名称英文"`
IdCard string `json:"idCard" comment:"身份证号"`
......@@ -157,35 +86,29 @@ type OrgPlayerGetReply struct {
Username string `json:"username" comment:"账号"`
ShareConf string `json:"shareConf" comment:"分享功能 1 开启 2 关闭"`
Status string `json:"status" comment:"状态 1 离队 2 在队"` //1 离队 2 在队
TotalScoring string `json:"totalScoring"`
SeasonScoring string `json:"seasonScoring"`
CountMatch string `json:"countMatch"`
}
func (s *OrgPlayerGetReq) GetId() interface{} {
return s.Id
}
// OrgPlayerDeleteReq 功能删除请求参数
type OrgPlayerDeleteReq struct {
Ids []int `json:"ids"`
}
func (s *OrgPlayerDeleteReq) GetId() interface{} {
return s.Ids
}
func Pwd(password string) string {
if password == "" {
return ""
}
// 改为md5 修改时需同时修改创建的加密
// 改为md5 修改时需同时修改登录的加密
h := md5.New()
h.Write([]byte(password))
return hex.EncodeToString(h.Sum(nil))
//var hash []byte
//var err error
//if hash, err = bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost); err != nil {
// return ""
//} else {
// return string(hash)
//
//}
}
app/mobile/service/org_player.go
View file @ c16cde2b
......@@ -5,8 +5,8 @@ import (
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"go-admin/app/mobile/service/dto"
"go-admin/app/operate/models"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
cDto "go-admin/common/dto"
)
......@@ -18,20 +18,13 @@ type OrgPlayer struct {
// GetPage 获取OrgPlayer列表
func (e *OrgPlayer) GetPage(c *dto.OrgPlayerGetPageReq, p *actions.DataPermission, list *[]dto.OrgPlayerGetPageReply, count *int64) error {
var err error
var data models.OrgPlayer
err = e.Orm.Table("org_player as op").
Select("op.id,op.club_id,oc.club_name,op.team_id,ot.team_name,"+
"op.player_name,op.player_number,op.position,op.sex,op.status").
Joins("left join org_club as oc on op.club_id=oc.id").
Joins("left join org_team as ot on op.team_id=ot.id").
Joins("left join org_player_user as opu on op.player_user_id=opu.id").
Select("op.id,op.player_name,op.player_number,op.player_img,op.position,op.sex,op.status").
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
actions.Permission(data.TableName(), p),
cDto.SetWhere("op", "team_id", c.TeamId),
actions.Permission("op", p),
cDto.PassDel("op"),
cDto.SetWhere("op", "player_user_id", c.PlayerUserId),
).
Find(list).Limit(-1).Offset(-1).
Count(count).Error
......@@ -48,11 +41,10 @@ func (e *OrgPlayer) Get(d *dto.OrgPlayerGetReq, p *actions.DataPermission, model
err := e.Orm.Table("org_player as op").
Select("op.id,op.club_id,oc.club_name,op.team_id,ot.team_name,"+
"op.player_name,op.player_name_en,op.id_card,op.player_number,"+
"op.position,op.sex,op.player_img,opu.username,op.share_conf,op.status").
"op.player_name,op.player_name_en,op.player_number,"+
"op.position,op.sex,op.player_img,op.share_conf").
Joins("left join org_club as oc on op.club_id=oc.id").
Joins("left join org_team as ot on op.team_id=ot.id").
Joins("left join org_player_user as opu on op.player_user_id=opu.id").
Scopes(
actions.Permission(data.TableName(), p),
).
......@@ -69,53 +61,51 @@ func (e *OrgPlayer) Get(d *dto.OrgPlayerGetReq, p *actions.DataPermission, model
return nil
}
// Insert 创建OrgPlayer对象
func (e *OrgPlayer) Insert(c *dto.OrgPlayerInsertReq) error {
// Get 获取OrgPlayer对象
func (e *OrgPlayer) GetData(d *dto.OrgPlayerDataGetReq, p *actions.DataPermission, model *dto.OrgPlayerDataGetReply) error {
var err error
var data models.OrgPlayer
c.Generate(&data)
err = e.Orm.Create(&data).Error
field := "sum(omtp.scoring) as scoring"
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").
Scopes(
actions.Permission("omtp", p),
cDto.SetWhere("om", "season_id", d.SeasonId),
cDto.PassDel("omtp"),
cDto.PassDel("om"),
).
Where("omtp.player_id = ?", d.PlayerId).
First(model).Error
if err != nil {
e.Log.Errorf("OrgPlayerService Insert error:%s \r\n", err)
e.Log.Errorf("db error:%s", err)
return err
}
return nil
}
// Update 修改OrgPlayer对象
func (e *OrgPlayer) Update(c *dto.OrgPlayerUpdateReq, p *actions.DataPermission) error {
// Get 获取OrgPlayer对象
func (e *OrgPlayer) GetDataMatch(d *dto.OrgPlayerDataGetReq, p *actions.DataPermission, model *dto.OrgPlayerDataGetReply) error {
var err error
var data = models.OrgPlayer{}
e.Orm.Scopes(
actions.Permission(data.TableName(), p),
).First(&data, c.GetId())
c.Generate(&data)
db := e.Orm.Updates(&data)
if db.Error != nil {
e.Log.Errorf("OrgPlayerService Save error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
return nil
}
// Remove 删除OrgPlayer
func (e *OrgPlayer) Remove(d *dto.OrgPlayerDeleteReq, p *actions.DataPermission) error {
var data models.OrgPlayer
field := "count(om.id) as count_match"
db := e.Orm.Model(&data).
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").
Scopes(
actions.Permission(data.TableName(), p),
).Delete(&data, d.GetId())
if err := db.Error; err != nil {
e.Log.Errorf("Service RemoveOrgPlayer error:%s \r\n", err)
actions.Permission("omtp", p),
cDto.PassDel("omtp"),
cDto.SetWhere("om", "season_id", d.SeasonId),
cDto.PassDel("omtp"),
cDto.PassDel("om"),
).
Where("omtp.player_id = ?", d.PlayerId).
Group("omtp.match_id and omtp.rounds").
First(model).Error
if err != nil {
e.Log.Errorf("db error:%s", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
return nil
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment