修复新代码报错

This commit is contained in:
linwenxiang committed 2021-03-05 00:06:21 +08:00
1 parent 1105d98f27
commit 48f0cb46ec
5 files changed
+110 -108

No files matched your search

+30 -34
View File
@@ -2,20 +2,18 @@ package dto
import (
"github.com/gin-gonic/gin"
"go-admin/pkg/logger"
//"gorm.io/gorm"
"go-admin/app/admin/models"
"go-admin/common/dto"
"go-admin/common/log"
common "go-admin/common/models"
"go-admin/tools"
)
type WfProcessClassifySearch struct {
dto.Pagination `search:"-"`
Name string `form:"name" search:"type:contains;column:name;table:wf_process_classify" comment:"名称"`
dto.Pagination `search:"-"`
Name string `form:"name" search:"type:contains;column:name;table:wf_process_classify" comment:"名称"`
}
func (m *WfProcessClassifySearch) GetNeedSearch() interface{} {
@@ -23,41 +21,39 @@ func (m *WfProcessClassifySearch) GetNeedSearch() interface{} {
}
func (m *WfProcessClassifySearch) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
}
return err
log := logger.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
type WfProcessClassifyControl struct {
Id int `uri:"id" comment:"编码"` // 编码
Id int `uri:"id" comment:"编码"` // 编码
Name string `json:"name" comment:"名称"`
Name string `json:"name" comment:"名称"`
}
func (s *WfProcessClassifyControl) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
}
return err
log := logger.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("ShouldBind error: %#v", err.Error())
}
return err
}
func (s *WfProcessClassifyControl) Generate() (*models.WfProcessClassify, error) {
return &models.WfProcessClassify{
Model: common.Model{ Id: s.Id },
Name: s.Name,
Model: common.Model{Id: s.Id},
Name: s.Name,
}, nil
}
@@ -79,19 +75,19 @@ func (s *WfProcessClassifyById) GetId() interface{} {
}
func (s *WfProcessClassifyById) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := logger.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %#v", err.Error())
}
return err
}
func (s *WfProcessClassifyById) SetUpdateBy(id int) {
}
}
+11 -15
View File
@@ -2,13 +2,14 @@ package service
import (
"errors"
"gorm.io/gorm"
"go-admin/app/admin/models"
"go-admin/app/admin/service/dto"
"go-admin/common/actions"
cDto "go-admin/common/dto"
"go-admin/common/log"
"go-admin/app/admin/service/dto"
"go-admin/common/service"
"gorm.io/gorm"
)
type SysChinaAreaData struct {
@@ -19,7 +20,6 @@ type SysChinaAreaData struct {
func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto.SysChinaAreaDataSearch, p *actions.DataPermission, list *[]models.SysChinaAreaData, count *int64) error {
var err error
var data models.SysChinaAreaData
msgID := e.MsgID
err = e.Orm.Model(&data).
Scopes(
@@ -30,7 +30,7 @@ func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto.SysChinaAreaDataSearch
Find(list).Limit(-1).Offset(-1).
Count(count).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error:%s", err)
return err
}
return nil
@@ -40,7 +40,6 @@ func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto.SysChinaAreaDataSearch
func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto.SysChinaAreaDataById, p *actions.DataPermission, model *models.SysChinaAreaData) error {
var err error
var data models.SysChinaAreaData
msgID := e.MsgID
db := e.Orm.Model(&data).
Scopes(
@@ -50,11 +49,11 @@ func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto.SysChinaAreaDataById, p *a
err = db.Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看")
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error:%s", err)
return err
}
if db.Error != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error:%s", err)
return err
}
return nil
@@ -64,12 +63,11 @@ func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto.SysChinaAreaDataById, p *a
func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models.SysChinaAreaData) error {
var err error
var data models.SysChinaAreaData
msgID := e.MsgID
err = e.Orm.Model(&data).
Create(model).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error:%s", err)
return err
}
return nil
@@ -79,14 +77,13 @@ func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models.SysChinaAreaData
func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *models.SysChinaAreaData, p *actions.DataPermission) error {
var err error
var data models.SysChinaAreaData
msgID := e.MsgID
db := e.Orm.Model(&data).
Scopes(
actions.Permission(data.TableName(), p),
).Where(c.GetId()).Updates(c)
if db.Error != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error:%s", err)
return err
}
if db.RowsAffected == 0 {
@@ -100,7 +97,6 @@ func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *models.SysChinaAreaData, p
func (e *SysChinaAreaData) RemoveSysChinaAreaData(d *dto.SysChinaAreaDataById, p *actions.DataPermission) error {
var err error
var data models.SysChinaAreaData
msgID := e.MsgID
db := e.Orm.Model(&data).
Scopes(
@@ -108,7 +104,7 @@ func (e *SysChinaAreaData) RemoveSysChinaAreaData(d *dto.SysChinaAreaDataById, p
).Delete(&data, d.GetId())
if db.Error != nil {
err = db.Error
log.Errorf("MsgID[%s] Delete error: %s", msgID, err)
e.Log.Errorf("Delete error: %s", err)
return err
}
if db.RowsAffected == 0 {
@@ -116,4 +112,4 @@ func (e *SysChinaAreaData) RemoveSysChinaAreaData(d *dto.SysChinaAreaDataById, p
return err
}
return nil
}
}
+11 -15
View File
@@ -2,13 +2,14 @@ package service
import (
"errors"
"gorm.io/gorm"
"go-admin/app/admin/models"
"go-admin/app/admin/service/dto"
"go-admin/common/actions"
cDto "go-admin/common/dto"
"go-admin/common/log"
"go-admin/app/admin/service/dto"
"go-admin/common/service"
"gorm.io/gorm"
)
type WfProcessClassify struct {
@@ -19,7 +20,6 @@ type WfProcessClassify struct {
func (e *WfProcessClassify) GetWfProcessClassifyPage(c *dto.WfProcessClassifySearch, p *actions.DataPermission, list *[]models.WfProcessClassify, count *int64) error {
var err error
var data models.WfProcessClassify
msgID := e.MsgID
err = e.Orm.Model(&data).
Scopes(
@@ -30,7 +30,7 @@ func (e *WfProcessClassify) GetWfProcessClassifyPage(c *dto.WfProcessClassifySea
Find(list).Limit(-1).Offset(-1).
Count(count).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error:%s", err)
return err
}
return nil
@@ -40,7 +40,6 @@ func (e *WfProcessClassify) GetWfProcessClassifyPage(c *dto.WfProcessClassifySea
func (e *WfProcessClassify) GetWfProcessClassify(d *dto.WfProcessClassifyById, p *actions.DataPermission, model *models.WfProcessClassify) error {
var err error
var data models.WfProcessClassify
msgID := e.MsgID
db := e.Orm.Model(&data).
Scopes(
@@ -50,11 +49,11 @@ func (e *WfProcessClassify) GetWfProcessClassify(d *dto.WfProcessClassifyById, p
err = db.Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看")
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error:%s", err)
return err
}
if db.Error != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error:%s", err)
return err
}
return nil
@@ -64,12 +63,11 @@ func (e *WfProcessClassify) GetWfProcessClassify(d *dto.WfProcessClassifyById, p
func (e *WfProcessClassify) InsertWfProcessClassify(model *models.WfProcessClassify) error {
var err error
var data models.WfProcessClassify
msgID := e.MsgID
err = e.Orm.Model(&data).
Create(model).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error:%s", err)
return err
}
return nil
@@ -79,14 +77,13 @@ func (e *WfProcessClassify) InsertWfProcessClassify(model *models.WfProcessClass
func (e *WfProcessClassify) UpdateWfProcessClassify(c *models.WfProcessClassify, p *actions.DataPermission) error {
var err error
var data models.WfProcessClassify
msgID := e.MsgID
db := e.Orm.Model(&data).
Scopes(
actions.Permission(data.TableName(), p),
).Where(c.GetId()).Updates(c)
if db.Error != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error:%s", err)
return err
}
if db.RowsAffected == 0 {
@@ -100,7 +97,6 @@ func (e *WfProcessClassify) UpdateWfProcessClassify(c *models.WfProcessClassify,
func (e *WfProcessClassify) RemoveWfProcessClassify(d *dto.WfProcessClassifyById, p *actions.DataPermission) error {
var err error
var data models.WfProcessClassify
msgID := e.MsgID
db := e.Orm.Model(&data).
Scopes(
@@ -108,7 +104,7 @@ func (e *WfProcessClassify) RemoveWfProcessClassify(d *dto.WfProcessClassifyById
).Delete(&data, d.GetId())
if db.Error != nil {
err = db.Error
log.Errorf("MsgID[%s] Delete error: %s", msgID, err)
e.Log.Errorf("Delete error: %s", err)
return err
}
if db.RowsAffected == 0 {
@@ -116,4 +112,4 @@ func (e *WfProcessClassify) RemoveWfProcessClassify(d *dto.WfProcessClassifyById
return err
}
return nil
}
}