Merge branch 'dev'

This commit is contained in:
wenjianzhang committed 2021-06-15 12:25:46 +08:00
commit 9fb23b45cd
14 files changed
+125 -79

No files matched your search

+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(), "删除成功")
}
}
+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{} {
+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{} {
+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)
+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