|
@@ -6,21 +6,21 @@ import (
|
|
|
"xps/service"
|
|
"xps/service"
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
-type BizObjectRuleController struct {
|
|
|
|
|
|
|
+type BizObjectOAMRuleController struct {
|
|
|
Base
|
|
Base
|
|
|
- Service service.BizObjectRuleService
|
|
|
|
|
|
|
+ Service service.BizObjectOAMRuleService
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (c *BizObjectRuleController) BeforeActivation(b mvc.BeforeActivation) {
|
|
|
|
|
- b.Handle("GET", "/", "GetList" )
|
|
|
|
|
- b.Handle("GET", "/{bizId:int64}/{objectId:int64}", "GetListById" )
|
|
|
|
|
- b.Handle("GET", "/{roId:int64}", "GetById" )
|
|
|
|
|
- b.Handle("POST", "/add", "Create" )
|
|
|
|
|
- b.Handle("PUT", "/update", "Update" )
|
|
|
|
|
- b.Handle("DELETE", "/roId:int64}", "DeleteByID" )
|
|
|
|
|
|
|
+func (c *BizObjectOAMRuleController) BeforeActivation(b mvc.BeforeActivation) {
|
|
|
|
|
+ b.Handle("GET", "/", "GetList" )
|
|
|
|
|
+ b.Handle("GET", "/{bizId:int64}/{objectId:int64}/{oamId:int64}", "GetListById" )
|
|
|
|
|
+ b.Handle("GET", "/{bizId:int64}/{objectId:int64}/{oamId:int64}/{roId:int64}", "GetById" )
|
|
|
|
|
+ b.Handle("POST", "/add", "Create" )
|
|
|
|
|
+ b.Handle("PUT", "/update", "Update" )
|
|
|
|
|
+ b.Handle("DELETE", "/{bizId:int64}/{objectId:int64}/{oamId:int64}/{roId:int64}", "DeleteByID" )
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (c *BizObjectRuleController) GetList() *JsonResult {
|
|
|
|
|
|
|
+func (c *BizObjectOAMRuleController) GetList() *JsonResult {
|
|
|
params := c.buildParams()
|
|
params := c.buildParams()
|
|
|
data, err := c.Service.GetList(params)
|
|
data, err := c.Service.GetList(params)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -30,10 +30,11 @@ func (c *BizObjectRuleController) GetList() *JsonResult {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (c *BizObjectRuleController) GetListById(bizId, objectId int64) *JsonResult {
|
|
|
|
|
|
|
+func (c *BizObjectOAMRuleController) GetListById(bizId, objectId, oamId int64) *JsonResult {
|
|
|
params := c.buildParams()
|
|
params := c.buildParams()
|
|
|
params["bizId"] = bizId
|
|
params["bizId"] = bizId
|
|
|
params["objectId"] = objectId
|
|
params["objectId"] = objectId
|
|
|
|
|
+ params["oamId"] = oamId
|
|
|
data, err := c.Service.GetList(params)
|
|
data, err := c.Service.GetList(params)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return ResultErr(err.Error(), nil)
|
|
return ResultErr(err.Error(), nil)
|
|
@@ -42,8 +43,8 @@ func (c *BizObjectRuleController) GetListById(bizId, objectId int64) *JsonResult
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (c *BizObjectRuleController) GetById(roId int64) *JsonResult {
|
|
|
|
|
- data, err := c.Service.GetById(roId)
|
|
|
|
|
|
|
+func (c *BizObjectOAMRuleController) GetById(bizId, objectId, oamId, orId int64) *JsonResult {
|
|
|
|
|
+ data, err := c.Service.GetById(bizId, objectId, oamId, orId)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return ResultErr(err.Error(), nil)
|
|
return ResultErr(err.Error(), nil)
|
|
|
} else {
|
|
} else {
|
|
@@ -51,20 +52,20 @@ func (c *BizObjectRuleController) GetById(roId int64) *JsonResult {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (c *BizObjectRuleController) Create() *JsonResult {
|
|
|
|
|
- oam := datamodels.BizObjectRule{}
|
|
|
|
|
- if err := c.Ctx.ReadJSON(&oam); err != nil {
|
|
|
|
|
|
|
+func (c *BizObjectOAMRuleController) Create() *JsonResult {
|
|
|
|
|
+ bor := datamodels.BizObjectRule{}
|
|
|
|
|
+ if err := c.Ctx.ReadJSON(&bor); err != nil {
|
|
|
return ResultErr("读取数据失败", nil)
|
|
return ResultErr("读取数据失败", nil)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if err := c.Service.Create(&oam); err != nil {
|
|
|
|
|
|
|
+ if err := c.Service.Create(&bor); err != nil {
|
|
|
return ResultErr(err.Error(), nil)
|
|
return ResultErr(err.Error(), nil)
|
|
|
} else {
|
|
} else {
|
|
|
return ResultOk("新增成功", nil)
|
|
return ResultOk("新增成功", nil)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (c *BizObjectRuleController) Update() *JsonResult {
|
|
|
|
|
|
|
+func (c *BizObjectOAMRuleController) Update() *JsonResult {
|
|
|
ro := datamodels.BizObjectRule{}
|
|
ro := datamodels.BizObjectRule{}
|
|
|
if err := c.Ctx.ReadJSON(&ro); err != nil {
|
|
if err := c.Ctx.ReadJSON(&ro); err != nil {
|
|
|
return ResultErr("读取数据失败", nil)
|
|
return ResultErr("读取数据失败", nil)
|
|
@@ -77,9 +78,12 @@ func (c *BizObjectRuleController) Update() *JsonResult {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (c *BizObjectRuleController) DeleteByID(roId int64) *JsonResult {
|
|
|
|
|
|
|
+func (c *BizObjectOAMRuleController) DeleteByID(bizId, objectId, oamId, orId int64) *JsonResult {
|
|
|
m := make(map[string]interface{})
|
|
m := make(map[string]interface{})
|
|
|
- m["roId"] = roId
|
|
|
|
|
|
|
+ m["bizId"] = bizId
|
|
|
|
|
+ m["objectId"] = objectId
|
|
|
|
|
+ m["oamId"] = oamId
|
|
|
|
|
+ m["orId"] = orId
|
|
|
if err := c.Service.Delete(m); err != nil {
|
|
if err := c.Service.Delete(m); err != nil {
|
|
|
return ResultErr(err.Error(), nil)
|
|
return ResultErr(err.Error(), nil)
|
|
|
} else {
|
|
} else {
|