houyaf 3 سال پیش
والد
کامیت
1b08077353

+ 7 - 7
pkg/model/controller/model_controller.go

@@ -12,13 +12,13 @@ type ModelController struct {
 }
 
 func (c *ModelController) 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("POST", "/add", "Create")
-    b.Handle("PUT", "/update", "Update")
-    b.Handle("DELETE", "/{modelId:int64}", "DeleteByID")
+    b.Handle("GET",     "/",                        "GetList"   )
+    b.Handle("GET",     "/data",                    "GetTreeData")
+    b.Handle("GET",     "/page",                    "GetPage"   )
+    b.Handle("GET",     "/{modelId:int64}",         "GetById"   )
+    b.Handle("POST",    "/add",                     "Create"    )
+    b.Handle("PUT",     "/update",                  "Update"    )
+    b.Handle("DELETE",  "/{modelId:int64}",         "DeleteByID")
 }
 
 func (c *ModelController) GetList() *JsonResult {

+ 7 - 7
pkg/model/controller/model_object_attr_controller.go

@@ -12,13 +12,13 @@ type ModelObjectAttrController struct {
 }
 
 func (c *ModelObjectAttrController) 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", "/{modelId:int64}/{objectId:int64}", "GetListById")
-    b.Handle("POST", "/add", "Create")
-    b.Handle("PUT", "/update", "Update")
-    b.Handle("DELETE", "/{modelId:int64}/{objectId:int64}/{attrId:int64}", "DeleteByID")
+    b.Handle("GET",     "/",                                                "GetList")
+    b.Handle("GET",     "/page",                                            "GetPage")
+    b.Handle("GET",     "/{modelId:int64}/{objectId:int64}/{attrId:int64}", "GetById")
+    b.Handle("GET",     "/{modelId:int64}/{objectId:int64}",                "GetListById")
+    b.Handle("POST",    "/add",                                             "Create")
+    b.Handle("PUT",     "/update",                                          "Update")
+    b.Handle("DELETE",  "/{modelId:int64}/{objectId:int64}/{attrId:int64}", "DeleteByID")
 }
 
 func (c *ModelObjectAttrController) GetList() *JsonResult {

+ 13 - 13
pkg/model/controller/model_object_controller.go

@@ -12,18 +12,18 @@ type ModelObjectController struct {
 }
 
 func (c *ModelObjectController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET", "/", "GetList")
-    b.Handle("GET", "/page", "GetPage")
-    b.Handle("GET", "/{modelId:int64}/{objectId:int64}", "GetById")
-    b.Handle("GET", "/{modelId:int64}", "GetListById")
-    b.Handle("GET", "/select/{modelId:int64}/{targetBizId:int64}/{targetObjectId:int64}", "Select")
-    b.Handle("POST", "/add", "Create")
-    b.Handle("PUT", "/update", "Update")
-    b.Handle("DELETE", "/{modelId:int64}/{objectId:int64}", "DeleteByID")
+    b.Handle("GET",     "/",                                            "GetList"   )
+    b.Handle("GET",     "/page",                                        "GetPage"   )
+    b.Handle("GET",     "/{modelId:int64}/{objectId:int64}",            "GetById"   )
+    b.Handle("GET",     "/{modelId:int64}",                             "GetListById")
+    b.Handle("GET",     "/select/{modelId:int64}/{targetBizId:int64}/{targetObjectId:int64}", "Select")
+    b.Handle("POST",    "/add",                                         "Create")
+    b.Handle("PUT",     "/update",                                      "Update")
+    b.Handle("DELETE",  "/{modelId:int64}/{objectId:int64}",            "DeleteByID")
 }
 
 func (c *ModelObjectController) GetList() *JsonResult {
-    params := c.buildParams()
+    params  := c.buildParams()
     modelId := c.Ctx.URLParamInt64Default("modelId", 0)
     if modelId <= 0 {
         return ResultErr("参数不完整", nil)
@@ -56,7 +56,7 @@ func (c *ModelObjectController) Select(modelId, targetBizId, targetObjectId int6
 }
 
 func (c *ModelObjectController) GetPage() *JsonResult {
-    params := c.buildParams()
+    params  := c.buildParams()
     modelId := c.Ctx.URLParamInt64Default("modelId", 0)
     if modelId <= 0 {
         return ResultErr("参数不完整", nil)
@@ -116,9 +116,9 @@ func (c *ModelObjectController) DeleteByID(modelId, objectId int64) *JsonResult
     userId := c.GetCurUserId()
 
     m := make(map[string]interface{})
-    m["modelId"] = modelId
-    m["objectId"] = objectId
-    m["deletedBy"] = userId
+    m["modelId"]    = modelId
+    m["objectId"]   = objectId
+    m["deletedBy"]  = userId
     if err := c.Service.Delete(m); err != nil {
         return ResultErr(err.Error(), nil)
     } else {

+ 6 - 6
pkg/model/controller/model_object_oam_controller.go

@@ -12,12 +12,12 @@ type ModelObjectOAMController struct {
 }
 
 func (c *ModelObjectOAMController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET", "", "GetList")
-    b.Handle("GET", "/{modelId:int64}/{objectId:int64}/{oamId:int64}", "GetById")
-    b.Handle("GET", "/{modelId:int64}/{objectId:int64}", "GetListById")
-    b.Handle("POST", "/add", "Create")
-    b.Handle("PUT", "/update", "Update")
-    b.Handle("DELETE", "/{modelId:int64}/{objectId:int64}/{oamId:int64}", "DeleteByID")
+    b.Handle("GET",     "",                                                 "GetList"   )
+    b.Handle("GET",     "/{modelId:int64}/{objectId:int64}/{oamId:int64}",  "GetById"   )
+    b.Handle("GET",     "/{modelId:int64}/{objectId:int64}",                "GetListById")
+    b.Handle("POST",    "/add",                                             "Create"    )
+    b.Handle("PUT",     "/update",                                          "Update"    )
+    b.Handle("DELETE",  "/{modelId:int64}/{objectId:int64}/{oamId:int64}",  "DeleteByID")
 }
 
 func (c *ModelObjectOAMController) GetList() *JsonResult {

+ 7 - 7
pkg/repo/controller/repo_cat_controller.go

@@ -12,13 +12,13 @@ type RepoCatController struct {
 }
 
 func (c *RepoCatController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET", "/", "GetList")
-    b.Handle("GET", "/page", "GetPage")
-    b.Handle("GET", "/{repoTypeId:int64}", "GetListById")
-    b.Handle("GET", "/{repoTypeId:int64}/{repoCatId:int64}", "GetById")
-    b.Handle("POST", "/add", "Create")
-    b.Handle("PUT", "/update", "Update")
-    b.Handle("DELETE", "/{repoTypeId:int64}/{repoCatId:int64}", "DeleteByID")
+    b.Handle("GET",     "/",                                        "GetList")
+    b.Handle("GET",     "/page",                                    "GetPage")
+    b.Handle("GET",     "/{repoTypeId:int64}",                      "GetListById")
+    b.Handle("GET",     "/{repoTypeId:int64}/{repoCatId:int64}",    "GetById")
+    b.Handle("POST",    "/add",                                     "Create")
+    b.Handle("PUT",     "/update",                                  "Update")
+    b.Handle("DELETE",  "/{repoTypeId:int64}/{repoCatId:int64}",    "DeleteByID")
 }
 
 func (c *RepoCatController) GetList() *JsonResult {

+ 7 - 10
pkg/repo/controller/repo_controller.go

@@ -12,13 +12,13 @@ type RepoController struct {
 }
 
 func (c *RepoController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET", "/", "GetList")
-    b.Handle("GET", "/page", "GetPage")
-    b.Handle("GET", "/{repoTypeId:int64}/{repoId:int64}", "GetById")
-    b.Handle("GET", "/{repoTypeId:int64}", "GetListById")
-    b.Handle("POST", "/add", "Create")
-    b.Handle("PUT", "/update", "Update")
-    b.Handle("DELETE", "/{repoId:int64}", "DeleteByID")
+    b.Handle("GET",     "/",                                        "GetList")
+    b.Handle("GET",     "/page",                                    "GetPage")
+    b.Handle("GET",     "/{repoTypeId:int64}/{repoId:int64}",       "GetById")
+    b.Handle("GET",     "/{repoTypeId:int64}",                      "GetListById")
+    b.Handle("POST",    "/add",                                     "Create")
+    b.Handle("PUT",     "/update",                                  "Update")
+    b.Handle("DELETE",  "/{repoId:int64}",                          "DeleteByID")
 }
 
 func (c *RepoController) GetList() *JsonResult {
@@ -42,7 +42,6 @@ func (c *RepoController) GetPage() *JsonResult {
 }
 
 func (c *RepoController) GetListById(repoTypeId int64) *JsonResult {
-
     data, err := c.Service.GetListById(repoTypeId)
     if err != nil {
         return ResultErr(err.Error(), nil)
@@ -52,7 +51,6 @@ func (c *RepoController) GetListById(repoTypeId int64) *JsonResult {
 }
 
 func (c *RepoController) GetById(repoTypeId, repoId int64) *JsonResult {
-
     data, err := c.Service.GetById(repoTypeId, repoId)
     if err != nil {
         return ResultErr(err.Error(), nil)
@@ -79,7 +77,6 @@ func (c *RepoController) Create() *JsonResult {
 
 func (c *RepoController) Update() *JsonResult {
     userId := c.GetCurUserId()
-
     repo := datamodel.Repo{}
     if err := c.Ctx.ReadJSON(&repo); err != nil {
         return ResultErr("读取数据失败", nil)

+ 3 - 3
pkg/repo/controller/repo_db_controller.go

@@ -12,9 +12,9 @@ type RepoDBController struct {
 }
 
 func (c *RepoDBController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET", "/table/{objectCode:string}", "GetDataOfList")
-    b.Handle("GET", "/table/{objectCode:string}/page", "GetDataOfPage")
-    b.Handle("GET", "/table/{objectCode:string}/fields", "GetTableFields")
+    b.Handle("GET", "/table/{objectCode:string}",           "GetDataOfList")
+    b.Handle("GET", "/table/{objectCode:string}/page",      "GetDataOfPage")
+    b.Handle("GET", "/table/{objectCode:string}/fields",    "GetTableFields")
 
 }
 

+ 3 - 3
pkg/repo/controller/repo_object_controller.go

@@ -12,9 +12,9 @@ type RepoObjectController struct {
 }
 
 func (c *RepoObjectController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET", "/{repoId:int64}", "GetListById")
-    b.Handle("POST", "/add", "Create")
-    b.Handle("DELETE", "/{repoId:int64}/{modelId:int64}/{objectId:int64}", "DeleteByID")
+    b.Handle("GET",         "/{repoId:int64}",                                      "GetListById")
+    b.Handle("POST",        "/add",                                                 "Create"    )
+    b.Handle("DELETE",      "/{repoId:int64}/{modelId:int64}/{objectId:int64}",     "DeleteByID")
 }
 
 func (c *RepoObjectController) GetListById(repoId int64) *JsonResult {

+ 6 - 6
pkg/repo/controller/repo_type_controller.go

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