Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nbya
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoyanbin
nbya
Commits
c16cde2b
Commit
c16cde2b
authored
Jan 18, 2022
by
haoyanbin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
我的
parent
1255af4a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
107 additions
and
333 deletions
+107
-333
org_player.go
app/mobile/apis/org_player.go
+37
-172
org_player.go
app/mobile/router/org_player.go
+1
-5
org_player.go
app/mobile/service/dto/org_player.go
+30
-107
org_player.go
app/mobile/service/org_player.go
+39
-49
No files found.
app/mobile/apis/org_player.go
View file @
c16cde2b
...
@@ -4,13 +4,11 @@ import (
...
@@ -4,13 +4,11 @@ import (
"fmt"
"fmt"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
_
"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
_
"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"strconv"
"go-admin/app/mobile/service"
"go-admin/app/mobile/service/dto"
"go-admin/app/operate/service"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
"go-admin/common/actions"
"strconv"
)
)
type
OrgPlayer
struct
{
type
OrgPlayer
struct
{
...
@@ -25,7 +23,7 @@ type OrgPlayer struct {
...
@@ -25,7 +23,7 @@ type OrgPlayer struct {
// @Param pageIndex query int false "页码"
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgPlayerGetPageReq true "body"
// @Param data body dto.OrgPlayerGetPageReq true "body"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /
api
/v1/org-player [get]
// @Router /
mobile
/v1/org-player [get]
// @Security Bearer
// @Security Bearer
func
(
e
OrgPlayer
)
GetPage
(
c
*
gin
.
Context
)
{
func
(
e
OrgPlayer
)
GetPage
(
c
*
gin
.
Context
)
{
req
:=
dto
.
OrgPlayerGetPageReq
{}
req
:=
dto
.
OrgPlayerGetPageReq
{}
...
@@ -45,6 +43,9 @@ func (e OrgPlayer) GetPage(c *gin.Context) {
...
@@ -45,6 +43,9 @@ func (e OrgPlayer) GetPage(c *gin.Context) {
list
:=
make
([]
dto
.
OrgPlayerGetPageReply
,
0
)
list
:=
make
([]
dto
.
OrgPlayerGetPageReply
,
0
)
var
count
int64
var
count
int64
userId
:=
c
.
GetInt64
(
"userId"
)
req
.
PlayerUserId
=
strconv
.
FormatInt
(
userId
,
10
)
err
=
s
.
GetPage
(
&
req
,
p
,
&
list
,
&
count
)
err
=
s
.
GetPage
(
&
req
,
p
,
&
list
,
&
count
)
if
err
!=
nil
{
if
err
!=
nil
{
e
.
Error
(
500
,
err
,
fmt
.
Sprintf
(
"获取球员 失败,
\r\n
失败信息 %s"
,
err
.
Error
()))
e
.
Error
(
500
,
err
,
fmt
.
Sprintf
(
"获取球员 失败,
\r\n
失败信息 %s"
,
err
.
Error
()))
...
@@ -84,178 +85,42 @@ func (e OrgPlayer) Get(c *gin.Context) {
...
@@ -84,178 +85,42 @@ func (e OrgPlayer) Get(c *gin.Context) {
return
return
}
}
e
.
OK
(
object
,
"查询成功"
)
//总分
}
var
reqTotalScoringGetData
dto
.
OrgPlayerDataGetReq
reqTotalScoringGetData
.
PlayerId
=
strconv
.
Itoa
(
object
.
Id
)
// 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
)
err
=
s
.
Remove
(
&
req
,
p
)
var
replyTotalScoringGetData
dto
.
OrgPlayerDataGetReply
if
err
!=
nil
{
err
=
s
.
GetData
(
&
reqTotalScoringGetData
,
p
,
&
replyTotalScoringGetData
)
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
if
err
!=
nil
{
if
err
!=
nil
{
e
.
Logger
.
Error
(
err
)
e
.
Error
(
500
,
err
,
fmt
.
Sprintf
(
"获取球员失败,
\r\n
失败信息 %s"
,
err
.
Error
()))
e
.
Error
(
500
,
err
,
err
.
Error
())
return
return
}
}
req
.
SetUpdateBy
(
user
.
GetUserId
(
c
))
object
.
TotalScoring
=
replyTotalScoringGetData
.
Scoring
p
:=
actions
.
GetPermissionFromContext
(
c
)
//赛季总分
reqUpdate
:=
dto
.
OrgPlayerUpdateReq
{}
//var reqScoringGetData dto.OrgPlayerDataGetReq
reqUpdate
.
Id
=
req
.
Id
//reqScoringGetData.PlayerId = strconv.Itoa(object.Id)
reqUpdate
.
Status
=
req
.
Status
//reqScoringGetData.SeasonId = object.SeasonId
err
=
s
.
Update
(
&
reqUpdate
,
p
)
//
//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
{
if
err
!=
nil
{
e
.
Error
(
500
,
err
,
fmt
.
Sprintf
(
"
修改球队人员账户信息
失败,
\r\n
失败信息 %s"
,
err
.
Error
()))
e
.
Error
(
500
,
err
,
fmt
.
Sprintf
(
"
获取球员
失败,
\r\n
失败信息 %s"
,
err
.
Error
()))
return
return
}
}
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
...
@@ -2,7 +2,7 @@ package router
import
(
import
(
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin"
"go-admin/app/
operat
e/apis"
"go-admin/app/
mobil
e/apis"
)
)
func
init
()
{
func
init
()
{
...
@@ -16,9 +16,5 @@ func registerOrgPlayerRouter(v1 *gin.RouterGroup) {
...
@@ -16,9 +16,5 @@ func registerOrgPlayerRouter(v1 *gin.RouterGroup) {
{
{
r
.
GET
(
""
,
api
.
GetPage
)
r
.
GET
(
""
,
api
.
GetPage
)
r
.
GET
(
"/:id"
,
api
.
Get
)
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
...
@@ -3,14 +3,13 @@ package dto
import
(
import
(
"crypto/md5"
"crypto/md5"
"encoding/hex"
"encoding/hex"
"go-admin/app/operate/models"
"go-admin/common/dto"
"go-admin/common/dto"
common
"go-admin/common/models"
"time"
"time"
)
)
type
OrgPlayerGetPageReq
struct
{
type
OrgPlayerGetPageReq
struct
{
dto
.
Pagination
`search:"-"`
dto
.
Pagination
`search:"-"`
PlayerUserId
string
`form:"playerUserId" search:"-"`
TeamId
string
`form:"teamId" search:"-"`
TeamId
string
`form:"teamId" search:"-"`
TeamName
string
`form:"teamName" search:"type:contains;column:team_name;table:ot" comment:""`
TeamName
string
`form:"teamName" search:"type:contains;column:team_name;table:ot" comment:""`
PlayerName
string
`form:"playerName" search:"type:contains;column:player_name;table:op" comment:""`
PlayerName
string
`form:"playerName" search:"type:contains;column:player_name;table:op" comment:""`
...
@@ -23,6 +22,7 @@ type OrgPlayerGetPageReply struct {
...
@@ -23,6 +22,7 @@ type OrgPlayerGetPageReply struct {
TeamId
string
`json:"teamId" comment:"球队id"`
TeamId
string
`json:"teamId" comment:"球队id"`
TeamName
string
`json:"teamName" comment:"球队名称"`
TeamName
string
`json:"teamName" comment:"球队名称"`
PlayerName
string
`json:"playerName" comment:"球员名称"`
PlayerName
string
`json:"playerName" comment:"球员名称"`
PlayerImg
string
`json:"playerImg" comment:"球员照片"`
PlayerNameEn
string
`json:"playerNameEn" comment:"球员名称英文"`
PlayerNameEn
string
`json:"playerNameEn" comment:"球员名称英文"`
PlayerNumber
string
`json:"playerNumber" comment:"球衣号"`
PlayerNumber
string
`json:"playerNumber" comment:"球衣号"`
Position
string
`json:"position" comment:"场上位置"`
Position
string
`json:"position" comment:"场上位置"`
...
@@ -53,87 +53,15 @@ func (m *OrgPlayerGetPageReq) GetNeedSearch() interface{} {
...
@@ -53,87 +53,15 @@ func (m *OrgPlayerGetPageReq) GetNeedSearch() interface{} {
return
*
m
return
*
m
}
}
type
OrgPlayerInsertReq
struct
{
type
OrgPlayerDataGetReq
struct
{
Id
int
`json:"-" comment:""`
//
PlayerId
string
`json:"playerId"`
ClubId
string
`json:"clubId" comment:"org_club表id"`
SeasonId
string
`json:"seasonId"`
TeamId
string
`json:"teamId" comment:"org_team表id"`
Match
string
`json:"match"`
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
}
}
func
(
s
*
OrgPlayerInsertReq
)
GetId
()
interface
{}
{
type
OrgPlayerDataGetReply
struct
{
return
s
.
Id
Scoring
string
`json:"scoring"`
}
CountMatch
string
`json:"countMatch"`
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
}
}
// OrgPlayerGetReq 功能获取请求参数
// OrgPlayerGetReq 功能获取请求参数
...
@@ -142,50 +70,45 @@ type OrgPlayerGetReq struct {
...
@@ -142,50 +70,45 @@ type OrgPlayerGetReq struct {
}
}
type
OrgPlayerGetReply
struct
{
type
OrgPlayerGetReply
struct
{
Id
int
`json:"id" comment:"球员id"`
Id
int
`json:"id" comment:"球员id"`
ClubId
string
`json:"clubId" comment:"俱乐部id"`
ClubId
string
`json:"clubId" comment:"俱乐部id"`
ClubName
string
`json:"clubName" comment:"俱乐部名称"`
ClubName
string
`json:"clubName" comment:"俱乐部名称"`
TeamId
string
`json:"teamId" comment:"球队id"`
TeamId
string
`json:"teamId" comment:"球队id"`
TeamName
string
`json:"teamName" comment:"球队名称"`
TeamName
string
`json:"teamName" comment:"球队名称"`
PlayerName
string
`json:"playerName" comment:"球员名称"`
SeasonId
string
`json:"seasonId" comment:"赛季id"`
PlayerNameEn
string
`json:"playerNameEn" comment:"球员名称英文"`
PlayerName
string
`json:"playerName" comment:"球员名称"`
IdCard
string
`json:"idCard" comment:"身份证号"`
PlayerNameEn
string
`json:"playerNameEn" comment:"球员名称英文"`
Sex
string
`json:"sex" comment:"性别"`
IdCard
string
`json:"idCard" comment:"身份证号"`
PlayerNumber
string
`json:"playerNumber" comment:"球衣号"`
Sex
string
`json:"sex" comment:"性别"`
Position
string
`json:"position" comment:"场上位置"`
PlayerNumber
string
`json:"playerNumber" comment:"球衣号"`
PlayerImg
string
`json:"playerImg" comment:"球员照片"`
Position
string
`json:"position" comment:"场上位置"`
Username
string
`json:"username" comment:"账号"`
PlayerImg
string
`json:"playerImg" comment:"球员照片"`
ShareConf
string
`json:"shareConf" comment:"分享功能 1 开启 2 关闭"`
Username
string
`json:"username" comment:"账号"`
Status
string
`json:"status" comment:"状态 1 离队 2 在队"`
//1 离队 2 在队
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
{}
{
func
(
s
*
OrgPlayerGetReq
)
GetId
()
interface
{}
{
return
s
.
Id
return
s
.
Id
}
}
// OrgPlayerDeleteReq 功能删除请求参数
type
OrgPlayerDeleteReq
struct
{
Ids
[]
int
`json:"ids"`
}
func
(
s
*
OrgPlayerDeleteReq
)
GetId
()
interface
{}
{
return
s
.
Ids
}
func
Pwd
(
password
string
)
string
{
func
Pwd
(
password
string
)
string
{
if
password
==
""
{
if
password
==
""
{
return
""
return
""
}
}
// 改为md5 修改时需同时修改
创建
的加密
// 改为md5 修改时需同时修改
登录
的加密
h
:=
md5
.
New
()
h
:=
md5
.
New
()
h
.
Write
([]
byte
(
password
))
h
.
Write
([]
byte
(
password
))
return
hex
.
EncodeToString
(
h
.
Sum
(
nil
))
return
hex
.
EncodeToString
(
h
.
Sum
(
nil
))
//var hash []byte
//var hash []byte
//var err error
//var err error
//if hash, err = bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost); err != nil {
//if hash, err = bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost); err != nil {
// return ""
// return ""
//} else {
//} else {
// return string(hash)
// return string(hash)
//
//}
//}
}
}
app/mobile/service/org_player.go
View file @
c16cde2b
...
@@ -5,8 +5,8 @@ import (
...
@@ -5,8 +5,8 @@ import (
"github.com/go-admin-team/go-admin-core/sdk/service"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"gorm.io/gorm"
"go-admin/app/mobile/service/dto"
"go-admin/app/operate/models"
"go-admin/app/operate/models"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
"go-admin/common/actions"
cDto
"go-admin/common/dto"
cDto
"go-admin/common/dto"
)
)
...
@@ -18,20 +18,13 @@ type OrgPlayer struct {
...
@@ -18,20 +18,13 @@ type OrgPlayer struct {
// GetPage 获取OrgPlayer列表
// GetPage 获取OrgPlayer列表
func
(
e
*
OrgPlayer
)
GetPage
(
c
*
dto
.
OrgPlayerGetPageReq
,
p
*
actions
.
DataPermission
,
list
*
[]
dto
.
OrgPlayerGetPageReply
,
count
*
int64
)
error
{
func
(
e
*
OrgPlayer
)
GetPage
(
c
*
dto
.
OrgPlayerGetPageReq
,
p
*
actions
.
DataPermission
,
list
*
[]
dto
.
OrgPlayerGetPageReply
,
count
*
int64
)
error
{
var
err
error
var
err
error
var
data
models
.
OrgPlayer
err
=
e
.
Orm
.
Table
(
"org_player as op"
)
.
err
=
e
.
Orm
.
Table
(
"org_player as op"
)
.
Select
(
"op.id,op.club_id,oc.club_name,op.team_id,ot.team_name,"
+
Select
(
"op.id,op.player_name,op.player_number,op.player_img,op.position,op.sex,op.status"
)
.
"op.player_name,op.player_number,op.position,op.sex,op.status"
)
.
Joins
(
"left join org_club as oc on op.club_id=oc.id"
)
.
Joins
(
"left join org_team as ot on op.team_id=ot.id"
)
.
Joins
(
"left join org_player_user as opu on op.player_user_id=opu.id"
)
.
Scopes
(
Scopes
(
cDto
.
MakeCondition
(
c
.
GetNeedSearch
()),
actions
.
Permission
(
"op"
,
p
),
cDto
.
Paginate
(
c
.
GetPageSize
(),
c
.
GetPageIndex
()),
actions
.
Permission
(
data
.
TableName
(),
p
),
cDto
.
SetWhere
(
"op"
,
"team_id"
,
c
.
TeamId
),
cDto
.
PassDel
(
"op"
),
cDto
.
PassDel
(
"op"
),
cDto
.
SetWhere
(
"op"
,
"player_user_id"
,
c
.
PlayerUserId
),
)
.
)
.
Find
(
list
)
.
Limit
(
-
1
)
.
Offset
(
-
1
)
.
Find
(
list
)
.
Limit
(
-
1
)
.
Offset
(
-
1
)
.
Count
(
count
)
.
Error
Count
(
count
)
.
Error
...
@@ -48,11 +41,10 @@ func (e *OrgPlayer) Get(d *dto.OrgPlayerGetReq, p *actions.DataPermission, model
...
@@ -48,11 +41,10 @@ func (e *OrgPlayer) Get(d *dto.OrgPlayerGetReq, p *actions.DataPermission, model
err
:=
e
.
Orm
.
Table
(
"org_player as op"
)
.
err
:=
e
.
Orm
.
Table
(
"org_player as op"
)
.
Select
(
"op.id,op.club_id,oc.club_name,op.team_id,ot.team_name,"
+
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.player_name,op.player_name_en,op.player_number,"
+
"op.position,op.sex,op.player_img,op
u.username,op.share_conf,op.status
"
)
.
"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_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_team as ot on op.team_id=ot.id"
)
.
Joins
(
"left join org_player_user as opu on op.player_user_id=opu.id"
)
.
Scopes
(
Scopes
(
actions
.
Permission
(
data
.
TableName
(),
p
),
actions
.
Permission
(
data
.
TableName
(),
p
),
)
.
)
.
...
@@ -69,53 +61,51 @@ func (e *OrgPlayer) Get(d *dto.OrgPlayerGetReq, p *actions.DataPermission, model
...
@@ -69,53 +61,51 @@ func (e *OrgPlayer) Get(d *dto.OrgPlayerGetReq, p *actions.DataPermission, model
return
nil
return
nil
}
}
//
Insert 创建
OrgPlayer对象
//
Get 获取
OrgPlayer对象
func
(
e
*
OrgPlayer
)
Insert
(
c
*
dto
.
OrgPlayerInsertReq
)
error
{
func
(
e
*
OrgPlayer
)
GetData
(
d
*
dto
.
OrgPlayerDataGetReq
,
p
*
actions
.
DataPermission
,
model
*
dto
.
OrgPlayerDataGetReply
)
error
{
var
err
error
var
err
error
var
data
models
.
OrgPlayer
field
:=
"sum(omtp.scoring) as scoring"
c
.
Generate
(
&
data
)
err
=
e
.
Orm
.
Create
(
&
data
)
.
Error
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
{
if
err
!=
nil
{
e
.
Log
.
Errorf
(
"
OrgPlayerService Insert error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"
db error:%s
"
,
err
)
return
err
return
err
}
}
return
nil
return
nil
}
}
//
Update 修改
OrgPlayer对象
//
Get 获取
OrgPlayer对象
func
(
e
*
OrgPlayer
)
Update
(
c
*
dto
.
OrgPlayerUpdateReq
,
p
*
actions
.
DataPermission
)
error
{
func
(
e
*
OrgPlayer
)
GetDataMatch
(
d
*
dto
.
OrgPlayerDataGetReq
,
p
*
actions
.
DataPermission
,
model
*
dto
.
OrgPlayerDataGetReply
)
error
{
var
err
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
)
field
:=
"count(om.id) as count_match"
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
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
(
Scopes
(
actions
.
Permission
(
data
.
TableName
(),
p
),
actions
.
Permission
(
"omtp"
,
p
),
)
.
Delete
(
&
data
,
d
.
GetId
())
cDto
.
PassDel
(
"omtp"
),
if
err
:=
db
.
Error
;
err
!=
nil
{
cDto
.
SetWhere
(
"om"
,
"season_id"
,
d
.
SeasonId
),
e
.
Log
.
Errorf
(
"Service RemoveOrgPlayer error:%s
\r\n
"
,
err
)
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
return
err
}
}
if
db
.
RowsAffected
==
0
{
return
errors
.
New
(
"无权删除该数据"
)
}
return
nil
return
nil
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment