update

template/api.go.template

@@ -30,7 +30,7 @@ func Get{{.ClassName}}List(c *gin.Context) {
 
     data.DataScope = utils.GetUserIdStr(c)
     result, count, err := data.GetPage(pageSize, pageIndex)
-    pkg.AssertErr(err, "", -1)
+    pkg.HasError(err, "", -1)
 
     var mp = make(map[string]interface{}, 3)
     mp["list"] = result
@@ -46,9 +46,9 @@ func Get{{.ClassName}}List(c *gin.Context) {
 
 func Get{{.ClassName}}(c *gin.Context) {
     var data models.{{.ClassName}}
-    data.{{.PkGoField}}, _ = utils.StringToInt64(c.Param("{{.PkJsonField}}"))
+    data.{{.PkGoField}}, _ = utils.StringToInt(c.Param("{{.PkJsonField}}"))
     result, err := data.Get()
-    pkg.AssertErr(err, "抱歉未找到相关信息", -1)
+    pkg.HasError(err, "抱歉未找到相关信息", -1)
 
     var res models.Response
     res.Data = result
@@ -60,9 +60,9 @@ func Insert{{.ClassName}}(c *gin.Context) {
     var data models.{{.ClassName}}
     err := c.BindWith(&data, binding.JSON)
     data.CreateBy = utils.GetUserIdStr(c)
-    pkg.AssertErr(err, "", 500)
+    pkg.HasError(err, "", 500)
     result, err := data.Create()
-    pkg.AssertErr(err, "", -1)
+    pkg.HasError(err, "", -1)
     var res models.Response
     res.Data = result
     c.JSON(http.StatusOK, res.ReturnOK())
@@ -71,10 +71,10 @@ func Insert{{.ClassName}}(c *gin.Context) {
 func Update{{.ClassName}}(c *gin.Context) {
     var data models.{{.ClassName}}
     err := c.BindWith(&data, binding.JSON)
-    pkg.AssertErr(err, "数据解析失败", -1)
+    pkg.HasError(err, "数据解析失败", -1)
     data.UpdateBy = utils.GetUserIdStr(c)
     result, err := data.Update(data.{{.PkGoField}})
-    pkg.AssertErr(err, "", -1)
+    pkg.HasError(err, "", -1)
 
     var res models.Response
     res.Data = result
@@ -83,10 +83,10 @@ func Update{{.ClassName}}(c *gin.Context) {
 
 func Delete{{.ClassName}}(c *gin.Context) {
     var data models.{{.ClassName}}
-    id, err := utils.StringToInt64(c.Param("{{.PkJsonField}}"))
+    id, err := utils.StringToInt(c.Param("{{.PkJsonField}}"))
     data.UpdateBy = utils.GetUserIdStr(c)
     _, err = data.Delete(id)
-    pkg.AssertErr(err, "修改失败", 500)
+    pkg.HasError(err, "修改失败", 500)
 
     var res models.Response
     res.Msg = "删除成功"

template/model.go.template

@@ -9,16 +9,13 @@ import (
 type {{.ClassName}} struct {
 {{ range .Columns -}}
     {{$x := .Pk}}
-    // {{.ColumnComment}}
-    {{if ($x)}}{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" gorm:"column:{{.ColumnName}};primary_key"`{{else}}{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" gorm:"column:{{.ColumnName}};"`{{end}}
-{{ end -}}
+    {{if ($x)}}{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" gorm:"type:{{.ColumnType}};primary_key"`{{else}}{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" gorm:"type:{{.ColumnType}};"`{{end}} // {{.ColumnComment}}
+{{- end }}
 }
 
 // 创建{{.ClassName}}
 func (e *{{.ClassName}}) Create() ({{.ClassName}}, error) {
     var doc {{.ClassName}}
-    doc.IsDel = "0"
-    e.CreateTime = time.Now().String()
     result := orm.Eloquent.Table("{{.TableName}}").Create(&e)
     if result.Error != nil {
         err := result.Error
@@ -42,7 +39,7 @@ func (e *{{.ClassName}}) Get() ({{.ClassName}}, error) {
     {{ end -}}
     {{ end }}
 
-    if err := table.Where("is_del = 0").First(&doc).Error; err != nil {
+    if err := table.First(&doc).Error; err != nil {
         return doc, err
     }
     return doc, nil
@@ -64,21 +61,20 @@ func (e *{{.ClassName}}) GetPage(pageSize int, pageIndex int) ([]{{.ClassName}},
 
     // 数据权限控制
     dataPermission := new(DataPermission)
-    dataPermission.UserId, _ = utils.StringToInt64(e.DataScope)
+    dataPermission.UserId, _ = utils.StringToInt(e.DataScope)
     table = dataPermission.GetDataScope("{{.TableName}}", table)
 
     var count int32
-    table = table.Where("is_del = 0").Offset((pageIndex - 1) * pageSize).Limit(pageSize)
+    table = table.Offset((pageIndex - 1) * pageSize).Limit(pageSize)
     if err := table.Find(&doc).Error; err != nil {
         return nil, 0, err
     }
-    table.Where("is_del = 0").Count(&count)
+    table.Count(&count)
     return doc, count, nil
 }
 
 // 更新{{.ClassName}}
 func (e *{{.ClassName}}) Update(id int64) (update {{.ClassName}}, err error) {
-    e.UpdateTime = utils.GetCurrntTime()
     if err = orm.Eloquent.Table("{{.TableName}}").Where("{{.PkColumn}} = ?", id).First(&update).Error; err != nil {
         return
     }
@@ -93,11 +89,7 @@ func (e *{{.ClassName}}) Update(id int64) (update {{.ClassName}}, err error) {
 
 // 删除{{.ClassName}}
 func (e *{{.ClassName}}) Delete(id int64) (success bool, err error) {
-    var mp = map[string]string{}
-    mp["is_del"] = "1"
-    mp["update_time"] = utils.GetCurrntTime()
-    mp["update_by"] = e.UpdateBy
-    if err = orm.Eloquent.Table("{{.TableName}}").Where("{{.PkColumn}} = ?", id).Update(mp).Error; err != nil {
+    if err = orm.Eloquent.Table("{{.TableName}}").Where("{{.PkColumn}} = ?", id).Delete(&{{.ClassName}}{}).Error; err != nil {
         success = false
         return
     }