refactor🎨: 调整SysChinaAreaData Api的函数名称以及路由引用

This commit is contained in:
zhangwenjian committed 2021-06-13 21:24:09 +08:00
1 parent 00c87d7c80
commit da15a2d3bb
3 files changed
+58 -72

No files matched your search

+42 -56
View File
@@ -1,9 +1,10 @@
package apis
import (
models2 "go-admin/app/other/models"
service2 "go-admin/app/other/service"
dto2 "go-admin/app/other/service/dto"
"github.com/gin-gonic/gin/binding"
"go-admin/app/other/models"
"go-admin/app/other/service"
"go-admin/app/other/service/dto"
"net/http"
"github.com/gin-gonic/gin"
@@ -17,77 +18,62 @@ type SysChinaAreaData struct {
api.Api
}
func (e SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) {
e.MakeContext(c)
log := e.GetLogger()
d := new(dto2.SysChinaAreaDataSearch)
db, err := e.GetOrm()
func (e SysChinaAreaData) GetPage(c *gin.Context) {
s := service.SysChinaAreaData{}
req := dto.SysChinaAreaDataSearch{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req, binding.Form).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
return
}
//查询列表
err = d.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
//数据权限检查
p := actions.GetPermissionFromContext(c)
list := make([]models2.SysChinaAreaData, 0)
list := make([]models.SysChinaAreaData, 0)
var count int64
serviceStudent := service2.SysChinaAreaData{}
serviceStudent.Log = log
serviceStudent.Orm = db
err = serviceStudent.GetSysChinaAreaDataPage(d, p, &list, &count)
err = s.GetPage(&req, p, &list, &count)
if err != nil {
e.Error(http.StatusInternalServerError, err, "查询失败")
return
}
e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
}
func (e SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) {
e.MakeContext(c)
log := e.GetLogger()
control := new(dto2.SysChinaAreaDataById)
db, err := e.GetOrm()
func (e SysChinaAreaData) Get(c *gin.Context) {
s := service.SysChinaAreaData{}
req := dto.SysChinaAreaDataById{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req, binding.Form).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
//查看详情
err = control.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object models2.SysChinaAreaData
//数据权限检查
var object models.SysChinaAreaData
p := actions.GetPermissionFromContext(c)
serviceSysChinaAreaData := service2.SysChinaAreaData{}
serviceSysChinaAreaData.Log = log
serviceSysChinaAreaData.Orm = db
err = serviceSysChinaAreaData.GetSysChinaAreaData(control, p, &object)
err = s.Get(&req, p, &object)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return
}
e.OK(object, "查看成功")
e.OK(object, "查询成功")
}
func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
func (e SysChinaAreaData) Insert(c *gin.Context) {
e.MakeContext(c)
log := e.GetLogger()
control := new(dto2.SysChinaAreaDataControl)
control := new(dto.SysChinaAreaDataControl)
db, err := e.GetOrm()
if err != nil {
log.Error(err)
@@ -108,10 +94,10 @@ func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
// 设置创建人
object.SetCreateBy(user.GetUserId(c))
serviceSysChinaAreaData := service2.SysChinaAreaData{}
serviceSysChinaAreaData := service.SysChinaAreaData{}
serviceSysChinaAreaData.Orm = db
serviceSysChinaAreaData.Log = log
err = serviceSysChinaAreaData.InsertSysChinaAreaData(object)
err = serviceSysChinaAreaData.Insert(object)
if err != nil {
log.Error(err)
e.Error(http.StatusInternalServerError, err, "创建失败")
@@ -121,10 +107,10 @@ func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
e.OK(object.GetId(), "创建成功")
}
func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
func (e SysChinaAreaData) Update(c *gin.Context) {
e.MakeContext(c)
log := e.GetLogger()
control := new(dto2.SysChinaAreaDataControl)
control := new(dto.SysChinaAreaDataControl)
db, err := e.GetOrm()
if err != nil {
log.Error(err)
@@ -147,10 +133,10 @@ func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
//数据权限检查
p := actions.GetPermissionFromContext(c)
serviceSysChinaAreaData := service2.SysChinaAreaData{}
serviceSysChinaAreaData := service.SysChinaAreaData{}
serviceSysChinaAreaData.Orm = db
serviceSysChinaAreaData.Log = log
err = serviceSysChinaAreaData.UpdateSysChinaAreaData(object, p)
err = serviceSysChinaAreaData.Update(object, p)
if err != nil {
log.Error(err)
return
@@ -158,10 +144,10 @@ func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
e.OK(object.GetId(), "更新成功")
}
func (e SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) {
func (e SysChinaAreaData) Delete(c *gin.Context) {
e.MakeContext(c)
log := e.GetLogger()
control := new(dto2.SysChinaAreaDataById)
control := new(dto.SysChinaAreaDataById)
db, err := e.GetOrm()
if err != nil {
log.Error(err)
@@ -182,10 +168,10 @@ func (e SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) {
// 数据权限检查
p := actions.GetPermissionFromContext(c)
serviceSysChinaAreaData := service2.SysChinaAreaData{}
serviceSysChinaAreaData := service.SysChinaAreaData{}
serviceSysChinaAreaData.Orm = db
serviceSysChinaAreaData.Log = log
err = serviceSysChinaAreaData.RemoveSysChinaAreaData(control, p)
err = serviceSysChinaAreaData.Remove(control, p)
if err != nil {
log.Errorf("RemoveSysChinaAreaData error, %s", err)
e.Error(http.StatusInternalServerError, err, "删除失败")
+6 -6
View File
@@ -14,12 +14,12 @@ func init() {
// 需认证的路由代码
func registerSysChinaAreaDataRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
api := apis.SysChinaAreaData{}
r := v1.Group("/sys_china_area_data").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
r := v1.Group("/sys-area-data").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
{
r.GET("", api.GetSysChinaAreaDataList)
r.GET("/:id", api.GetSysChinaAreaData)
r.POST("", api.InsertSysChinaAreaData)
r.PUT("/:id", api.UpdateSysChinaAreaData)
r.DELETE("", api.DeleteSysChinaAreaData)
r.GET("", api.GetPage)
r.GET("/:id", api.Get)
r.POST("", api.Insert)
r.PUT("/:id", api.Update)
r.DELETE("", api.Delete)
}
}
+10 -10
View File
@@ -16,8 +16,8 @@ type SysChinaAreaData struct {
service.Service
}
// GetSysChinaAreaDataPage 获取SysChinaAreaData列表
func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto.SysChinaAreaDataSearch, p *actions.DataPermission, list *[]models.SysChinaAreaData, count *int64) error {
// GetPage 获取SysChinaAreaData列表
func (e *SysChinaAreaData) GetPage(c *dto.SysChinaAreaDataSearch, p *actions.DataPermission, list *[]models.SysChinaAreaData, count *int64) error {
var data models.SysChinaAreaData
err := e.Orm.Model(&data).
@@ -35,8 +35,8 @@ func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto.SysChinaAreaDataSearch
return nil
}
// GetSysChinaAreaData 获取SysChinaAreaData对象
func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto.SysChinaAreaDataById, p *actions.DataPermission, model *models.SysChinaAreaData) error {
// Get 获取SysChinaAreaData对象
func (e *SysChinaAreaData) Get(d *dto.SysChinaAreaDataById, p *actions.DataPermission, model *models.SysChinaAreaData) error {
var data models.SysChinaAreaData
err := e.Orm.Model(&data).
@@ -56,8 +56,8 @@ func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto.SysChinaAreaDataById, p *a
return nil
}
// InsertSysChinaAreaData 创建SysChinaAreaData对象
func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models.SysChinaAreaData) error {
// Insert 创建SysChinaAreaData对象
func (e *SysChinaAreaData) Insert(model *models.SysChinaAreaData) error {
var data models.SysChinaAreaData
err := e.Orm.Model(&data).
@@ -69,8 +69,8 @@ func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models.SysChinaAreaData
return nil
}
// UpdateSysChinaAreaData 修改SysChinaAreaData对象
func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *models.SysChinaAreaData, p *actions.DataPermission) error {
// Update 修改SysChinaAreaData对象
func (e *SysChinaAreaData) Update(c *models.SysChinaAreaData, p *actions.DataPermission) error {
db := e.Orm.Model(c).
Scopes(
actions.Permission(c.TableName(), p),
@@ -85,8 +85,8 @@ func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *models.SysChinaAreaData, p
return nil
}
// RemoveSysChinaAreaData 删除SysChinaAreaData
func (e *SysChinaAreaData) RemoveSysChinaAreaData(d *dto.SysChinaAreaDataById, p *actions.DataPermission) error {
// Remove 删除SysChinaAreaData
func (e *SysChinaAreaData) Remove(d *dto.SysChinaAreaDataById, p *actions.DataPermission) error {
var data models.SysChinaAreaData