调整整体架构写法

调整db用法
调整日志用法
调整模版
This commit is contained in:
linwenxiang committed 2021-03-04 23:45:16 +08:00
1 parent 734a48dbb8
commit e2952fa393
137 files changed
+3638 -3544

No files matched your search

+42 -27
View File
@@ -9,7 +9,6 @@ import (
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/common/apis"
"go-admin/common/log"
common "go-admin/common/models"
"go-admin/tools"
)
@@ -30,10 +29,11 @@ type SysDictData struct {
// @Router /api/v1/dict/data [get]
// @Security Bearer
func (e *SysDictData) GetSysDictDataList(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -42,6 +42,7 @@ func (e *SysDictData) GetSysDictDataList(c *gin.Context) {
//查询列表
err = req.Bind(c)
if err != nil {
log.Warnf("Bind error: %s", err.Error())
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
@@ -49,11 +50,12 @@ func (e *SysDictData) GetSysDictDataList(c *gin.Context) {
list := make([]system.SysDictData, 0)
var count int64
s := service.SysDictData{}
s.MsgID = msgID
s.Log = log
s.Orm = db.Debug()
err = s.GetPage(req, &list, &count)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
log.Errorf("GetPage error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@@ -68,28 +70,31 @@ func (e *SysDictData) GetSysDictDataList(c *gin.Context) {
// @Router /api/v1/dict/data/{dictCode} [get]
// @Security Bearer
func (e *SysDictData) GetSysDictData(c *gin.Context) {
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
msgID := tools.GenerateMsgIDFromContext(c)
//查看详情
req := &dto.SysDictDataById{}
err = req.Bind(c)
if err != nil {
log.Warnf("Bind error: %s", err.Error())
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object system.SysDictData
s := service.SysDictData{}
s.MsgID = msgID
s.Log = log
s.Orm = db
err = s.Get(req, &object)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
log.Warnf("Get error: %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@@ -107,17 +112,19 @@ func (e *SysDictData) GetSysDictData(c *gin.Context) {
// @Router /api/v1/dict/data [post]
// @Security Bearer
func (e *SysDictData) InsertSysDictData(c *gin.Context) {
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
msgID := tools.GenerateMsgIDFromContext(c)
//新增操作
req := &dto.SysDictDataControl{}
err = req.Bind(c)
if err != nil {
log.Warnf("Bind error: %s", err.Error())
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
@@ -127,10 +134,10 @@ func (e *SysDictData) InsertSysDictData(c *gin.Context) {
s := service.SysDictData{}
s.Orm = db
s.MsgID = msgID
s.Log = log
err = s.Insert(object.(*system.SysDictData))
if err != nil {
log.Error(err)
log.Errorf("Insert error, %s", err)
e.Error(c, http.StatusInternalServerError, err, "创建失败")
return
}
@@ -149,18 +156,19 @@ func (e *SysDictData) InsertSysDictData(c *gin.Context) {
// @Router /api/v1/dict/data/{dictCode} [put]
// @Security Bearer
func (e *SysDictData) UpdateSysDictData(c *gin.Context) {
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
msgID := tools.GenerateMsgIDFromContext(c)
req := &dto.SysDictDataControl{}
//更新操作
err = req.Bind(c)
if err != nil {
log.Errorf("msgID[%s] request validate error, %s", msgID, err.Error())
log.Warnf("request validate error, %s", err.Error())
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
@@ -169,10 +177,11 @@ func (e *SysDictData) UpdateSysDictData(c *gin.Context) {
s := service.SysDictData{}
s.Orm = db
s.MsgID = msgID
s.Log = log
err = s.Update(object.(*system.SysDictData))
if err != nil {
log.Error(err)
log.Errorf("Update error, %s", err)
e.Error(c, http.StatusInternalServerError, err, "更新失败")
return
}
e.OK(c, object.GetId(), "更新成功")
@@ -186,24 +195,26 @@ func (e *SysDictData) UpdateSysDictData(c *gin.Context) {
// @Success 200 {string} string "{"code": -1, "message": "删除失败"}"
// @Router /api/v1/dict/data/{dictCode} [delete]
func (e *SysDictData) DeleteSysDictData(c *gin.Context) {
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
msgID := tools.GenerateMsgIDFromContext(c)
//删除操作
req := new(dto.SysDictDataById)
err = req.Bind(c)
if err != nil {
log.Errorf("MsgID[%s] Bind error: %s", msgID, err)
log.Warnf("Bind error: %s", err)
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object common.ActiveRecord
object, err = req.GenerateM()
if err != nil {
log.Errorf("GenerateM error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
@@ -213,20 +224,22 @@ func (e *SysDictData) DeleteSysDictData(c *gin.Context) {
s := service.SysDictData{}
s.Orm = db
s.MsgID = msgID
s.Log = log
err = s.Remove(req, object.(*system.SysDictData))
if err != nil {
log.Error(err)
log.Errorf("Remove error, %s", err)
e.Error(c, http.StatusInternalServerError, err, "删除失败")
return
}
e.OK(c, object.GetId(), "删除成功")
}
func (e *SysDictData) GetSysDictDataAll(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -235,17 +248,19 @@ func (e *SysDictData) GetSysDictDataAll(c *gin.Context) {
//查询列表
err = req.Bind(c)
if err != nil {
log.Warnf("Bind error: %s", err)
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
list := make([]system.SysDictData, 0)
s := service.SysDictData{}
s.MsgID = msgID
s.Log = log
s.Orm = db
err = s.GetAll(req, &list)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
log.Errorf("GetAll error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
+26 -21
View File
@@ -9,7 +9,6 @@ import (
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/common/apis"
"go-admin/common/log"
common "go-admin/common/models"
"go-admin/tools"
)
@@ -30,10 +29,11 @@ type SysDictType struct {
// @Router /api/v1/dict/type [get]
// @Security Bearer
func (e *SysDictType) GetSysDictTypeList(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -49,11 +49,11 @@ func (e *SysDictType) GetSysDictTypeList(c *gin.Context) {
list := make([]system.SysDictType, 0)
var count int64
s := service.SysDictType{}
s.MsgID = msgID
s.Log = log
s.Orm = db.Debug()
err = s.GetPage(req, &list, &count)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
e.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@@ -68,13 +68,14 @@ func (e *SysDictType) GetSysDictTypeList(c *gin.Context) {
// @Router /api/v1/dict/type/{dictId} [get]
// @Security Bearer
func (e *SysDictType) GetSysDictType(c *gin.Context) {
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
msgID := tools.GenerateMsgIDFromContext(c)
//查看详情
req := &dto.SysDictTypeById{}
err = req.Bind(c)
@@ -85,7 +86,7 @@ func (e *SysDictType) GetSysDictType(c *gin.Context) {
var object system.SysDictType
s := service.SysDictType{}
s.MsgID = msgID
s.Log = log
s.Orm = db
err = s.Get(req, &object)
if err != nil {
@@ -107,13 +108,14 @@ func (e *SysDictType) GetSysDictType(c *gin.Context) {
// @Router /api/v1/dict/type [post]
// @Security Bearer
func (e *SysDictType) InsertSysDictType(c *gin.Context) {
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
msgID := tools.GenerateMsgIDFromContext(c)
//新增操作
req := &dto.SysDictTypeControl{}
err = req.Bind(c)
@@ -127,7 +129,7 @@ func (e *SysDictType) InsertSysDictType(c *gin.Context) {
s := service.SysDictType{}
s.Orm = db
s.MsgID = msgID
s.Log = log
err = s.Insert(object.(*system.SysDictType))
if err != nil {
log.Error(err)
@@ -149,13 +151,14 @@ func (e *SysDictType) InsertSysDictType(c *gin.Context) {
// @Router /api/v1/dict/type/{dictId} [put]
// @Security Bearer
func (e *SysDictType) UpdateSysDictType(c *gin.Context) {
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
msgID := tools.GenerateMsgIDFromContext(c)
req := &dto.SysDictTypeControl{}
//更新操作
err = req.Bind(c)
@@ -168,7 +171,7 @@ func (e *SysDictType) UpdateSysDictType(c *gin.Context) {
s := service.SysDictType{}
s.Orm = db
s.MsgID = msgID
s.Log = log
err = s.Update(object.(*system.SysDictType))
if err != nil {
log.Error(err)
@@ -185,18 +188,19 @@ func (e *SysDictType) UpdateSysDictType(c *gin.Context) {
// @Success 200 {string} string "{"code": -1, "message": "删除失败"}"
// @Router /api/v1/dict/type/{dictId} [delete]
func (e *SysDictType) DeleteSysDictType(c *gin.Context) {
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
msgID := tools.GenerateMsgIDFromContext(c)
//删除操作
req := new(dto.SysDictTypeById)
err = req.Bind(c)
if err != nil {
log.Errorf("MsgID[%s] Bind error: %s", msgID, err)
log.Errorf("Bind error: %s", err)
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
@@ -212,7 +216,7 @@ func (e *SysDictType) DeleteSysDictType(c *gin.Context) {
s := service.SysDictType{}
s.Orm = db
s.MsgID = msgID
s.Log = log
err = s.Remove(req, object.(*system.SysDictType))
if err != nil {
log.Error(err)
@@ -231,10 +235,11 @@ func (e *SysDictType) DeleteSysDictType(c *gin.Context) {
// @Router /api/v1/dict/type-option-select [get]
// @Security Bearer
func (e *SysDictType) GetSysDictTypeAll(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -249,7 +254,7 @@ func (e *SysDictType) GetSysDictTypeAll(c *gin.Context) {
list := make([]system.SysDictType, 0)
s := service.SysDictType{}
s.MsgID = msgID
s.Log = log
s.Orm = db
err = s.GetAll(req, &list)
if err != nil {