Skip to content

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

Search

parent 418d9ed4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1875 additions and 682 deletions
app/operate/apis/org_ad.go
View file @ edcfa60d
package apis
import (
"fmt"
"fmt"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
......@@ -24,22 +24,23 @@ type OrgAd struct {
// @Tags <运营>广告
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgAdGetPageReq true "data"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-ad [get]
// @Security Bearer
func (e OrgAd) GetPage(c *gin.Context) {
req := dto.OrgAdGetPageReq{}
s := service.OrgAd{}
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.OrgAdGetPageReq{}
s := service.OrgAd{}
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.OrgAd, 0)
......@@ -48,7 +49,7 @@ func (e OrgAd) 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 +66,7 @@ func (e OrgAd) GetPage(c *gin.Context) {
func (e OrgAd) Get(c *gin.Context) {
req := dto.OrgAdGetReq{}
s := service.OrgAd{}
err := e.MakeContext(c).
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
......@@ -81,10 +82,10 @@ func (e OrgAd) 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 +99,25 @@ func (e OrgAd) Get(c *gin.Context) {
// @Router /api/v1/org-ad [post]
// @Security Bearer
func (e OrgAd) Insert(c *gin.Context) {
req := dto.OrgAdInsertReq{}
s := service.OrgAd{}
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.OrgAdInsertReq{}
s := service.OrgAd{}
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 +134,27 @@ func (e OrgAd) Insert(c *gin.Context) {
// @Router /api/v1/org-ad/{id} [put]
// @Security Bearer
func (e OrgAd) Update(c *gin.Context) {
req := dto.OrgAdUpdateReq{}
s := service.OrgAd{}
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.OrgAdUpdateReq{}
s := service.OrgAd{}
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 +166,18 @@ func (e OrgAd) Update(c *gin.Context) {
// @Router /api/v1/org-ad [delete]
// @Security Bearer
func (e OrgAd) Delete(c *gin.Context) {
s := service.OrgAd{}
req := dto.OrgAdDeleteReq{}
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.OrgAd{}
req := dto.OrgAdDeleteReq{}
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 +185,7 @@ func (e OrgAd) 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_club_player.go
View file @ edcfa60d
......@@ -24,6 +24,7 @@ type OrgClubPlayer struct {
// @Tags <俱乐部>球员
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgClubPlayerGetPageReq true "data"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-club-player [get]
// @Security Bearer
......
app/operate/apis/org_club_team.go
View file @ edcfa60d
......@@ -25,6 +25,7 @@ type OrgClubTeam struct {
// @Tags <俱乐部>球队
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgClubTeamGetPageReq true "data"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-club-team [get]
// @Security Bearer
......@@ -197,7 +198,7 @@ func (e OrgClubTeam) GetInfo(c *gin.Context) {
//赛季列表
sOrgSeason := service.OrgSeason{}
listOrgSeason := make([]models.OrgSeason, 0)
listOrgSeason := make([]dto.OrgSeasonGetPageReply, 0)
var countOrgSeason int64 = 0
err = e.MakeContext(c).MakeOrm().MakeService(&sOrgSeason.Service).Errors
......
app/operate/apis/org_division.go
View file @ edcfa60d
package apis
import (
"fmt"
"fmt"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
......@@ -24,22 +24,23 @@ type OrgDivision struct {
// @Tags <赛事>赛区
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgDivisionGetPageReq true "data"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-division [get]
// @Security Bearer
func (e OrgDivision) GetPage(c *gin.Context) {
req := dto.OrgDivisionGetPageReq{}
s := service.OrgDivision{}
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.OrgDivisionGetPageReq{}
s := service.OrgDivision{}
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.OrgDivision, 0)
......@@ -48,7 +49,7 @@ func (e OrgDivision) 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 +66,7 @@ func (e OrgDivision) GetPage(c *gin.Context) {
func (e OrgDivision) Get(c *gin.Context) {
req := dto.OrgDivisionGetReq{}
s := service.OrgDivision{}
err := e.MakeContext(c).
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
......@@ -81,10 +82,10 @@ func (e OrgDivision) 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 +99,25 @@ func (e OrgDivision) Get(c *gin.Context) {
// @Router /api/v1/org-division [post]
// @Security Bearer
func (e OrgDivision) Insert(c *gin.Context) {
req := dto.OrgDivisionInsertReq{}
s := service.OrgDivision{}
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.OrgDivisionInsertReq{}
s := service.OrgDivision{}
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 +134,27 @@ func (e OrgDivision) Insert(c *gin.Context) {
// @Router /api/v1/org-division/{id} [put]
// @Security Bearer
func (e OrgDivision) Update(c *gin.Context) {
req := dto.OrgDivisionUpdateReq{}
s := service.OrgDivision{}
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.OrgDivisionUpdateReq{}
s := service.OrgDivision{}
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 +166,18 @@ func (e OrgDivision) Update(c *gin.Context) {
// @Router /api/v1/org-division [delete]
// @Security Bearer
func (e OrgDivision) Delete(c *gin.Context) {
s := service.OrgDivision{}
req := dto.OrgDivisionDeleteReq{}
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.OrgDivision{}
req := dto.OrgDivisionDeleteReq{}
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 +185,7 @@ func (e OrgDivision) 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_league.go
View file @ edcfa60d
package apis
import (
"fmt"
"fmt"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
......@@ -24,22 +24,23 @@ type OrgLeague struct {
// @Tags <赛事>联赛
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgLeagueGetPageReq true "data"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-league [get]
// @Security Bearer
func (e OrgLeague) GetPage(c *gin.Context) {
req := dto.OrgLeagueGetPageReq{}
s := service.OrgLeague{}
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.OrgLeagueGetPageReq{}
s := service.OrgLeague{}
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.OrgLeague, 0)
......@@ -48,7 +49,7 @@ func (e OrgLeague) 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 +66,7 @@ func (e OrgLeague) GetPage(c *gin.Context) {
func (e OrgLeague) Get(c *gin.Context) {
req := dto.OrgLeagueGetReq{}
s := service.OrgLeague{}
err := e.MakeContext(c).
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
......@@ -81,10 +82,10 @@ func (e OrgLeague) 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 +99,25 @@ func (e OrgLeague) Get(c *gin.Context) {
// @Router /api/v1/org-league [post]
// @Security Bearer
func (e OrgLeague) Insert(c *gin.Context) {
req := dto.OrgLeagueInsertReq{}
s := service.OrgLeague{}
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.OrgLeagueInsertReq{}
s := service.OrgLeague{}
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 +134,27 @@ func (e OrgLeague) Insert(c *gin.Context) {
// @Router /api/v1/org-league/{id} [put]
// @Security Bearer
func (e OrgLeague) Update(c *gin.Context) {
req := dto.OrgLeagueUpdateReq{}
s := service.OrgLeague{}
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.OrgLeagueUpdateReq{}
s := service.OrgLeague{}
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 +166,18 @@ func (e OrgLeague) Update(c *gin.Context) {
// @Router /api/v1/org-league [delete]
// @Security Bearer
func (e OrgLeague) Delete(c *gin.Context) {
s := service.OrgLeague{}
req := dto.OrgLeagueDeleteReq{}
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.OrgLeague{}
req := dto.OrgLeagueDeleteReq{}
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 +185,7 @@ func (e OrgLeague) 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_match.go
View file @ edcfa60d
......@@ -26,6 +26,7 @@ type OrgMatch struct {
// @Tags <赛事>比赛
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgMatchGetPageReq true "data"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-match [get]
// @Security Bearer
......@@ -106,7 +107,7 @@ func (e OrgMatch) GetInfo(c *gin.Context) {
//赛季列表
sOrgSeason := service.OrgSeason{}
listOrgSeason := make([]models.OrgSeason, 0)
listOrgSeason := make([]dto.OrgSeasonGetPageReply, 0)
var countOrgSeason int64 = 0
err = e.MakeContext(c).MakeOrm().MakeService(&sOrgSeason.Service).Errors
......
app/operate/apis/org_match_evaluate.go
View file @ edcfa60d
......@@ -26,6 +26,7 @@ type OrgMatchEvaluate struct {
// @Param data body dto.OrgMatchEvaluateGetPageReq true "body"
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgMatchEvaluateGetPageReq true "data"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-match-evaluate [get]
// @Security Bearer
......
app/operate/apis/org_match_team_player.go
View file @ edcfa60d
package apis
import (
"fmt"
"fmt"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
......@@ -24,22 +24,23 @@ type OrgMatchTeamPlayer struct {
// @Tags 比赛球员数据
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgMatchTeamPlayerGetPageReq true "data"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-match-team-player [get]
// @Security Bearer
func (e OrgMatchTeamPlayer) GetPage(c *gin.Context) {
req := dto.OrgMatchTeamPlayerGetPageReq{}
s := service.OrgMatchTeamPlayer{}
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.OrgMatchTeamPlayerGetPageReq{}
s := service.OrgMatchTeamPlayer{}
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.OrgMatchTeamPlayer, 0)
......@@ -48,7 +49,7 @@ func (e OrgMatchTeamPlayer) 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 +66,7 @@ func (e OrgMatchTeamPlayer) GetPage(c *gin.Context) {
func (e OrgMatchTeamPlayer) Get(c *gin.Context) {
req := dto.OrgMatchTeamPlayerGetReq{}
s := service.OrgMatchTeamPlayer{}
err := e.MakeContext(c).
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
......@@ -81,10 +82,10 @@ func (e OrgMatchTeamPlayer) 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 +99,25 @@ func (e OrgMatchTeamPlayer) Get(c *gin.Context) {
// @Router /api/v1/org-match-team-player [post]
// @Security Bearer
func (e OrgMatchTeamPlayer) Insert(c *gin.Context) {
req := dto.OrgMatchTeamPlayerInsertReq{}
s := service.OrgMatchTeamPlayer{}
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.OrgMatchTeamPlayerInsertReq{}
s := service.OrgMatchTeamPlayer{}
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 +134,27 @@ func (e OrgMatchTeamPlayer) Insert(c *gin.Context) {
// @Router /api/v1/org-match-team-player/{id} [put]
// @Security Bearer
func (e OrgMatchTeamPlayer) Update(c *gin.Context) {
req := dto.OrgMatchTeamPlayerUpdateReq{}
s := service.OrgMatchTeamPlayer{}
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.OrgMatchTeamPlayerUpdateReq{}
s := service.OrgMatchTeamPlayer{}
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 +166,18 @@ func (e OrgMatchTeamPlayer) Update(c *gin.Context) {
// @Router /api/v1/org-match-team-player [delete]
// @Security Bearer
func (e OrgMatchTeamPlayer) Delete(c *gin.Context) {
s := service.OrgMatchTeamPlayer{}
req := dto.OrgMatchTeamPlayerDeleteReq{}
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.OrgMatchTeamPlayer{}
req := dto.OrgMatchTeamPlayerDeleteReq{}
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 +185,7 @@ func (e OrgMatchTeamPlayer) 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_news.go
View file @ edcfa60d
package apis
import (
"fmt"
"fmt"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
......@@ -24,22 +24,23 @@ type OrgNews struct {
// @Tags 新闻
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgNewsGetPageReq true "data"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-news [get]
// @Security Bearer
func (e OrgNews) GetPage(c *gin.Context) {
req := dto.OrgNewsGetPageReq{}
s := service.OrgNews{}
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.OrgNewsGetPageReq{}
s := service.OrgNews{}
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.OrgNews, 0)
......@@ -48,7 +49,7 @@ func (e OrgNews) 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 +66,7 @@ func (e OrgNews) GetPage(c *gin.Context) {
func (e OrgNews) Get(c *gin.Context) {
req := dto.OrgNewsGetReq{}
s := service.OrgNews{}
err := e.MakeContext(c).
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
......@@ -81,10 +82,10 @@ func (e OrgNews) 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 +99,25 @@ func (e OrgNews) Get(c *gin.Context) {
// @Router /api/v1/org-news [post]
// @Security Bearer
func (e OrgNews) Insert(c *gin.Context) {
req := dto.OrgNewsInsertReq{}
s := service.OrgNews{}
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.OrgNewsInsertReq{}
s := service.OrgNews{}
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 +134,27 @@ func (e OrgNews) Insert(c *gin.Context) {
// @Router /api/v1/org-news/{id} [put]
// @Security Bearer
func (e OrgNews) Update(c *gin.Context) {
req := dto.OrgNewsUpdateReq{}
s := service.OrgNews{}
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.OrgNewsUpdateReq{}
s := service.OrgNews{}
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 +166,18 @@ func (e OrgNews) Update(c *gin.Context) {
// @Router /api/v1/org-news [delete]
// @Security Bearer
func (e OrgNews) Delete(c *gin.Context) {
s := service.OrgNews{}
req := dto.OrgNewsDeleteReq{}
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.OrgNews{}
req := dto.OrgNewsDeleteReq{}
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 +185,7 @@ func (e OrgNews) 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_season.go
View file @ edcfa60d
......@@ -23,6 +23,7 @@ type OrgSeason struct {
// @Tags <赛事>赛季
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgSeasonGetPageReq true "data"
// @Success 200 {string} string {data=response.Page{list=[]models.OrgSeason}} "{"code": 200, "data": [...]}"
// @Router /api/v1/org-season [get]
// @Security Bearer
......@@ -41,7 +42,7 @@ func (e OrgSeason) GetPage(c *gin.Context) {
}
p := actions.GetPermissionFromContext(c)
list := make([]models.OrgSeason, 0)
list := make([]dto.OrgSeasonGetPageReply, 0)
var count int64
err = s.GetPage(&req, p, &list, &count)
......
app/operate/apis/org_team_club.go
View file @ edcfa60d
package apis
import (
"fmt"
"fmt"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
......@@ -29,7 +29,7 @@ type OrgTeamClub struct {
func (e OrgTeamClub) Get(c *gin.Context) {
req := dto.OrgClubGetReq{}
s := service.OrgClub{}
err := e.MakeContext(c).
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
......@@ -45,10 +45,10 @@ func (e OrgTeamClub) 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, "查询成功")
}
// Update <球队>修改俱乐部
......@@ -62,25 +62,25 @@ func (e OrgTeamClub) Get(c *gin.Context) {
// @Router /api/v1/org-team-club/{id} [put]
// @Security Bearer
func (e OrgTeamClub) 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(), "修改成功")
}
\ No newline at end of file
e.OK(req.GetId(), "修改成功")
}
app/operate/apis/org_team_match.go
View file @ edcfa60d
......@@ -26,6 +26,7 @@ type OrgTeamMatch struct {
// @Tags <球队>比赛
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgTeamMatchGetPageReq true "data"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-team-match [get]
// @Security Bearer
......@@ -310,7 +311,7 @@ func (e OrgTeamMatch) GetInfo(c *gin.Context) {
//赛季列表
sOrgSeason := service.OrgSeason{}
listOrgSeason := make([]models.OrgSeason, 0)
listOrgSeason := make([]dto.OrgSeasonGetPageReply, 0)
var countOrgSeason int64 = 0
err = e.MakeContext(c).MakeOrm().MakeService(&sOrgSeason.Service).Errors
......
app/operate/apis/org_team_player.go
View file @ edcfa60d
......@@ -24,6 +24,7 @@ type OrgTeamPlayer struct {
// @Tags <球队>球员表现
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgTeamPlayerGetPageReq true "data"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-team-player [get]
// @Security Bearer
......
app/operate/apis/org_team_team.go
View file @ edcfa60d
......@@ -24,6 +24,7 @@ type OrgTeamTeam struct {
// @Tags <球队>球队表现
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgTeamTeamGetPageReq true "data"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-team-team [get]
// @Security Bearer
......
app/operate/service/dto/org_ad.go
View file @ edcfa60d
......@@ -8,25 +8,28 @@ import (
)
type OrgAdGetPageReq struct {
dto.Pagination `search:"-"`
OrgAdOrder
dto.Pagination `search:"-"`
adName string `form:"adName" search:"type:contains;column:ad_name;table:org_ad"`
StartTime string `form:"startTime" search:"type:gte;column:created_at;table:org_ad" comment:"开始时间"`
EndTime string `form:"endTime" search:"type:lte;column:created_at;table:org_ad" comment:"结束时间"`
Status string `form:"status" search:"type:exact;column:status;table:org_ad"`
}
type OrgAdOrder struct {Id int `form:"idOrder" search:"type:order;column:id;table:org_ad"`
UserId string `form:"userIdOrder" search:"type:order;column:user_id;table:org_ad"`
AdName string `form:"adNameOrder" search:"type:order;column:ad_name;table:org_ad"`
AdType string `form:"adTypeOrder" search:"type:order;column:ad_type;table:org_ad"`
AdImg string `form:"adImgOrder" search:"type:order;column:ad_img;table:org_ad"`
AdUrl string `form:"adUrlOrder" search:"type:order;column:ad_url;table:org_ad"`
Status string `form:"statusOrder" search:"type:order;column:status;table:org_ad"`
StartTime time.Time `form:"startTimeOrder" search:"type:order;column:start_time;table:org_ad"`
EndTime time.Time `form:"endTimeOrder" search:"type:order;column:end_time;table:org_ad"`
CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_ad"`
UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_ad"`
CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_ad"`
UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_ad"`
DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_ad"`
type OrgAdOrder struct {
Id int `form:"idOrder" search:"type:order;column:id;table:org_ad"`
UserId string `form:"userIdOrder" search:"type:order;column:user_id;table:org_ad"`
AdName string `form:"adNameOrder" search:"type:order;column:ad_name;table:org_ad"`
AdType string `form:"adTypeOrder" search:"type:order;column:ad_type;table:org_ad"`
AdImg string `form:"adImgOrder" search:"type:order;column:ad_img;table:org_ad"`
AdUrl string `form:"adUrlOrder" search:"type:order;column:ad_url;table:org_ad"`
Status string `form:"statusOrder" search:"type:order;column:status;table:org_ad"`
StartTime time.Time `form:"startTimeOrder" search:"type:order;column:start_time;table:org_ad"`
EndTime time.Time `form:"endTimeOrder" search:"type:order;column:end_time;table:org_ad"`
CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_ad"`
UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_ad"`
CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_ad"`
UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_ad"`
DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_ad"`
}
func (m *OrgAdGetPageReq) GetNeedSearch() interface{} {
......@@ -34,30 +37,30 @@ func (m *OrgAdGetPageReq) GetNeedSearch() interface{} {
}
type OrgAdInsertReq struct {
Id int `json:"-" comment:""` //
UserId string `json:"userId" comment:"sys_user表id"`
AdName string `json:"adName" comment:"广告名称"`
AdType string `json:"adType" comment:"类型"`
AdImg string `json:"adImg" comment:"广告图"`
AdUrl string `json:"adUrl" comment:"链接地址"`
Status string `json:"status" comment:"广告状态 1 开启 0关闭"`
StartTime time.Time `json:"startTime" comment:"广告有效期 开始时间"`
EndTime time.Time `json:"endTime" comment:"广告有效期 结束时间"`
common.ControlBy
Id int `json:"-" comment:""` //
UserId string `json:"userId" comment:"sys_user表id"`
AdName string `json:"adName" comment:"广告名称"`
AdType string `json:"adType" comment:"类型"`
AdImg string `json:"adImg" comment:"广告图"`
AdUrl string `json:"adUrl" comment:"链接地址"`
Status string `json:"status" comment:"广告状态 1 开启 0关闭"`
StartTime time.Time `json:"startTime" comment:"广告有效期 开始时间"`
EndTime time.Time `json:"endTime" comment:"广告有效期 结束时间"`
common.ControlBy
}
func (s *OrgAdInsertReq) Generate(model *models.OrgAd) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.UserId = s.UserId
model.AdName = s.AdName
model.AdType = s.AdType
model.AdImg = s.AdImg
model.AdUrl = s.AdUrl
model.Status = s.Status
model.StartTime = s.StartTime
model.EndTime = s.EndTime
func (s *OrgAdInsertReq) Generate(model *models.OrgAd) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.UserId = s.UserId
model.AdName = s.AdName
model.AdType = s.AdType
model.AdImg = s.AdImg
model.AdUrl = s.AdUrl
model.Status = s.Status
model.StartTime = s.StartTime
model.EndTime = s.EndTime
}
func (s *OrgAdInsertReq) GetId() interface{} {
......@@ -65,30 +68,30 @@ func (s *OrgAdInsertReq) GetId() interface{} {
}
type OrgAdUpdateReq struct {
Id int `uri:"id" comment:""` //
UserId string `json:"userId" comment:"sys_user表id"`
AdName string `json:"adName" comment:"广告名称"`
AdType string `json:"adType" comment:"类型"`
AdImg string `json:"adImg" comment:"广告图"`
AdUrl string `json:"adUrl" comment:"链接地址"`
Status string `json:"status" comment:"广告状态 1 开启 0关闭"`
StartTime time.Time `json:"startTime" comment:"广告有效期 开始时间"`
EndTime time.Time `json:"endTime" comment:"广告有效期 结束时间"`
common.ControlBy
Id int `uri:"id" comment:""` //
UserId string `json:"userId" comment:"sys_user表id"`
AdName string `json:"adName" comment:"广告名称"`
AdType string `json:"adType" comment:"类型"`
AdImg string `json:"adImg" comment:"广告图"`
AdUrl string `json:"adUrl" comment:"链接地址"`
Status string `json:"status" comment:"广告状态 1 开启 0关闭"`
StartTime time.Time `json:"startTime" comment:"广告有效期 开始时间"`
EndTime time.Time `json:"endTime" comment:"广告有效期 结束时间"`
common.ControlBy
}
func (s *OrgAdUpdateReq) Generate(model *models.OrgAd) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.UserId = s.UserId
model.AdName = s.AdName
model.AdType = s.AdType
model.AdImg = s.AdImg
model.AdUrl = s.AdUrl
model.Status = s.Status
model.StartTime = s.StartTime
model.EndTime = s.EndTime
func (s *OrgAdUpdateReq) Generate(model *models.OrgAd) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.UserId = s.UserId
model.AdName = s.AdName
model.AdType = s.AdType
model.AdImg = s.AdImg
model.AdUrl = s.AdUrl
model.Status = s.Status
model.StartTime = s.StartTime
model.EndTime = s.EndTime
}
func (s *OrgAdUpdateReq) GetId() interface{} {
......@@ -97,8 +100,9 @@ func (s *OrgAdUpdateReq) GetId() interface{} {
// OrgAdGetReq 功能获取请求参数
type OrgAdGetReq struct {
Id int `uri:"id"`
Id int `uri:"id"`
}
func (s *OrgAdGetReq) GetId() interface{} {
return s.Id
}
......@@ -110,4 +114,4 @@ type OrgAdDeleteReq struct {
func (s *OrgAdDeleteReq) GetId() interface{} {
return s.Ids
}
\ No newline at end of file
}
app/operate/service/dto/org_division.go
View file @ edcfa60d
......@@ -8,19 +8,19 @@ import (
)
type OrgDivisionGetPageReq struct {
dto.Pagination `search:"-"`
OrgDivisionOrder
dto.Pagination `search:"-"`
DivisionName string `form:"divisionName" search:"type:contains;column:division_name;table:org_division" comment:"赛区名称"` //赛区名称
}
type OrgDivisionOrder struct {Id int `form:"idOrder" search:"type:order;column:id;table:org_division"`
DivisionName string `form:"divisionNameOrder" search:"type:order;column:division_name;table:org_division"`
Status string `form:"statusOrder" search:"type:order;column:status;table:org_division"`
CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_division"`
UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_division"`
CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_division"`
UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_division"`
DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_division"`
type OrgDivisionOrder struct {
Id int `form:"idOrder" search:"type:order;column:id;table:org_division"`
DivisionName string `form:"divisionNameOrder" search:"type:order;column:division_name;table:org_division"`
Status string `form:"statusOrder" search:"type:order;column:status;table:org_division"`
CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_division"`
UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_division"`
CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_division"`
UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_division"`
DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_division"`
}
func (m *OrgDivisionGetPageReq) GetNeedSearch() interface{} {
......@@ -28,18 +28,18 @@ func (m *OrgDivisionGetPageReq) GetNeedSearch() interface{} {
}
type OrgDivisionInsertReq struct {
Id int `json:"-" comment:""` //
DivisionName string `json:"divisionName" comment:"赛区名称"`
Status string `json:"status" comment:"赛区开启状态 1 是 0否"`
common.ControlBy
Id int `json:"-" comment:""` //
DivisionName string `json:"divisionName" comment:"赛区名称"`
Status string `json:"status" comment:"赛区开启状态 1 是 0否"`
common.ControlBy
}
func (s *OrgDivisionInsertReq) Generate(model *models.OrgDivision) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.DivisionName = s.DivisionName
model.Status = s.Status
func (s *OrgDivisionInsertReq) Generate(model *models.OrgDivision) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.DivisionName = s.DivisionName
model.Status = s.Status
}
func (s *OrgDivisionInsertReq) GetId() interface{} {
......@@ -47,18 +47,18 @@ func (s *OrgDivisionInsertReq) GetId() interface{} {
}
type OrgDivisionUpdateReq struct {
Id int `uri:"id" comment:""` //
DivisionName string `json:"divisionName" comment:"赛区名称"`
Status string `json:"status" comment:"赛区开启状态 1 是 0否"`
common.ControlBy
Id int `uri:"id" comment:""` //
DivisionName string `json:"divisionName" comment:"赛区名称"`
Status string `json:"status" comment:"赛区开启状态 1 是 0否"`
common.ControlBy
}
func (s *OrgDivisionUpdateReq) Generate(model *models.OrgDivision) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.DivisionName = s.DivisionName
model.Status = s.Status
func (s *OrgDivisionUpdateReq) Generate(model *models.OrgDivision) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.DivisionName = s.DivisionName
model.Status = s.Status
}
func (s *OrgDivisionUpdateReq) GetId() interface{} {
......@@ -67,8 +67,9 @@ func (s *OrgDivisionUpdateReq) GetId() interface{} {
// OrgDivisionGetReq 功能获取请求参数
type OrgDivisionGetReq struct {
Id int `uri:"id"`
Id int `uri:"id"`
}
func (s *OrgDivisionGetReq) GetId() interface{} {
return s.Id
}
......@@ -80,4 +81,4 @@ type OrgDivisionDeleteReq struct {
func (s *OrgDivisionDeleteReq) GetId() interface{} {
return s.Ids
}
\ No newline at end of file
}
app/operate/service/dto/org_league.go
View file @ edcfa60d
......@@ -9,7 +9,7 @@ import (
type OrgLeagueGetPageReq struct {
dto.Pagination `search:"-"`
OrgLeagueOrder
LeagueName string `form:"leagueName" search:"type:contains;column:league_name;table:org_league" comment:"联赛级别"` //联赛级别
}
type OrgLeagueOrder struct {
......
app/operate/service/dto/org_match.go
View file @ edcfa60d
......@@ -17,7 +17,6 @@ type OrgMatchGetPageReq struct {
Status string `form:"status" search:"type:exact;column:status;table:om" comment:"比赛状态 1 未开始 2 比赛中 3 已结束"`
MatchStartTime string `form:"matchStartTime" search:"type:gte;column:match_start_time;table:om" comment:"比赛开始时间"`
MatchEndTime string `form:"matchEndTime" search:"type:lte;column:match_end_time;table:om" comment:"比赛结束时间"`
OrgMatchOrder
}
type OrgMatchGetPageReply struct {
......@@ -41,11 +40,11 @@ type OrgMatchGetInfoReq struct {
}
type OrgMatchGetInfoReply struct {
OrgMatch models.OrgMatch `form:"orgMatch"`
OrgLeagueList []models.OrgLeague `form:"orgLeagueList"`
OrgSeasonList []models.OrgSeason `form:"orgSeasonList"`
OrgDivisionList []models.OrgDivision `form:"orgDivisionList"`
OrgTeamList []OrgTeamGetPageReply `form:"orgTeamList"`
OrgMatch models.OrgMatch `form:"orgMatch"`
OrgLeagueList []models.OrgLeague `form:"orgLeagueList"`
OrgSeasonList []OrgSeasonGetPageReply `form:"orgSeasonList"`
OrgDivisionList []models.OrgDivision `form:"orgDivisionList"`
OrgTeamList []OrgTeamGetPageReply `form:"orgTeamList"`
}
type OrgMatchOrder struct {
......
app/operate/service/dto/org_news.go
View file @ edcfa60d
......@@ -8,21 +8,24 @@ import (
)
type OrgNewsGetPageReq struct {
dto.Pagination `search:"-"`
OrgNewsOrder
dto.Pagination `search:"-"`
NewsName string `form:"newsName" search:"type:contains;column:news_name;table:org_news"`
StartTime string `form:"startTime" search:"type:gte;column:created_at;table:org_news" comment:"开始时间"`
EndTime string `form:"endTime" search:"type:lte;column:created_at;table:org_news" comment:"结束时间"`
Status string `form:"status" search:"type:exact;column:status;table:org_news"`
}
type OrgNewsOrder struct {Id int `form:"idOrder" search:"type:order;column:id;table:org_news"`
NewsName string `form:"newsNameOrder" search:"type:order;column:news_name;table:org_news"`
NewsTitle string `form:"newsTitleOrder" search:"type:order;column:news_title;table:org_news"`
NewsContent string `form:"newsContentOrder" search:"type:order;column:news_content;table:org_news"`
Status string `form:"statusOrder" search:"type:order;column:status;table:org_news"`
CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_news"`
UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_news"`
CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_news"`
UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_news"`
DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_news"`
type OrgNewsOrder struct {
Id int `form:"idOrder" search:"type:order;column:id;table:org_news"`
NewsName string `form:"newsNameOrder" search:"type:order;column:news_name;table:org_news"`
NewsTitle string `form:"newsTitleOrder" search:"type:order;column:news_title;table:org_news"`
NewsContent string `form:"newsContentOrder" search:"type:order;column:news_content;table:org_news"`
Status string `form:"statusOrder" search:"type:order;column:status;table:org_news"`
CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_news"`
UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_news"`
CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_news"`
UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_news"`
DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_news"`
}
func (m *OrgNewsGetPageReq) GetNeedSearch() interface{} {
......@@ -30,22 +33,22 @@ func (m *OrgNewsGetPageReq) GetNeedSearch() interface{} {
}
type OrgNewsInsertReq struct {
Id int `json:"-" comment:""` //
NewsName string `json:"newsName" comment:""`
NewsTitle string `json:"newsTitle" comment:""`
NewsContent string `json:"newsContent" comment:""`
Status string `json:"status" comment:""`
common.ControlBy
Id int `json:"-" comment:""` //
NewsName string `json:"newsName" comment:""`
NewsTitle string `json:"newsTitle" comment:""`
NewsContent string `json:"newsContent" comment:""`
Status string `json:"status" comment:""`
common.ControlBy
}
func (s *OrgNewsInsertReq) Generate(model *models.OrgNews) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.NewsName = s.NewsName
model.NewsTitle = s.NewsTitle
model.NewsContent = s.NewsContent
model.Status = s.Status
func (s *OrgNewsInsertReq) Generate(model *models.OrgNews) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.NewsName = s.NewsName
model.NewsTitle = s.NewsTitle
model.NewsContent = s.NewsContent
model.Status = s.Status
}
func (s *OrgNewsInsertReq) GetId() interface{} {
......@@ -53,22 +56,22 @@ func (s *OrgNewsInsertReq) GetId() interface{} {
}
type OrgNewsUpdateReq struct {
Id int `uri:"id" comment:""` //
NewsName string `json:"newsName" comment:""`
NewsTitle string `json:"newsTitle" comment:""`
NewsContent string `json:"newsContent" comment:""`
Status string `json:"status" comment:""`
common.ControlBy
Id int `uri:"id" comment:""` //
NewsName string `json:"newsName" comment:""`
NewsTitle string `json:"newsTitle" comment:""`
NewsContent string `json:"newsContent" comment:""`
Status string `json:"status" comment:""`
common.ControlBy
}
func (s *OrgNewsUpdateReq) Generate(model *models.OrgNews) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.NewsName = s.NewsName
model.NewsTitle = s.NewsTitle
model.NewsContent = s.NewsContent
model.Status = s.Status
func (s *OrgNewsUpdateReq) Generate(model *models.OrgNews) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.NewsName = s.NewsName
model.NewsTitle = s.NewsTitle
model.NewsContent = s.NewsContent
model.Status = s.Status
}
func (s *OrgNewsUpdateReq) GetId() interface{} {
......@@ -77,8 +80,9 @@ func (s *OrgNewsUpdateReq) GetId() interface{} {
// OrgNewsGetReq 功能获取请求参数
type OrgNewsGetReq struct {
Id int `uri:"id"`
Id int `uri:"id"`
}
func (s *OrgNewsGetReq) GetId() interface{} {
return s.Id
}
......@@ -90,4 +94,4 @@ type OrgNewsDeleteReq struct {
func (s *OrgNewsDeleteReq) GetId() interface{} {
return s.Ids
}
\ No newline at end of file
}
app/operate/service/dto/org_season.go
View file @ edcfa60d
......@@ -8,29 +8,44 @@ import (
)
type OrgSeasonGetPageReq struct {
dto.Pagination `search:"-"`
OrgSeasonOrder
dto.Pagination `search:"-"`
LeagueId string `form:"leagueId" search:"type:exact;column:league_id;table:os"`
SeasonId string `form:"seasonId" search:"type:exact;column:id;table:os"`
SeasonStartTime string `form:"seasonStartTime" search:"type:gte;column:start_time;table:os" comment:"比赛开始时间"`
SeasonEndTime string `form:"seasonEndTime" search:"type:lte;column:end_time;table:os" comment:"比赛结束时间"`
Status string `form:"status" search:"type:exact;column:status;table:os"`
}
type OrgSeasonGetPageReply struct {
Id string `json:"id"`
LeagueId string `json:"leagueId"`
LeagueName string `json:"leagueName"`
SeasonName string `json:"seasonName"`
TotalRounds string `json:"totalRounds"`
StartTime string `json:"startTime"`
EndTime string `json:"endTime"`
Status string `json:"status"`
}
type OrgSeasonGetReply struct {
OrgSeason models.OrgSeason `form:"orgSeason"`
OrgLeagueList []models.OrgLeague `form:"orgLeagueList"`
OrgSeason models.OrgSeason `form:"orgSeason"`
OrgLeagueList []models.OrgLeague `form:"orgLeagueList"`
}
type OrgSeasonOrder struct {Id int `form:"idOrder" search:"type:order;column:id;table:org_season"`
LeagueId string `form:"leagueIdOrder" search:"type:order;column:league_id;table:org_season"`
DivisionId string `form:"divisionIdOrder" search:"type:order;column:division_id;table:org_season"`
SeasonName string `form:"seasonNameOrder" search:"type:order;column:season_name;table:org_season"`
TotalRounds string `form:"totalRoundsOrder" search:"type:order;column:total_rounds;table:org_season"`
StartTime string `form:"startTimeOrder" search:"type:order;column:start_time;table:org_season"`
EndTime string `form:"endTimeOrder" search:"type:order;column:end_time;table:org_season"`
Status string `form:"statusOrder" search:"type:order;column:status;table:org_season"`
CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_season"`
UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_season"`
CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_season"`
UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_season"`
DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_season"`
type OrgSeasonOrder struct {
Id int `form:"idOrder" search:"type:order;column:id;table:org_season"`
LeagueId string `form:"leagueIdOrder" search:"type:order;column:league_id;table:org_season"`
DivisionId string `form:"divisionIdOrder" search:"type:order;column:division_id;table:org_season"`
SeasonName string `form:"seasonNameOrder" search:"type:order;column:season_name;table:org_season"`
TotalRounds string `form:"totalRoundsOrder" search:"type:order;column:total_rounds;table:org_season"`
StartTime string `form:"startTimeOrder" search:"type:order;column:start_time;table:org_season"`
EndTime string `form:"endTimeOrder" search:"type:order;column:end_time;table:org_season"`
Status string `form:"statusOrder" search:"type:order;column:status;table:org_season"`
CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:org_season"`
UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:org_season"`
CreatedAt time.Time `form:"createdAtOrder" search:"type:order;column:created_at;table:org_season"`
UpdatedAt time.Time `form:"updatedAtOrder" search:"type:order;column:updated_at;table:org_season"`
DeletedAt time.Time `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:org_season"`
}
func (m *OrgSeasonGetPageReq) GetNeedSearch() interface{} {
......@@ -38,28 +53,28 @@ func (m *OrgSeasonGetPageReq) GetNeedSearch() interface{} {
}
type OrgSeasonInsertReq struct {
Id int `json:"-" comment:""` //
LeagueId string `json:"leagueId" comment:"org_league表id"`
DivisionId string `json:"divisionId" comment:"org_division表id"`
SeasonName string `json:"seasonName" comment:"赛季名称"`
TotalRounds string `json:"totalRounds" comment:"总轮次"`
StartTime string `json:"startTime" comment:"赛季开始时间"`
EndTime string `json:"endTime" comment:"赛季结束时间"`
Status string `json:"status" comment:"赛季开启状态 1 是 0 否"`
common.ControlBy
Id int `json:"-" comment:""` //
LeagueId string `json:"leagueId" comment:"org_league表id"`
DivisionId string `json:"divisionId" comment:"org_division表id"`
SeasonName string `json:"seasonName" comment:"赛季名称"`
TotalRounds string `json:"totalRounds" comment:"总轮次"`
StartTime string `json:"startTime" comment:"赛季开始时间"`
EndTime string `json:"endTime" comment:"赛季结束时间"`
Status string `json:"status" comment:"赛季开启状态 1 是 0 否"`
common.ControlBy
}
func (s *OrgSeasonInsertReq) Generate(model *models.OrgSeason) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.LeagueId = s.LeagueId
model.DivisionId = s.DivisionId
model.SeasonName = s.SeasonName
model.TotalRounds = s.TotalRounds
model.StartTime = s.StartTime
model.EndTime = s.EndTime
model.Status = s.Status
func (s *OrgSeasonInsertReq) Generate(model *models.OrgSeason) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.LeagueId = s.LeagueId
model.DivisionId = s.DivisionId
model.SeasonName = s.SeasonName
model.TotalRounds = s.TotalRounds
model.StartTime = s.StartTime
model.EndTime = s.EndTime
model.Status = s.Status
}
func (s *OrgSeasonInsertReq) GetId() interface{} {
......@@ -67,28 +82,28 @@ func (s *OrgSeasonInsertReq) GetId() interface{} {
}
type OrgSeasonUpdateReq struct {
Id int `uri:"id" comment:""` //
LeagueId string `json:"leagueId" comment:"org_league表id"`
DivisionId string `json:"divisionId" comment:"org_division表id"`
SeasonName string `json:"seasonName" comment:"赛季名称"`
TotalRounds string `json:"totalRounds" comment:"总轮次"`
StartTime string `json:"startTime" comment:"赛季开始时间"`
EndTime string `json:"endTime" comment:"赛季结束时间"`
Status string `json:"status" comment:"赛季开启状态 1 是 0 否"`
common.ControlBy
Id int `uri:"id" comment:""` //
LeagueId string `json:"leagueId" comment:"org_league表id"`
DivisionId string `json:"divisionId" comment:"org_division表id"`
SeasonName string `json:"seasonName" comment:"赛季名称"`
TotalRounds string `json:"totalRounds" comment:"总轮次"`
StartTime string `json:"startTime" comment:"赛季开始时间"`
EndTime string `json:"endTime" comment:"赛季结束时间"`
Status string `json:"status" comment:"赛季开启状态 1 是 0 否"`
common.ControlBy
}
func (s *OrgSeasonUpdateReq) Generate(model *models.OrgSeason) {
if s.Id == 0 {
model.Model = common.Model{ Id: s.Id }
}
model.LeagueId = s.LeagueId
model.DivisionId = s.DivisionId
model.SeasonName = s.SeasonName
model.TotalRounds = s.TotalRounds
model.StartTime = s.StartTime
model.EndTime = s.EndTime
model.Status = s.Status
func (s *OrgSeasonUpdateReq) Generate(model *models.OrgSeason) {
if s.Id == 0 {
model.Model = common.Model{Id: s.Id}
}
model.LeagueId = s.LeagueId
model.DivisionId = s.DivisionId
model.SeasonName = s.SeasonName
model.TotalRounds = s.TotalRounds
model.StartTime = s.StartTime
model.EndTime = s.EndTime
model.Status = s.Status
}
func (s *OrgSeasonUpdateReq) GetId() interface{} {
......@@ -97,8 +112,9 @@ func (s *OrgSeasonUpdateReq) GetId() interface{} {
// OrgSeasonGetReq 功能获取请求参数
type OrgSeasonGetReq struct {
Id int `uri:"id"`
Id int `uri:"id"`
}
func (s *OrgSeasonGetReq) GetId() interface{} {
return s.Id
}
......@@ -110,4 +126,4 @@ type OrgSeasonDeleteReq struct {
func (s *OrgSeasonDeleteReq) GetId() interface{} {
return s.Ids
}
\ No newline at end of file
}
app/operate/service/org_season.go
View file @ edcfa60d
......@@ -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,15 +17,19 @@ type OrgSeason struct {
}
// GetPage 获取OrgSeason列表
func (e *OrgSeason) GetPage(c *dto.OrgSeasonGetPageReq, p *actions.DataPermission, list *[]models.OrgSeason, count *int64) error {
func (e *OrgSeason) GetPage(c *dto.OrgSeasonGetPageReq, p *actions.DataPermission, list *[]dto.OrgSeasonGetPageReply, count *int64) error {
var err error
var data models.OrgSeason
err = e.Orm.Model(&data).
err = e.Orm.Table("org_season as os").
Joins("left join org_league as ol on os.league_id=ol.id").
Select("os.id, os.league_id, ol.league_name, os.season_name, os.total_rounds, os.start_time,"+
"os.end_time, os.status").
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
actions.Permission(data.TableName(), p),
cDto.PassDel("os"),
).
Find(list).Limit(-1).Offset(-1).
Count(count).Error
......@@ -59,9 +63,9 @@ func (e *OrgSeason) Get(d *dto.OrgSeasonGetReq, p *actions.DataPermission, model
// Insert 创建OrgSeason对象
func (e *OrgSeason) Insert(c *dto.OrgSeasonInsertReq) error {
var err error
var data models.OrgSeason
c.Generate(&data)
var err error
var data models.OrgSeason
c.Generate(&data)
err = e.Orm.Create(&data).Error
if err != nil {
e.Log.Errorf("OrgSeasonService Insert error:%s \r\n", err)
......@@ -72,22 +76,22 @@ func (e *OrgSeason) Insert(c *dto.OrgSeasonInsertReq) error {
// Update 修改OrgSeason对象
func (e *OrgSeason) Update(c *dto.OrgSeasonUpdateReq, p *actions.DataPermission) error {
var err error
var data = models.OrgSeason{}
e.Orm.Scopes(
actions.Permission(data.TableName(), p),
).First(&data, c.GetId())
c.Generate(&data)
var err error
var data = models.OrgSeason{}
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("OrgSeasonService 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("OrgSeasonService Save error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
return nil
}
// Remove 删除OrgSeason
......@@ -99,11 +103,11 @@ func (e *OrgSeason) Remove(d *dto.OrgSeasonDeleteReq, p *actions.DataPermission)
actions.Permission(data.TableName(), p),
).Delete(&data, d.GetId())
if err := db.Error; err != nil {
e.Log.Errorf("Service RemoveOrgSeason error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
e.Log.Errorf("Service RemoveOrgSeason error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
return nil
}
\ No newline at end of file
}
docs/docs.go
View file @ edcfa60d
This diff is collapsed.
docs/swagger.json
View file @ edcfa60d
This diff is collapsed.
docs/swagger.yaml
View file @ edcfa60d
This diff is collapsed.
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