public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-21 02:04:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor🎨：调整行政区命名

Browse Source
This commit is contained in:
zhangwenjian
2021-06-17 21:45:37 +08:00
parent dff133bbbc
commit a911e73238
6 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/other/apis/sys_china_area_data.go → app/other/apis/sys_area_data.go
+28 -28
View File
@@ -14,13 +14,13 @@ import (
"go-admin/common/actions"
)
type SysChinaAreaData struct {
type SysAreaData struct {
api.Api
}
func (e SysChinaAreaData) GetPage(c *gin.Context) {
s := service.SysChinaAreaData{}
req := dto.SysChinaAreaDataSearch{}
func (e SysAreaData) GetPage(c *gin.Context) {
s := service.SysAreaData{}
req := dto.SysAreaDataSearch{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req, binding.Form).
@@ -32,7 +32,7 @@ func (e SysChinaAreaData) GetPage(c *gin.Context) {
return
}
list := make([]models.SysChinaAreaData, 0)
list := make([]models.SysAreaData, 0)
err = s.GetPage(&req, &list).Error
if err != nil {
e.Logger.Error(err)
@@ -43,9 +43,9 @@ func (e SysChinaAreaData) GetPage(c *gin.Context) {
e.OK(list, "查询成功")
}
func (e SysChinaAreaData) Get(c *gin.Context) {
s := service.SysChinaAreaData{}
req := dto.SysChinaAreaDataById{}
func (e SysAreaData) Get(c *gin.Context) {
s := service.SysAreaData{}
req := dto.SysAreaDataById{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req, nil).
@@ -56,7 +56,7 @@ func (e SysChinaAreaData) Get(c *gin.Context) {
e.Error(500, err, err.Error())
return
}
var object models.SysChinaAreaData
var object models.SysAreaData
p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object)
if err != nil {
@@ -67,10 +67,10 @@ func (e SysChinaAreaData) Get(c *gin.Context) {
e.OK(object, "查询成功")
}
func (e SysChinaAreaData) Insert(c *gin.Context) {
func (e SysAreaData) Insert(c *gin.Context) {
e.MakeContext(c)
log := e.GetLogger()
control := new(dto.SysChinaAreaDataControl)
control := new(dto.SysAreaDataControl)
db, err := e.GetOrm()
if err != nil {
log.Error(err)
@@ -91,10 +91,10 @@ func (e SysChinaAreaData) Insert(c *gin.Context) {
// 设置创建人
object.SetCreateBy(user.GetUserId(c))
serviceSysChinaAreaData := service.SysChinaAreaData{}
serviceSysChinaAreaData.Orm = db
serviceSysChinaAreaData.Log = log
err = serviceSysChinaAreaData.Insert(object)
serviceSysAreaData := service.SysAreaData{}
serviceSysAreaData.Orm = db
serviceSysAreaData.Log = log
err = serviceSysAreaData.Insert(object)
if err != nil {
log.Error(err)
e.Error(http.StatusInternalServerError, err, "创建失败")
@@ -104,10 +104,10 @@ func (e SysChinaAreaData) Insert(c *gin.Context) {
e.OK(object.GetId(), "创建成功")
}
func (e SysChinaAreaData) Update(c *gin.Context) {
func (e SysAreaData) Update(c *gin.Context) {
e.MakeContext(c)
log := e.GetLogger()
control := new(dto.SysChinaAreaDataControl)
control := new(dto.SysAreaDataControl)
db, err := e.GetOrm()
if err != nil {
log.Error(err)
@@ -130,10 +130,10 @@ func (e SysChinaAreaData) Update(c *gin.Context) {
//数据权限检查
p := actions.GetPermissionFromContext(c)
serviceSysChinaAreaData := service.SysChinaAreaData{}
serviceSysChinaAreaData.Orm = db
serviceSysChinaAreaData.Log = log
err = serviceSysChinaAreaData.Update(object, p)
serviceSysAreaData := service.SysAreaData{}
serviceSysAreaData.Orm = db
serviceSysAreaData.Log = log
err = serviceSysAreaData.Update(object, p)
if err != nil {
log.Error(err)
return
@@ -141,10 +141,10 @@ func (e SysChinaAreaData) Update(c *gin.Context) {
e.OK(object.GetId(), "更新成功")
}
func (e SysChinaAreaData) Delete(c *gin.Context) {
func (e SysAreaData) Delete(c *gin.Context) {
e.MakeContext(c)
log := e.GetLogger()
control := new(dto.SysChinaAreaDataById)
control := new(dto.SysAreaDataById)
db, err := e.GetOrm()
if err != nil {
log.Error(err)
@@ -165,12 +165,12 @@ func (e SysChinaAreaData) Delete(c *gin.Context) {
// 数据权限检查
p := actions.GetPermissionFromContext(c)
serviceSysChinaAreaData := service.SysChinaAreaData{}
serviceSysChinaAreaData.Orm = db
serviceSysChinaAreaData.Log = log
err = serviceSysChinaAreaData.Remove(control, p)
serviceSysAreaData := service.SysAreaData{}
serviceSysAreaData.Orm = db
serviceSysAreaData.Log = log
err = serviceSysAreaData.Remove(control, p)
if err != nil {
log.Errorf("RemoveSysChinaAreaData error, %s", err)
log.Errorf("RemoveSysAreaData error, %s", err)
e.Error(http.StatusInternalServerError, err, "删除失败")
return
}
app/other/models/sys_china_area_data.go → app/other/models/sys_area_data.go
+5 -5
View File
@@ -4,24 +4,24 @@ import (
"go-admin/common/models"
)
type SysChinaAreaData struct {
type SysAreaData struct {
Id int `json:"id" gorm:"primaryKey;comment:主键编码"`
PId int `json:"pId" gorm:"size:11;comment:上级编码"`
Name string `json:"name" gorm:"size:128;comment:名称"`
Children []SysChinaAreaData `json:"children,omitempty" gorm:"-"`
Children []SysAreaData `json:"children,omitempty" gorm:"-"`
models.ControlBy
models.ModelTime
}
func (SysChinaAreaData) TableName() string {
func (SysAreaData) TableName() string {
return "sys_china_area_data"
}
func (e *SysChinaAreaData) Generate() models.ActiveRecord {
func (e *SysAreaData) Generate() models.ActiveRecord {
o := *e
return &o
}
func (e *SysChinaAreaData) GetId() interface{} {
func (e *SysAreaData) GetId() interface{} {
return e.Id
}
app/other/router/sys_china_area_data.go → app/other/router/sys_area_data.go
+3 -3
View File
@@ -8,12 +8,12 @@ import (
)
func init() {
routerCheckRole = append(routerCheckRole, registerSysChinaAreaDataRouter)
routerCheckRole = append(routerCheckRole, registerSysAreaDataRouter)
}
// 需认证的路由代码
func registerSysChinaAreaDataRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
api := apis.SysChinaAreaData{}
func registerSysAreaDataRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
api := apis.SysAreaData{}
r := v1.Group("/sys-area-data").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
{
r.GET("", api.GetPage)
app/other/service/dto/sys_china_area_data.go → app/other/service/dto/sys_area_data.go
+12 -12
View File
@@ -10,17 +10,17 @@ import (
"go-admin/common/dto"
)
type SysChinaAreaDataSearch struct {
type SysAreaDataSearch struct {
dto.Pagination `search:"-"`
PId string `form:"pId" search:"type:exact;column:p_id;table:sys_china_area_data" comment:"上级编码"`
Name string `form:"name" search:"type:exact;column:name;table:sys_china_area_data" comment:"名称"`
}
func (m *SysChinaAreaDataSearch) GetNeedSearch() interface{} {
func (m *SysAreaDataSearch) GetNeedSearch() interface{} {
return *m
}
func (m *SysChinaAreaDataSearch) Bind(ctx *gin.Context) error {
func (m *SysAreaDataSearch) Bind(ctx *gin.Context) error {
log := api.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
@@ -29,7 +29,7 @@ func (m *SysChinaAreaDataSearch) Bind(ctx *gin.Context) error {
return err
}
type SysChinaAreaDataControl struct {
type SysAreaDataControl struct {
Id int `uri:"id" comment:"编码"` // 编码
PId int `json:"pId" comment:"上级编码"`
Name string `json:"name" comment:"名称"`
@@ -38,7 +38,7 @@ type SysChinaAreaDataControl struct {
DeleteTime time.Time `json:"deleteTime" comment:""`
}
func (s *SysChinaAreaDataControl) Bind(ctx *gin.Context) error {
func (s *SysAreaDataControl) Bind(ctx *gin.Context) error {
log := api.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
@@ -52,24 +52,24 @@ func (s *SysChinaAreaDataControl) Bind(ctx *gin.Context) error {
return err
}
func (s *SysChinaAreaDataControl) Generate() (*models.SysChinaAreaData, error) {
return &models.SysChinaAreaData{
func (s *SysAreaDataControl) Generate() (*models.SysAreaData, error) {
return &models.SysAreaData{
Id: s.Id,
PId: s.PId,
Name: s.Name,
}, nil
}
func (s *SysChinaAreaDataControl) GetId() interface{} {
func (s *SysAreaDataControl) GetId() interface{} {
return s.Id
}
type SysChinaAreaDataById struct {
type SysAreaDataById struct {
Id int `uri:"id"`
Ids []int `json:"ids"`
}
func (s *SysChinaAreaDataById) GetId() interface{} {
func (s *SysAreaDataById) GetId() interface{} {
if len(s.Ids) > 0 {
s.Ids = append(s.Ids, s.Id)
return s.Ids
@@ -77,7 +77,7 @@ func (s *SysChinaAreaDataById) GetId() interface{} {
return s.Id
}
func (s *SysChinaAreaDataById) Bind(ctx *gin.Context) error {
func (s *SysAreaDataById) Bind(ctx *gin.Context) error {
log := api.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
@@ -91,6 +91,6 @@ func (s *SysChinaAreaDataById) Bind(ctx *gin.Context) error {
return err
}
func (s *SysChinaAreaDataById) SetUpdateBy(id int) {
func (s *SysAreaDataById) SetUpdateBy(id int) {
}
app/other/service/sys_china_area_data.go → app/other/service/sys_area_data.go
+26 -26
View File
@@ -12,21 +12,21 @@ import (
cDto "go-admin/common/dto"
)
type SysChinaAreaData struct {
type SysAreaData struct {
service.Service
}
// GetPage 获取SysChinaAreaData列表
func (e *SysChinaAreaData) GetPage(c *dto.SysChinaAreaDataSearch, list *[]models.SysChinaAreaData) *SysChinaAreaData {
var data models.SysChinaAreaData
var areaDataList []models.SysChinaAreaData
// GetPage 获取SysAreaData列表
func (e *SysAreaData) GetPage(c *dto.SysAreaDataSearch, list *[]models.SysAreaData) *SysAreaData {
var data models.SysAreaData
var areaDataList []models.SysAreaData
err := e.Orm.Model(&data).
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
).
Find(&areaDataList).Error
if err != nil {
e.Log.Errorf("Service GetSysChinaAreaDataPage error:%s", err)
e.Log.Errorf("Service GetSysAreaDataPage error:%s", err)
_ = e.AddError(err)
return e
}
@@ -41,17 +41,17 @@ func (e *SysChinaAreaData) GetPage(c *dto.SysChinaAreaDataSearch, list *[]models
}
// areaDataCall 构建树
func areaDataCall(areaDataList *[]models.SysChinaAreaData, areaData models.SysChinaAreaData) models.SysChinaAreaData {
func areaDataCall(areaDataList *[]models.SysAreaData, areaData models.SysAreaData) models.SysAreaData {
list := *areaDataList
min := make([]models.SysChinaAreaData, 0)
min := make([]models.SysAreaData, 0)
for j := 0; j < len(list); j++ {
if areaData.Id != list[j].PId {
continue
}
mi := models.SysChinaAreaData{}
mi := models.SysAreaData{}
mi = list[j]
mi.Children = []models.SysChinaAreaData{}
mi.Children = []models.SysAreaData{}
ms := areaDataCall(areaDataList, mi)
min = append(min, ms)
}
@@ -59,9 +59,9 @@ func areaDataCall(areaDataList *[]models.SysChinaAreaData, areaData models.SysCh
return areaData
}
// Get 获取SysChinaAreaData对象
func (e *SysChinaAreaData) Get(d *dto.SysChinaAreaDataById, p *actions.DataPermission, model *models.SysChinaAreaData) error {
var data models.SysChinaAreaData
// Get 获取SysAreaData对象
func (e *SysAreaData) Get(d *dto.SysAreaDataById, p *actions.DataPermission, model *models.SysAreaData) error {
var data models.SysAreaData
err := e.Orm.Model(&data).
Scopes(
@@ -74,35 +74,35 @@ func (e *SysChinaAreaData) Get(d *dto.SysChinaAreaDataById, p *actions.DataPermi
return err
}
if err != nil {
e.Log.Errorf("Service GetSysChinaAreaData error:%s", err)
e.Log.Errorf("Service GetSysAreaData error:%s", err)
return err
}
return nil
}
// Insert 创建SysChinaAreaData对象
func (e *SysChinaAreaData) Insert(model *models.SysChinaAreaData) error {
var data models.SysChinaAreaData
// Insert 创建SysAreaData对象
func (e *SysAreaData) Insert(model *models.SysAreaData) error {
var data models.SysAreaData
err := e.Orm.Model(&data).
Create(model).Error
if err != nil {
e.Log.Errorf("Service InsertSysChinaAreaData error:%s", err)
e.Log.Errorf("Service InsertSysAreaData error:%s", err)
return err
}
return nil
}
// Update 修改SysChinaAreaData对象
func (e *SysChinaAreaData) Update(c *models.SysChinaAreaData, p *actions.DataPermission) error {
db := e.Orm.Model(&models.SysChinaAreaData{
// Update 修改SysAreaData对象
func (e *SysAreaData) Update(c *models.SysAreaData, p *actions.DataPermission) error {
db := e.Orm.Model(&models.SysAreaData{
Id: c.GetId().(int),
}).
Scopes(
actions.Permission(c.TableName(), p),
).Updates(c)
if err := db.Error; err != nil {
e.Log.Errorf("Service UpdateSysChinaAreaData error: %s", err)
e.Log.Errorf("Service UpdateSysAreaData error: %s", err)
return err
}
if db.RowsAffected == 0 {
@@ -111,15 +111,15 @@ func (e *SysChinaAreaData) Update(c *models.SysChinaAreaData, p *actions.DataPer
return nil
}
// Remove 删除SysChinaAreaData
func (e *SysChinaAreaData) Remove(d *dto.SysChinaAreaDataById, p *actions.DataPermission) error {
var data models.SysChinaAreaData
// Remove 删除SysAreaData
func (e *SysAreaData) Remove(d *dto.SysAreaDataById, p *actions.DataPermission) error {
var data models.SysAreaData
db := e.Orm.Model(&data).
Scopes(
actions.Permission(data.TableName(), p),
).Delete(&data, d.GetId())
if err := db.Error; err != nil {
e.Log.Errorf("Service RemoveSysChinaAreaData error: %s", err)
e.Log.Errorf("Service RemoveSysAreaData error: %s", err)
return err
}
if db.RowsAffected == 0 {
cmd/migrate/migration/models/sys_china_area_data.go → cmd/migrate/migration/models/sys_area_data.go
+3 -3
View File
@@ -1,6 +1,6 @@
package models
type SysChinaAreaData struct {
type SysAreaData struct {
Id int `json:"id" gorm:"primaryKey;comment:主键编码"`
PId int `json:"pId" gorm:"size:11;comment:上级编码"`
Name string `json:"name" gorm:"size:128;comment:名称"`
@@ -8,6 +8,6 @@ type SysChinaAreaData struct {
ModelTime
}
func (SysChinaAreaData) TableName() string {
return "sys_china_area_data"
func (SysAreaData) TableName() string {
return "sys_area_data"
}