houyaf hace 3 años
padre
commit
dae19a5a08

+ 3 - 3
service/biz_object_attr_service.go

@@ -10,7 +10,7 @@ import (
 type BizObjectAttrService interface {
     GetList(m map[string]interface{}) ([]viewmodels.BizObjectAttrInfo, error)
     GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
-    GetById(modelId, objectId, attrId int64) (*viewmodels.BizObjectAttrInfo, error)
+    GetById(bizId, objectId, attrId int64) (*viewmodels.BizObjectAttrInfo, error)
     Create(d *datamodels.BizObjectAttr) error
     Update(d *datamodels.BizObjectAttr) error
     Delete(m map[string]interface{}) error
@@ -34,8 +34,8 @@ func (s *bizObjectAttrService) GetPage(m map[string]interface{}) (*viewmodels.Pa
     return s.repo.GetPage(m)
 }
 
-func (s *bizObjectAttrService) GetById(modelId, objectId, attrId int64) (*viewmodels.BizObjectAttrInfo, error) {
-    return s.repo.GetById(modelId, objectId, attrId)
+func (s *bizObjectAttrService) GetById(bizId, objectId, attrId int64) (*viewmodels.BizObjectAttrInfo, error) {
+    return s.repo.GetById(bizId, objectId, attrId)
 }
 
 func (s *bizObjectAttrService) Create(attr *datamodels.BizObjectAttr) error {

+ 14 - 15
web/controllers/biz_controller.go

@@ -15,10 +15,10 @@ func (c *BizController) BeforeActivation(b mvc.BeforeActivation) {
     b.Handle("GET",         "/",                    "GetList"     )
     b.Handle("GET",         "/data",                "GetTreeData" )
     b.Handle("GET",         "/page",                "GetPage"     )
-    b.Handle("GET",         "/{modelId:int64}",     "GetById"     )
+    b.Handle("GET",         "/{bizId:int64}",       "GetById"     )
     b.Handle("POST",        "/add",                 "Create"      )
     b.Handle("PUT",         "/update",              "Update"      )
-    b.Handle("DELETE",      "/{modelId:int64}",     "DeleteByID"  )
+    b.Handle("DELETE",      "/{bizId:int64}",       "DeleteByID"  )
 }
 
 func (c *BizController) GetList() *JsonResult {
@@ -50,9 +50,9 @@ func (c *BizController) GetPage() *JsonResult {
     }
 }
 
-func (c *BizController) GetById(modelId int64)*JsonResult {
+func (c *BizController) GetById(bizId int64)*JsonResult {
     
-    data, err := c.Service.GetById(modelId)
+    data, err := c.Service.GetById(bizId)
     if err != nil {
         return ResultErr(err.Error(), nil)
     } else {
@@ -63,14 +63,13 @@ func (c *BizController) GetById(modelId int64)*JsonResult {
 func (c *BizController) Create()*JsonResult {
     userId := c.GetCurUserId()
     
-    mod := datamodels.Biz{}
-    mod.CreatedBy = userId
-    if err := c.Ctx.ReadJSON(&mod); err != nil {
+    biz := datamodels.Biz{}
+    biz.CreatedBy = userId
+    if err := c.Ctx.ReadJSON(&biz); err != nil {
         return ResultErr("读取数据失败", nil)
     }
     
-    
-    if err := c.Service.Create(&mod); err != nil {
+    if err := c.Service.Create(&biz); err != nil {
         return ResultErr(err.Error(), nil)
     } else {
         return ResultOk("新增成功", nil)
@@ -80,24 +79,24 @@ func (c *BizController) Create()*JsonResult {
 func (c *BizController) Update()*JsonResult {
     userId := c.GetCurUserId()
     
-    mod  := datamodels.Biz{}
-    if err := c.Ctx.ReadJSON(&mod); err != nil {
+    biz  := datamodels.Biz{}
+    if err := c.Ctx.ReadJSON(&biz); err != nil {
         return ResultErr("读取数据失败", nil)
     }
     
-    mod.UpdatedBy = userId
-    if err := c.Service.Update(&mod); err != nil {
+    biz.UpdatedBy = userId
+    if err := c.Service.Update(&biz); err != nil {
         return ResultErr(err.Error(), nil)
     } else {
         return ResultOk("更新成功", nil)
     }
 }
 
-func (c *BizController) DeleteByID(modelId int64)*JsonResult {
+func (c *BizController) DeleteByID(bizId int64)*JsonResult {
     userId := c.GetCurUserId()
     
     m := make(map[string]interface{})
-    m["modelId"]   = modelId
+    m["bizId"]   = bizId
     m["deletedBy"] = userId
     if err := c.Service.Delete(m); err != nil {
         return ResultErr(err.Error(), nil)

+ 6 - 6
web/controllers/biz_object_attr_controller.go

@@ -14,10 +14,10 @@ type BizObjectAttrController struct {
 func (c *BizObjectAttrController) BeforeActivation(b mvc.BeforeActivation) {
     b.Handle("GET",     "/",                                                "GetList"   )
     b.Handle("GET",     "/page",                                            "GetPage"   )
-    b.Handle("GET",     "/{modelId:int64}/{objectId:int64}/{attrId:int64}", "GetById"   )
+    b.Handle("GET",     "/{bizId:int64}/{objectId:int64}/{attrId:int64}",   "GetById"   )
     b.Handle("POST",    "/add",                                             "Create"    )
     b.Handle("PUT",     "/update",                                          "Update"    )
-    b.Handle("DELETE",  "/{modelId:int64}/{objectId:int64}/{attrId:int64}", "DeleteByID")
+    b.Handle("DELETE",  "/{bizId:int64}/{objectId:int64}/{attrId:int64}",   "DeleteByID")
 }
 
 func (c *BizObjectAttrController) GetList() *JsonResult {
@@ -40,8 +40,8 @@ func (c *BizObjectAttrController) GetPage() *JsonResult {
     }
 }
 
-func (c *BizObjectAttrController) GetById(modelId, objectId, attrId int64) *JsonResult {
-    data, err := c.Service.GetById(modelId, objectId, attrId)
+func (c *BizObjectAttrController) GetById(bizId, objectId, attrId int64) *JsonResult {
+    data, err := c.Service.GetById(bizId, objectId, attrId)
     if err != nil {
         return ResultErr(err.Error(), nil)
     } else {
@@ -81,11 +81,11 @@ func (c *BizObjectAttrController) Update() *JsonResult {
     }
 }
 
-func (c *BizObjectAttrController) DeleteByID(modelId, objectId, attrId int64) *JsonResult {
+func (c *BizObjectAttrController) DeleteByID(bizId, objectId, attrId int64) *JsonResult {
     userId := c.GetCurUserId()
     
     m := make(map[string]interface{})
-    m["modelId"]   = modelId
+    m["bizId"]     = bizId
     m["objectId"]  = objectId
     m["attrId"]    = attrId
     m["deletedBy"] = userId

+ 2 - 2
web/controllers/biz_object_controller.go

@@ -14,10 +14,10 @@ type BizObjectController struct {
 func (c *BizObjectController) BeforeActivation(b mvc.BeforeActivation) {
     b.Handle("GET",         "/",                                 "GetList"   )
     b.Handle("GET",         "/page",                             "GetPage"   )
-    b.Handle("GET",         "/{modelId:int64}/{objectId:int64}", "GetById"   )
+    b.Handle("GET",         "/{bizId:int64}/{objectId:int64}",   "GetById"   )
     b.Handle("POST",        "/add",                              "Create"    )
     b.Handle("PUT",         "/update",                           "Update"    )
-    b.Handle("DELETE",      "/{modelId:int64}/{objectId:int64}", "DeleteByID")
+    b.Handle("DELETE",      "/{bizId:int64}/{objectId:int64}",   "DeleteByID")
 }
 
 func (c *BizObjectController) GetList() *JsonResult {