feat:update tpl

This commit is contained in:
zhangwenjian committed 2020-09-29 12:23:16 +08:00
1 parent bc648c3f2f
commit ca8d1e7e33
9 files changed
+24 -42

No files matched your search

+1 -8
View File
@@ -56,7 +56,6 @@ func (e *Scol) GetScolList(c *gin.Context) {
func (e *Scol) GetScol(c *gin.Context) {
control := new(dto.ScolById)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
return
@@ -70,12 +69,7 @@ func (e *Scol) GetScol(c *gin.Context) {
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object common.ActiveRecord
object, err = control.GenerateM()
if err != nil {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
var object models.Scol
//数据权限检查
p := actions.GetPermissionFromContext(c)
@@ -201,7 +195,6 @@ func (e *Scol) DeleteScol(c *gin.Context) {
serviceScol := service.Scol{}
serviceScol.Orm = db
serviceScol.MsgID = msgID
err = serviceScol.RemoveScol(req, object, p)
if err != nil {
log.Error(err)
+9 -9
View File
@@ -21,7 +21,7 @@ func (e *Scol) GetScolPage(c cDto.Index, p *actions.DataPermission, list *[]mode
var data models.Scol
msgID := e.MsgID
err = e.Orm.Table(data.TableName()).
err = e.Orm.Model(&data).
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
@@ -37,17 +37,17 @@ func (e *Scol) GetScolPage(c cDto.Index, p *actions.DataPermission, list *[]mode
}
// GetScol 获取Scol对象
func (e *Scol) GetScol(c cDto.Control, p *actions.DataPermission, m *common.ActiveRecord) error {
func (e *Scol) GetScol(d cDto.Control, p *actions.DataPermission, model *models.Scol) error {
var err error
var data models.Scol
msgID := e.MsgID
db := e.Orm.Table(data.TableName()).
db := e.Orm.Model(&data).
Scopes(
actions.Permission(data.TableName(), p),
).Where(c.GetId()).First(m)
).
First(model, d.GetId())
err = db.Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看")
log.Errorf("msgID[%s] db error:%s", msgID, err)
@@ -66,7 +66,7 @@ func (e *Scol) InsertScol(model common.ActiveRecord) error {
var data models.Scol
msgID := e.MsgID
err = e.Orm.Table(data.TableName()).
err = e.Orm.Model(&data).
Create(model).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
@@ -81,7 +81,7 @@ func (e *Scol) UpdateScol(c common.ActiveRecord, p *actions.DataPermission) erro
var data models.Scol
msgID := e.MsgID
db := e.Orm.Table(data.TableName()).
db := e.Orm.Model(&data).
Scopes(
actions.Permission(data.TableName(), p),
).Where(c.GetId()).Updates(c)
@@ -102,7 +102,7 @@ func (e *Scol) RemoveScol(d cDto.Control, c common.ActiveRecord, p *actions.Data
var data models.Scol
msgID := e.MsgID
db := e.Orm.Table(data.TableName()).
db := e.Orm.Model(&data).
Scopes(
actions.Permission(data.TableName(), p),
).Where(d.GetId()).Delete(c)
@@ -116,4 +116,4 @@ func (e *Scol) RemoveScol(d cDto.Control, c common.ActiveRecord, p *actions.Data
return err
}
return nil
}
}
@@ -26,6 +26,6 @@ func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJW
r.GET("/:id", actions.PermissionAction(), actions.ViewAction(new(dto.{{.ClassName}}ById), nil))
r.POST("", actions.CreateAction(new(dto.{{.ClassName}}Control)))
r.PUT("/:id", actions.PermissionAction(), actions.UpdateAction(new(dto.{{.ClassName}}Control)))
r.DELETE("/:id", actions.PermissionAction(), actions.DeleteAction(new(dto.{{.ClassName}}ById)))
r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.{{.ClassName}}ById)))
}
}
@@ -25,6 +25,6 @@ func register{{.ClassName}}Router(v1 *gin.RouterGroup) {
r.GET("/:id", actions.ViewAction(new(dto.{{.ClassName}}ById), nil))
r.POST("", actions.CreateAction(new(dto.{{.ClassName}}Control)))
r.PUT("/:id", actions.UpdateAction(new(dto.{{.ClassName}}Control)))
r.DELETE("/:id", actions.DeleteAction(new(dto.{{.ClassName}}ById)))
r.DELETE("", actions.DeleteAction(new(dto.{{.ClassName}}ById)))
}
}
+2 -9
View File
@@ -55,9 +55,7 @@ func (e *{{.ClassName}}) Get{{.ClassName}}List(c *gin.Context) {
func (e *{{.ClassName}}) Get{{.ClassName}}(c *gin.Context) {
control := new(dto.{{.ClassName}}ById)
d := new(dto.{{.ClassName}}Search)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
return
@@ -71,12 +69,7 @@ func (e *{{.ClassName}}) Get{{.ClassName}}(c *gin.Context) {
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object common.ActiveRecord
object, err = req.GenerateM()
if err != nil {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
var object models.{{.ClassName}}
//数据权限检查
p := actions.GetPermissionFromContext(c)
@@ -84,7 +77,7 @@ func (e *{{.ClassName}}) Get{{.ClassName}}(c *gin.Context) {
service{{.ClassName}} := service.{{.ClassName}}{}
service{{.ClassName}}.MsgID = msgID
service{{.ClassName}}.Orm = db
err = service{{.ClassName}}.Get{{.ClassName}}(d, p, &object)
err = service{{.ClassName}}.Get{{.ClassName}}(req, p, &object)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
return
@@ -20,6 +20,6 @@ func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJW
r.GET("/:id", api.Get{{.ClassName}})
r.POST("", api.Insert{{.ClassName}})
r.PUT("/:id", api.Update{{.ClassName}})
r.DELETE("/:id", api.Delete{{.ClassName}})
r.DELETE("", api.Delete{{.ClassName}})
}
}
@@ -19,6 +19,6 @@ func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJW
r.GET("/:id", api.Get{{.ClassName}})
r.POST("", api.Insert{{.ClassName}})
r.PUT("/:id", api.Update{{.ClassName}})
r.DELETE("/:id", api.Delete{{.ClassName}})
r.DELETE("", api.Delete{{.ClassName}})
}
}
+7 -9
View File
@@ -3,7 +3,6 @@ package service
import (
"errors"
"go-admin/app/admin/models"
"go-admin/app/admin/service/dto"
"go-admin/common/actions"
cDto "go-admin/common/dto"
"go-admin/common/log"
@@ -22,7 +21,7 @@ func (e *{{.ClassName}}) Get{{.ClassName}}Page(c cDto.Index, p *actions.DataPerm
var data models.{{.ClassName}}
msgID := e.MsgID
err = e.Orm.Table(data.TableName()).
err = e.Orm.Model(&data).
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
@@ -38,17 +37,16 @@ func (e *{{.ClassName}}) Get{{.ClassName}}Page(c cDto.Index, p *actions.DataPerm
}
// Get{{.ClassName}} 获取{{.ClassName}}对象
func (e *{{.ClassName}}) Get{{.ClassName}}(c *dto.{{.ClassName}}Search, p *actions.DataPermission, model *common.ActiveRecord) error {
func (e *{{.ClassName}}) Get{{.ClassName}}(d cDto.Control, p *actions.DataPermission, model *models.{{.ClassName}}) error {
var err error
var data models.{{.ClassName}}
msgID := e.MsgID
db := e.Orm.Table(data.TableName()).
db := e.Orm.Model(&data).
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
actions.Permission(data.TableName(), p),
).
First(model)
First(model, d.GetId())
err = db.Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看")
@@ -68,7 +66,7 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(model common.ActiveRecord) error {
var data models.{{.ClassName}}
msgID := e.MsgID
err = e.Orm.Table(data.TableName()).
err = e.Orm.Model(&data).
Create(model).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
@@ -83,7 +81,7 @@ func (e *{{.ClassName}}) Update{{.ClassName}}(c common.ActiveRecord, p *actions.
var data models.{{.ClassName}}
msgID := e.MsgID
db := e.Orm.Table(data.TableName()).
db := e.Orm.Model(&data).
Scopes(
actions.Permission(data.TableName(), p),
).Where(c.GetId()).Updates(c)
@@ -104,7 +102,7 @@ func (e *{{.ClassName}}) Remove{{.ClassName}}(d cDto.Control, c common.ActiveRec
var data models.{{.ClassName}}
msgID := e.MsgID
db := e.Orm.Table(data.TableName()).
db := e.Orm.Model(&data).
Scopes(
actions.Permission(data.TableName(), p),
).Where(d.GetId()).Delete(c)
+1 -3
View File
@@ -452,9 +452,7 @@
/** 删除按钮操作 */
handleDelete(row) {
var Ids = (row.{{.PkJsonField}} && [row.{{.PkJsonField}}]) || this.ids
if (this.ids.length === 0) {
Ids = [Ids]
}
this.$confirm('是否确认删除编号为"' + Ids + '"的数据项?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',