refactor🎨 核心业务结构调整

This commit is contained in:
zhangwenjian committed 2021-05-22 22:54:08 +08:00
1 parent 408dcc5057
commit e473f158e8
13 files changed
+406 -761

No files matched your search

+31 -126
View File
@@ -17,28 +17,23 @@ type SysLoginLog struct {
}
func (e SysLoginLog) GetSysLoginLogList(c *gin.Context) {
e.Context = c
log := e.GetLogger()
s := new(service.SysLoginLog)
d := new(dto.SysLoginLogSearch)
db, err := e.GetOrm()
err := e.MakeContext(c).
MakeOrm().
Bind(d).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
return
}
//查询列表
err = d.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return
}
list := make([]models.SysLoginLog, 0)
var count int64
serviceStudent := service.SysLoginLog{}
serviceStudent.Log = log
serviceStudent.Orm = db
err = serviceStudent.GetSysLoginLogPage(d, &list, &count)
err = s.GetSysLoginLogPage(d, &list, &count)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return
@@ -48,27 +43,21 @@ func (e SysLoginLog) GetSysLoginLogList(c *gin.Context) {
}
func (e SysLoginLog) GetSysLoginLog(c *gin.Context) {
e.Context = c
log := e.GetLogger()
s := new(service.SysLoginLog)
control := new(dto.SysLoginLogById)
db, err := e.GetOrm()
err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return
}
//查看详情
err = control.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object models.SysLoginLog
serviceSysLoginLog := service.SysLoginLog{}
serviceSysLoginLog.Log = log
serviceSysLoginLog.Orm = db
err = serviceSysLoginLog.GetSysLoginLog(control, &object)
err = s.GetSysLoginLog(control, &object)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return
@@ -77,112 +66,28 @@ func (e SysLoginLog) GetSysLoginLog(c *gin.Context) {
e.OK(object, "查看成功")
}
//func (e SysLoginLog) InsertSysLoginLog(c *gin.Context) {
// e.Context = c
// log := e.GetLogger()
// control := new(dto.SysLoginLogControl)
// db, err := e.GetOrm()
// if err != nil {
// log.Error(err)
// return
// }
//
// //新增操作
// err = control.Bind(c)
// if err != nil {
// e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
// return
// }
// object, err := control.Generate()
// if err != nil {
// e.Error(http.StatusInternalServerError, err, "模型生成失败")
// return
// }
// // 设置创建人
// object.SetCreateBy(user.GetUserId(c))
//
// serviceSysLoginLog := service.SysLoginLog{}
// serviceSysLoginLog.Orm = db
// serviceSysLoginLog.Log = log
// err = serviceSysLoginLog.InsertSysLoginLog(object)
// if err != nil {
// log.Errorf("InsertSysLoginLog error, %s", err)
// e.Error(http.StatusInternalServerError, err, "创建失败")
// return
// }
//
// e.OK(object.GetId(), "创建成功")
//}
//func (e SysLoginLog) UpdateSysLoginLog(c *gin.Context) {
// e.Context = c
// log := e.GetLogger()
// control := new(dto.SysLoginLogControl)
// db, err := e.GetOrm()
// if err != nil {
// log.Error(err)
// return
// }
//
// //更新操作
// err = control.Bind(c)
// if err != nil {
// e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
// return
// }
// object, err := control.Generate()
// if err != nil {
// e.Error(http.StatusInternalServerError, err, "模型生成失败")
// return
// }
// object.SetUpdateBy(user.GetUserId(c))
//
// serviceSysLoginLog := service.SysLoginLog{}
// serviceSysLoginLog.Orm = db
// serviceSysLoginLog.Log = log
// err = serviceSysLoginLog.UpdateSysLoginLog(object)
// if err != nil {
// log.Errorf("UpdateSysLoginLog error, %s", err)
// e.Error(http.StatusInternalServerError, err, "更新失败")
// return
// }
// e.OK(object.GetId(), "更新成功")
//}
func (e SysLoginLog) DeleteSysLoginLog(c *gin.Context) {
e.Context = c
log := e.GetLogger()
s := service.SysLoginLog{}
control := new(dto.SysLoginLogById)
db, err := e.GetOrm()
err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
return
}
//删除操作
err = control.Bind(c)
if err != nil {
log.Errorf("Bind error: %s", err)
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
object, err := control.GenerateM()
if err != nil {
e.Error(http.StatusInternalServerError, err, "模型生成失败")
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return
}
// 设置编辑人
object.SetUpdateBy(user.GetUserId(c))
control.SetUpdateBy(user.GetUserId(c))
serviceSysLoginLog := service.SysLoginLog{}
serviceSysLoginLog.Orm = db
serviceSysLoginLog.Log = log
err = serviceSysLoginLog.RemoveSysLoginLog(control, object)
err = s.RemoveSysLoginLog(control)
if err != nil {
log.Errorf("RemoveSysLoginLog error, %s", err)
e.Logger.Errorf("RemoveSysLoginLog error, %s", err)
e.Error(http.StatusInternalServerError, err, "删除失败")
return
}
e.OK(object.GetId(), "删除成功")
e.OK(control.GetId(), "删除成功")
}