init

datamodels/api.go

@@ -11,9 +11,9 @@ type Api struct {
     ApiParams       string    `json:"apiParams"       xorm:"'api_params'    varchar(127)  comment('Param')     "`
     Status          int64     `json:"status"          xorm:"'status'        bigint        comment('Status')    "`
     ApiDesc         string    `json:"apiDesc"         xorm:"'api_desc'      varchar(50)   comment('描述')       "`
-    BizId           int64     `json:"bizId"           xorm:"'bizId'         bigint        comment('Biz Id')     "`
-    ObjectId        int64     `json:"objectId"        xorm:"'objectId'      bigint        comment('Object Id')  "`
-    OamId           int64     `json:"oamId"           xorm:"'oamId'         bigint        comment('Oam Id')     "`
+    BizId           int64     `json:"bizId"           xorm:"'biz_id'        bigint        comment('Biz Id')     "`
+    ObjectId        int64     `json:"objectId"        xorm:"'object_id'     bigint        comment('Object Id')  "`
+    OamId           int64     `json:"oamId"           xorm:"'oam_id'        bigint        comment('Oam Id')     "`
     CreatedBy       int64     `json:"createdBy"       xorm:"'created_by'"`
     CreatedAt       time.Time `json:"createdAt"       xorm:"'created_at'"`
     UpdatedBy       int64     `json:"updatedBy"       xorm:"'updated_by'"`

repositories/biz_object_oam_repo.go

@@ -21,8 +21,14 @@ func NewBizObjectOAMRepo(engine *xorm.Engine) *BizObjectOAMRepo {
 
 func (d *BizObjectOAMRepo) GetList(m map[string]interface{}) ([]viewmodels.BizObjectOAMInfo, error) {
     sqlSelect  := ` SELECT A.*                 `
-    sqlFrom    := ` FROM  ds_object_oam  AS A  `
+    sqlFrom    := ` FROM  biz_object_oam  AS A  `
     sqlWhere   := ` WHERE A.deleted_flag = 0   `
+    if bizId, ok := m["bizId"]; ok {
+        sqlWhere += fmt.Sprintf(" AND A.biz_id = %d ", bizId)
+    }
+    if objectId, ok := m["objectId"]; ok {
+        sqlWhere += fmt.Sprintf(" AND A.object_id = %d ", objectId)
+    }
     if keywords, ok := m["keywords"]; ok {
         sqlWhere += ` AND A.oam_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
     }

service/biz_service.go

@@ -29,7 +29,6 @@ func NewBizService() BizService {
     }
 }
 
-
 func (s *bizService) GetTreeData() ([]viewmodels.BizDataInfo, error) {
     bizArr, err1 := s.bizRepo.GetAll()
     if err1 != nil {

viewmodels/api_info.go

@@ -13,8 +13,10 @@ type ApiInfo struct {
     Status          int64     `json:"status"        xorm:"'status'          bigint         comment('Status')       "`
     ApiDesc         string    `json:"apiDesc"       xorm:"'api_desc'        varchar(50)    comment('描述')          "`
     BizId           int64     `json:"bizId"         xorm:"'biz_id'          bigint         comment('Biz Id')       "`
-    ObjectType      int64     `json:"objectType"    xorm:"'object_type'     bigint         comment('Object Type')  "`
+    BizTitle        string    `json:"bizTitle"      xorm:"'biz_title'       varchar(127)   comment('Biz Title')    "`
     ObjectId        int64     `json:"objectId"      xorm:"'object_id'       bigint         comment('Object Id')    "`
+    ObjectTitle     string    `json:"objectTitle"   xorm:"'object_title'    varchar(127)   comment('Object Title') "`
+    ObjectType      int64     `json:"objectType"    xorm:"'object_type'     bigint         comment('Object Type')  "`
     ObjectCode      string    `json:"objectCode"    xorm:"'object_code'     varchar(127)   comment('Object Code')  "`
     OamId           int64     `json:"oamId"         xorm:"'oam_id'          bigint         comment('Oam Id')       "`
     OamTitle        string    `json:"oamTitle"      xorm:"'oam_title'       varchar(127)   comment('OAMTitle')       "`

web/controllers/biz_object_oam_controller.go

@@ -12,11 +12,12 @@ type BizObjectOAMController struct {
 }
 
 func (c *BizObjectOAMController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",     "/",                                                "GetList"   )
-    b.Handle("GET",     "/{modelId:int64}/{objectId:int64}/{oamId:int64}",  "GetById"   )
-    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}",                "GetListById"   )
+    b.Handle("GET",     "/{modelId:int64}/{objectId:int64}/{oamId:int64}",  "GetById"       )
+    b.Handle("POST",    "/add",                                             "Create"        )
+    b.Handle("PUT",     "/update",                                          "Update"        )
+    b.Handle("DELETE",  "/{modelId:int64}/{objectId:int64}/{oamId:int64}", "DeleteByID"     )
 }
 
 func (c *BizObjectOAMController) GetList() *JsonResult {
@@ -29,6 +30,18 @@ func (c *BizObjectOAMController) GetList() *JsonResult {
     }
 }
 
+func (c *BizObjectOAMController) GetListById(bizId, objectId int64) *JsonResult {
+    params    := c.buildParams()
+    params["bizId"] = bizId
+    params["objectId"] = objectId
+    data, err := c.Service.GetList(params)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
 func (c *BizObjectOAMController) GetById(modelId, objectId, oamId int64) *JsonResult {
     data, err := c.Service.GetById(modelId, objectId, oamId)
     if err != nil {
@@ -41,13 +54,13 @@ func (c *BizObjectOAMController) GetById(modelId, objectId, oamId int64) *JsonRe
 func (c *BizObjectOAMController) Create() *JsonResult {
     userId := c.GetCurUserId()
     
-    attr   := datamodels.BizObjectOAM{}
-    if err := c.Ctx.ReadJSON(&attr); err != nil {
+    oam   := datamodels.BizObjectOAM{}
+    if err := c.Ctx.ReadJSON(&oam); err != nil {
         return ResultErr("读取数据失败", nil)
     }
     
-    attr.CreatedBy = userId
-    if err := c.Service.Create(&attr); err != nil {
+    oam.CreatedBy = userId
+    if err := c.Service.Create(&oam); err != nil {
         return ResultErr(err.Error(), nil)
     } else {
         return ResultOk("新增成功", nil)
@@ -57,13 +70,13 @@ func (c *BizObjectOAMController) Create() *JsonResult {
 func (c *BizObjectOAMController) Update() *JsonResult {
     userId := c.GetCurUserId()
     
-    attr   := datamodels.BizObjectOAM{}
-    if err := c.Ctx.ReadJSON(&attr); err != nil {
+    oam   := datamodels.BizObjectOAM{}
+    if err := c.Ctx.ReadJSON(&oam); err != nil {
         return ResultErr("读取数据失败", nil)
     }
     
-    attr.UpdatedBy = userId
-    if err := c.Service.Update(&attr); err != nil {
+    oam.UpdatedBy = userId
+    if err := c.Service.Update(&oam); err != nil {
         return ResultErr(err.Error(), nil)
     } else {
         return ResultOk("更新成功", nil)