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

Merge branch 'dev'

Browse Source
This commit is contained in:
wenjianzhang
2021-06-15 12:25:46 +08:00
parent 273f2ba8b0 af7a3e99a8
commit 9fb23b45cd
14 changed files with 125 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/apis/sys_opera_log.go
+6 -4
View File
@@ -1,6 +1,7 @@
package apis
import (
"fmt"
"github.com/gin-gonic/gin/binding"
"go-admin/app/admin/models"
"net/http"
@@ -96,10 +97,10 @@ func (e SysOperaLog) Get(c *gin.Context) {
// @Router /api/v1/sys-opera-log [delete]
func (e SysOperaLog) Delete(c *gin.Context) {
s := new(service.SysOperaLog)
req := new(dto.SysOperaLogById)
req := dto.SysOperaLogById{}
err := e.MakeContext(c).
MakeOrm().
Bind(req, binding.Form).
Bind(&req, binding.JSON).
MakeService(&s.Service).
Errors
if err != nil {
@@ -108,10 +109,11 @@ func (e SysOperaLog) Delete(c *gin.Context) {
return
}
err = s.Remove(req)
err = s.Remove(&req)
if err != nil {
e.Logger.Error(err)
e.Error(500,err, fmt.Sprintf("删除失败！错误详情：%s", err.Error()))
return
}
e.OK(req.GetId(), "删除成功")
}
}
app/admin/service/dto/sys_login_log.go
+2 -1
View File
@@ -16,10 +16,11 @@ type SysLoginLogSearch struct {
LoginLocation string `form:"loginLocation" search:"type:exact;column:login_location;table:sys_login_log" comment:"归属地"`
BeginTime string `form:"beginTime" search:"type:gte;column:ctime;table:sys_login_log" comment:"创建时间"`
EndTime string `form:"endTime" search:"type:lte;column:ctime;table:sys_login_log" comment:"创建时间"`
SysLoginLogOrder
}
type SysLoginLogOrder struct {
HandleOrder string `search:"type:order;column:created_at;table:sys_login_log" form:"createdAtOrder"`
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_login_log" form:"createdAtOrder"`
}
func (m *SysLoginLogSearch) GetNeedSearch() interface{} {
app/admin/service/dto/sys_opera_log.go
+5
View File
@@ -18,6 +18,11 @@ type SysOperaLogSearch struct {
Status int `form:"status" search:"type:exact;column:status;table:sys_opera_log" comment:"状态"`
BeginTime string `form:"beginTime" search:"type:gte;column:ctime;table:sys_opera_log" comment:"创建时间"`
EndTime string `form:"endTime" search:"type:lte;column:ctime;table:sys_opera_log" comment:"创建时间"`
SysOperaLogOrder
}
type SysOperaLogOrder struct {
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_opera_log" form:"createdAtOrder"`
}
func (m *SysOperaLogSearch) GetNeedSearch() interface{} {
app/admin/service/sys_login_log.go
+2 -2
View File
@@ -51,12 +51,12 @@ func (e *SysLoginLog) Get(d *dto.SysLoginLogById, model *models.SysLoginLog) err
return nil
}
// RemoveSysLoginLog 删除SysLoginLog
// Remove 删除SysLoginLog
func (e *SysLoginLog) Remove(c *dto.SysLoginLogById) error {
var err error
var data models.SysLoginLog
db := e.Orm.Delete(&data, c.Ids)
db := e.Orm.Delete(&data, c.GetId())
if db.Error != nil {
err = db.Error
e.Log.Errorf("Delete error: %s", err)
app/admin/service/sys_opera_log.go
+1 -1
View File
@@ -71,7 +71,7 @@ func (e *SysOperaLog) Remove(d *dto.SysOperaLogById) error {
var err error
var data models.SysOperaLog
db := e.Orm.Model(&data).Delete(&data, d.Ids)
db := e.Orm.Model(&data).Delete(&data, d.GetId())
if err = db.Error; err != nil {
e.Log.Errorf("Service RemoveSysOperaLog error:%s", err.Error())
return err
app/other/apis/sys_china_area_data.go
+4 -7
View File
@@ -32,18 +32,15 @@ func (e SysChinaAreaData) GetPage(c *gin.Context) {
return
}
//数据权限检查
p := actions.GetPermissionFromContext(c)
list := make([]models.SysChinaAreaData, 0)
var count int64
err = s.GetPage(&req, p, &list, &count)
err = s.GetPage(&req, &list).Error
if err != nil {
e.Logger.Error(err)
e.Error(http.StatusInternalServerError, err, "查询失败")
return
}
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
e.OK(list, "查询成功")
}
func (e SysChinaAreaData) Get(c *gin.Context) {
@@ -51,7 +48,7 @@ func (e SysChinaAreaData) Get(c *gin.Context) {
req := dto.SysChinaAreaDataById{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req, binding.Form).
Bind(&req, nil).
MakeService(&s.Service).
Errors
if err != nil {
app/other/models/sys_china_area_data.go
+4 -3
View File
@@ -5,9 +5,10 @@ import (
)
type SysChinaAreaData struct {
models.Model
PId string `json:"p_id" gorm:"size:11;comment:上级编码"`
Name string `json:"name" gorm:"size:128;comment:名称"`
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:"-"`
models.ControlBy
models.ModelTime
}
app/other/service/dto/sys_china_area_data.go
+7 -8
View File
@@ -1,14 +1,13 @@
package dto
import (
models2 "go-admin/app/other/models"
"go-admin/app/other/models"
"time"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
"go-admin/common/dto"
common "go-admin/common/models"
)
type SysChinaAreaDataSearch struct {
@@ -32,7 +31,7 @@ func (m *SysChinaAreaDataSearch) Bind(ctx *gin.Context) error {
type SysChinaAreaDataControl struct {
Id int `uri:"id" comment:"编码"` // 编码
PId string `json:"pId" comment:"上级编码"`
PId int `json:"pId" comment:"上级编码"`
Name string `json:"name" comment:"名称"`
CreateTime time.Time `json:"createTime" comment:""`
UpdateTime time.Time `json:"updateTime" comment:""`
@@ -53,11 +52,11 @@ func (s *SysChinaAreaDataControl) Bind(ctx *gin.Context) error {
return err
}
func (s *SysChinaAreaDataControl) Generate() (*models2.SysChinaAreaData, error) {
return &models2.SysChinaAreaData{
Model: common.Model{Id: s.Id},
PId: s.PId,
Name: s.Name,
func (s *SysChinaAreaDataControl) Generate() (*models.SysChinaAreaData, error) {
return &models.SysChinaAreaData{
Id: s.Id,
PId: s.PId,
Name: s.Name,
}, nil
}
app/other/service/sys_china_area_data.go
+35 -11
View File
@@ -2,15 +2,15 @@ package service
import (
"errors"
"go-admin/app/other/models"
"go-admin/app/other/service/dto"
common "go-admin/common/models"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"go-admin/app/other/models"
"go-admin/app/other/service/dto"
"go-admin/common/actions"
cDto "go-admin/common/dto"
common "go-admin/common/models"
)
type SysChinaAreaData struct {
@@ -18,22 +18,46 @@ type SysChinaAreaData struct {
}
// GetPage 获取SysChinaAreaData列表
func (e *SysChinaAreaData) GetPage(c *dto.SysChinaAreaDataSearch, p *actions.DataPermission, list *[]models.SysChinaAreaData, count *int64) error {
func (e *SysChinaAreaData) GetPage(c *dto.SysChinaAreaDataSearch, list *[]models.SysChinaAreaData) *SysChinaAreaData {
var data models.SysChinaAreaData
var areaDataList []models.SysChinaAreaData
err := e.Orm.Model(&data).
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
actions.Permission(data.TableName(), p),
).
Find(list).Limit(-1).Offset(-1).
Count(count).Error
Find(&areaDataList).Error
if err != nil {
e.Log.Errorf("Service GetSysChinaAreaDataPage error:%s", err)
return err
_ = e.AddError(err)
return e
}
return nil
for i := 0; i < len(areaDataList); i++ {
if areaDataList[i].PId != 86 {
continue
}
menusInfo := areaDataCall(&areaDataList, areaDataList[i])
*list = append(*list, menusInfo)
}
return e
}
// areaDataCall 构建树
func areaDataCall(areaDataList *[]models.SysChinaAreaData, areaData models.SysChinaAreaData) models.SysChinaAreaData {
list := *areaDataList
min := make([]models.SysChinaAreaData, 0)
for j := 0; j < len(list); j++ {
if areaData.Id != list[j].PId {
continue
}
mi := models.SysChinaAreaData{}
mi = list[j]
mi.Children = []models.SysChinaAreaData{}
ms := areaDataCall(areaDataList, mi)
min = append(min, ms)
}
areaData.Children = min
return areaData
}
// Get 获取SysChinaAreaData对象