houyaf 3 vuotta sitten
vanhempi
commit
3cd31ec21b

+ 30 - 0
datamodels/biz_object_oam.go

@@ -0,0 +1,30 @@
+package datamodels
+
+import "time"
+
+type BizObjectOAM struct {
+    BizId        int64     `json:"bizId"           xorm:"'biz_id'          bigint      pk comment('主键ID')        "`
+    ObjectId     int64     `json:"objectId"        xorm:"'object_id'       bigint      pk comment('Object ID')      "`
+    OamId        int64     `json:"oamId"           xorm:"'oam_id'          bigint      pk comment('OAM ID')         "`
+    OamTitle     string    `json:"oamTitle"        xorm:"'oam_title'       varchar(127)   comment('OAMTitle')       "`
+    OamCode      string    `json:"oamCode"         xorm:"'oam_code'        varchar(127)   comment('OAMCode')        "`
+    OamType      int64     `json:"oamType"         xorm:"'oam_type'        bigint         comment('Oam Type')       "`
+    SqlType      int64     `json:"sqlType"         xorm:"'sql_type'        bigint         comment('Sql Type')       "`
+    SqlStatement string    `json:"sqlStatement"    xorm:"'sql_statement'   varchar(1023)  comment('Statement')      "`
+    SqlSelect    string    `json:"sqlSelect"       xorm:"'sql_select'      varchar(1023)  comment('Statement')      "`
+    SqlFrom      string    `json:"sqlFrom"         xorm:"'sql_from'        varchar(1023)  comment('Statement')      "`
+    SqlWhere     string    `json:"sqlWhere"        xorm:"'sql_where'       varchar(1023)  comment('Statement')      "`
+    SqlOrder     string    `json:"sqlOrder"        xorm:"'sql_order'       varchar(1023)  comment('Statement')      "`
+    OamDesc      string    `json:"oamDesc"         xorm:"'oam_desc'        varchar(1023)  comment('描述')            "`
+    CreatedBy    int64     `json:"createdBy"       xorm:"'created_by'"`
+    CreatedAt    time.Time `json:"createdAt"       xorm:"'created_at'"`
+    UpdatedBy    int64     `json:"updatedBy"       xorm:"'updated_by'"`
+    UpdatedAt    time.Time `json:"updatedAt"       xorm:"'updated_at'"`
+    DeletedFlag  int64     `json:"deletedFlag"     xorm:"'deleted_flag'"`
+    DeletedBy    int64     `json:"deletedBy"       xorm:"'deleted_by'"`
+    DeletedAt    time.Time `json:"deletedAt"       xorm:"'deleted_at'"`
+}
+
+func (t *BizObjectOAM) TableName() string {
+    return "biz_object_oam"
+}

+ 12 - 12
repositories/api_log_repo.go

@@ -21,12 +21,12 @@ func (d *ApiLogRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
     limit := m["limit"].(int)
     page  := m["page"].(int)
     
-    sqlSelect := ` SELECT A.*,
-                          B.app_title,
-                          C.api_title `
-    sqlFrom   := ` FROM       ps_api_req   AS A
-                   LEFT  JOIN app          AS B ON (A.app_id = B.app_id)
-                   LEFT  JOIN ps_api       AS C ON (A.api_id = C.api_id)`
+    sqlSelect := ` SELECT    A.*,
+                             B.app_title,
+                             C.api_title     `
+    sqlFrom   := ` FROM       api_log   AS A
+                   LEFT  JOIN app       AS B ON (A.app_id = B.app_id)
+                   LEFT  JOIN api       AS C ON (A.api_id = C.api_id)`
     sqlWhere  := ` WHERE 1 = 1  `
     
     if apiId, ok := m["apiId"]; ok {
@@ -66,12 +66,12 @@ func (d *ApiLogRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
 }
 
 func (d *ApiLogRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiLogInfo, error) {
-    sqlSelect := ` SELECT A.*,
-                          B.app_title,
-                          C.api_title `
-    sqlFrom   := ` FROM       ps_api_req   AS A
-                   LEFT  JOIN app          AS B ON (A.app_id = B.app_id)
-                   LEFT  JOIN ps_api       AS C ON (A.api_id = C.api_id)`
+    sqlSelect := ` SELECT   A.*,
+                            B.app_title,
+                            C.api_title      `
+    sqlFrom   := ` FROM       api_log   AS A
+                   LEFT  JOIN app       AS B ON (A.app_id = B.app_id)
+                   LEFT  JOIN api       AS C ON (A.api_id = C.api_id)`
     sqlWhere  := ` WHERE 1 = 1  `
     
     

+ 3 - 3
repositories/api_module_repo.go

@@ -23,7 +23,7 @@ func (d *ModuleRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
     page      := m["page"].(int)
     
     sqlSelect := ` SELECT A.*                `
-    sqlFrom   := ` FROM   ps_module   AS A   `
+    sqlFrom   := ` FROM   api_module   AS A   `
     sqlWhere  := ` WHERE A.deleted_flag = 0  `
     
     if keywords, ok := m["keywords"]; ok {
@@ -56,7 +56,7 @@ func (d *ModuleRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
 
 func (d *ModuleRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiModuleInfo, error) {
     sqlSelect := ` SELECT A.*                `
-    sqlFrom   := ` FROM  ps_module   AS A    `
+    sqlFrom   := ` FROM  api_module   AS A    `
     sqlWhere  := ` WHERE A.deleted_flag = 0  `
     if keywords, ok := m["keywords"]; ok {
         sqlWhere += ` AND A.module_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
@@ -74,7 +74,7 @@ func (d *ModuleRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiModuleIn
 
 func (d *ModuleRepo) GetById(moduleId int64) (*viewmodels.ApiModuleInfo, error) {
     sqlSelect := ` SELECT A.*                `
-    sqlFrom   := ` FROM  ps_module   AS A    `
+    sqlFrom   := ` FROM  api_module   AS A    `
     sqlWhere  := ` WHERE A.deleted_flag = 0  `
     sqlWhere  += fmt.Sprintf(" AND A.module_id = %d", moduleId)
     

+ 9 - 9
repositories/api_repo.go

@@ -24,8 +24,8 @@ func (d *ApiRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, err
     
     sqlSelect := ` SELECT    A.*,
                              B.module_title  `
-    sqlFrom   := ` FROM      ps_api    AS A
-                   LEFT JOIN ps_module AS B ON (A.module_id = B.module_id) `
+    sqlFrom   := ` FROM      api        AS A
+                   LEFT JOIN api_module AS B ON (A.module_id = B.module_id) `
     sqlWhere  := ` WHERE  A.deleted_flag = 0  `
     if keywords, ok := m["keywords"]; ok {
         sqlWhere += ` AND A.api_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
@@ -60,8 +60,8 @@ func (d *ApiRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiInfo, error
     
     sqlSelect := ` SELECT    A.*,
                              B.module_title  `
-    sqlFrom   := ` FROM      ps_api    AS A
-                   LEFT JOIN ps_module AS B ON (A.module_id = B.module_id) `
+    sqlFrom   := ` FROM      api        AS A
+                   LEFT JOIN api_module AS B ON (A.module_id = B.module_id) `
     sqlWhere  := ` WHERE  A.deleted_flag = 0 `
     sqlWhere  += fmt.Sprintf(" AND A.module_id = %d", moduleId)
     
@@ -83,8 +83,8 @@ func (d *ApiRepo) GetAll() ([]viewmodels.ApiInfo, error) {
     
     sqlSelect  := ` SELECT    A.*,
                               B.module_title  `
-    sqlFrom    := ` FROM      ps_api    AS A
-                    LEFT JOIN ps_module AS B ON (A.module_id = B.module_id) `
+    sqlFrom    := ` FROM      api        AS A
+                    LEFT JOIN api_module AS B ON (A.module_id = B.module_id) `
     sqlWhere   := ` WHERE  A.deleted_flag = 0 `
     sqlOrderBy := " ORDER BY A.module_id, A.api_id ASC "
     datalist := make([]viewmodels.ApiInfo, 0)
@@ -99,8 +99,8 @@ func (d *ApiRepo) GetAll() ([]viewmodels.ApiInfo, error) {
 func (d *ApiRepo) GetById(moduleId, apiId int64) (*viewmodels.ApiInfo, error) {
     sqlSelect := ` SELECT    A.*,
                              B.module_title  `
-    sqlFrom   := ` FROM      ps_api    AS A
-                   LEFT JOIN ps_module AS B ON (A.module_id = B.module_id) `
+    sqlFrom   := ` FROM      api        AS A
+                   LEFT JOIN api_module AS B ON (A.module_id = B.module_id) `
     sqlWhere  := ` WHERE  A.deleted_flag = 0 `
     sqlWhere  += fmt.Sprintf(" AND A.module_id = %d", moduleId)
     sqlWhere  += fmt.Sprintf(" AND A.api_id = %d", apiId)
@@ -145,7 +145,7 @@ func (d *ApiRepo) Update(data *datamodels.Api) error {
 }
 
 func (d *ApiRepo) Delete(m map[string]interface{}) error {
-    moduleId     := m["moduleId"].(int64)
+    moduleId  := m["moduleId"].(int64)
     apiId     := m["apiId"].(int64)
     deletedBy := m["deletedBy"].(int64)
     

+ 100 - 0
repositories/biz_object_oam_repo.go

@@ -0,0 +1,100 @@
+package repositories
+
+
+import (
+    "fmt"
+    "time"
+    "xorm.io/xorm"
+    "xps/datamodels"
+    "xps/viewmodels"
+)
+
+type BizObjectOAMRepo struct {
+    engine *xorm.Engine
+}
+
+func NewBizObjectOAMRepo(engine *xorm.Engine) *BizObjectOAMRepo {
+    return &BizObjectOAMRepo{
+        engine: engine,
+    }
+}
+
+func (d *BizObjectOAMRepo) GetList(m map[string]interface{}) ([]viewmodels.BizObjectOAMInfo, error) {
+    sqlSelect  := ` SELECT A.*                 `
+    sqlFrom    := ` FROM  ds_object_oam  AS A  `
+    sqlWhere   := ` WHERE A.deleted_flag = 0   `
+    if keywords, ok := m["keywords"]; ok {
+        sqlWhere += ` AND A.oam_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
+    }
+    sqlOrderBy := " ORDER BY A.oam_id ASC "
+    
+    datalist   := make([]viewmodels.BizObjectOAMInfo, 0)
+    err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
+    if err != nil {
+        return nil, err
+    } else {
+        return datalist, nil
+    }
+}
+
+func (d *BizObjectOAMRepo) GetById(modelId, objectId, oamId int64) (*viewmodels.BizObjectOAMInfo, error) {
+    data    := &viewmodels.BizObjectOAMInfo{}
+    ok, err := d.engine.
+        Where("model_id = ?", modelId).
+        Where("object_id = ?", objectId).
+        Where("oam_id = ?", oamId).
+        Get(data)
+    if !ok && err == nil {
+        return nil, err
+    } else {
+        return data, nil
+    }
+}
+
+func (d *BizObjectOAMRepo) Create(data *datamodels.BizObjectOAM) error {
+    data.CreatedAt = time.Now()
+    _, err := d.engine.Insert(data)
+    return err
+}
+
+func (d *BizObjectOAMRepo) Update(data *datamodels.BizObjectOAM) error {
+    modelId   := data.BizId
+    objectId  := data.ObjectId
+    oamId     := data.OamId
+    data.UpdatedAt = time.Now()
+    _, err := d.engine.
+        Where("model_id = ?", modelId).
+        Where("object_id = ?", objectId).
+        Where("oam_id = ?", oamId).
+        AllCols().
+        Update(data)
+    return err
+}
+
+func (d *BizObjectOAMRepo) Delete(m map[string]interface{}) error {
+    modelId   := m["modelId"].(int64)
+    objectId  := m["objectId"].(int64)
+    oamId     := m["oamId"].(int64)
+    deletedBy := m["deletedBy"].(int64)
+    
+    data := &datamodels.BizObjectOAM{}
+    data.DeletedFlag = 1
+    data.DeletedBy   = deletedBy
+    data.DeletedAt   = time.Now()
+    _, err := d.engine.
+        Where("model_id = ?", modelId).
+        Where("object_id = ?", objectId).
+        Where("oam_id = ?", oamId).
+        Delete(data)
+    return err
+}
+
+func (d *BizObjectOAMRepo) DeleteByObjectId(modelId, objectId, oamId int64) error {
+    data := &datamodels.BizObjectOAM{}
+    _, err := d.engine.
+        Where("model_id = ?", modelId).
+        Where("object_id = ?", objectId).
+        Where("oam_id = ?", oamId).
+        Delete(data)
+    return err
+}

+ 107 - 0
repositories/biz_rule_repo.go

@@ -0,0 +1,107 @@
+package repositories
+
+import (
+    "fmt"
+    "time"
+    "xorm.io/xorm"
+    "xps/datamodels"
+    "xps/viewmodels"
+)
+
+type BizRuleRepo struct {
+    engine *xorm.Engine
+}
+
+func NewBizRuleRepo(engine *xorm.Engine) *BizRuleRepo {
+    return &BizRuleRepo{
+        engine: engine,
+    }
+}
+
+func (d *BizRuleRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+    limit     := m["limit"].(int)
+    page      := m["page"].(int)
+    
+    sqlSelect := ` SELECT A.*                `
+    sqlFrom   := ` FROM   biz_rule   AS A    `
+    sqlWhere  := ` WHERE  A.deleted_flag = 0 `
+    if keywords, ok := m["keywords"]; ok {
+        sqlWhere += ` AND A.rule_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
+    }
+    
+    sqlCount  := ` SELECT COUNT(*)           `
+    total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(datamodels.BizRule))
+    if err1 != nil {
+        return nil, err1
+    }
+    
+    sqlOrderBy := " ORDER BY A.rule_id ASC "
+    pageStart  := (page - 1) * limit
+    sqlLimit   := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
+    
+    datalist   := make([]datamodels.BizRule, 0)
+    err2 := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy + sqlLimit).Find(&datalist)
+    if err2 != nil {
+        return nil, err2
+    }
+    
+    pageResult := &viewmodels.PageResult{}
+    pageResult.Data     = datalist
+    pageResult.Total    = total
+    pageResult.PageSize = limit
+    pageResult.Page     = page
+    return pageResult, nil
+}
+
+func (d *BizRuleRepo) GetList(m map[string]interface{}) ([]viewmodels.BizRuleInfo, error) {
+    sqlSelect := ` SELECT A.*               `
+    sqlFrom   := ` FROM  biz_rule   AS A    `
+    sqlWhere  := ` WHERE A.deleted_flag = 0 `
+    if keywords, ok := m["keywords"]; ok {
+        sqlWhere += ` AND A.rule_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
+    }
+    
+    sqlOrderBy := " ORDER BY A.rule_id ASC "
+    datalist   := make([]viewmodels.BizRuleInfo, 0)
+    err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
+    if err != nil {
+        return nil, err
+    }
+    return datalist, nil
+}
+
+func (d *BizRuleRepo) GetById(ruleId int64) (*viewmodels.BizRuleInfo, error) {
+    data := &viewmodels.BizRuleInfo{}
+    ok, err := d.engine.Where("rule_id = ?", ruleId).Get(data)
+    if !ok && err == nil {
+        return nil, err
+    } else {
+        return data, nil
+    }
+}
+
+func (d *BizRuleRepo) Create(data *datamodels.BizRule) error {
+    data.CreatedAt = time.Now()
+    _, err := d.engine.Insert(data)
+    return err
+}
+
+func (d *BizRuleRepo) Update(data *datamodels.BizRule) error {
+    ruleId := data.RuleId
+    
+    data.UpdatedAt = time.Now()
+    _, err := d.engine.Where("rule_id = ?", ruleId).Update(data)
+    return err
+}
+
+func (d *BizRuleRepo) Delete(m map[string]interface{}) error {
+    ruleId    := m["ruleId"].(int64)
+    deletedBy := m["deletedBy"].(int64)
+    
+    data := &datamodels.BizRule{}
+    data.DeletedFlag = 1
+    data.DeletedBy   = deletedBy
+    data.DeletedAt   = time.Now()
+    _, err := d.engine.Where("rule_id = ?", ruleId).Update(data)
+    return err
+}

+ 1 - 1
repositories/model_object_oam_repo.go

@@ -12,7 +12,7 @@ type ModelObjectOAMRepo struct {
     engine *xorm.Engine
 }
 
-func NewObjectOAMRepo(engine *xorm.Engine) *ModelObjectOAMRepo {
+func NewModelObjectOAMRepo(engine *xorm.Engine) *ModelObjectOAMRepo {
     return &ModelObjectOAMRepo{
         engine: engine,
     }

+ 0 - 0
service/biz_object_mapping_repo.go → service/biz_object_mapping_service.go


+ 47 - 0
service/biz_object_oam_service.go

@@ -0,0 +1,47 @@
+package service
+
+import (
+    "xps/datamodels"
+    "xps/datasource"
+    "xps/repositories"
+    "xps/viewmodels"
+)
+
+type BizObjectOAMService interface {
+    GetList(m map[string]interface{}) ([]viewmodels.BizObjectOAMInfo, error)
+    GetById(bizId, objectId, attrId int64) (*viewmodels.BizObjectOAMInfo, error)
+    Create(d *datamodels.BizObjectOAM) error
+    Update(d *datamodels.BizObjectOAM) error
+    Delete(m map[string]interface{}) error
+}
+
+type bizObjectOAMService struct {
+    repo *repositories.BizObjectOAMRepo
+}
+
+func NewBizObjectOAMService() BizObjectOAMService {
+    return &bizObjectOAMService{
+        repo: repositories.NewBizObjectOAMRepo(datasource.InstanceMaster()),
+    }
+}
+
+func (s *bizObjectOAMService) GetList(m map[string]interface{}) ([]viewmodels.BizObjectOAMInfo, error) {
+    return s.repo.GetList(m)
+}
+
+func (s *bizObjectOAMService) GetById(modelId, objectId, attrId int64) (*viewmodels.BizObjectOAMInfo, error) {
+    return s.repo.GetById(modelId, objectId, attrId)
+}
+
+func (s *bizObjectOAMService) Create(ObjectOAM *datamodels.BizObjectOAM) error {
+    ObjectOAM.OamId = NewID()
+    return s.repo.Create(ObjectOAM)
+}
+
+func (s *bizObjectOAMService) Update(ObjectOAM *datamodels.BizObjectOAM) error {
+    return s.repo.Update(ObjectOAM)
+}
+
+func (s *bizObjectOAMService) Delete(m map[string]interface{}) error {
+    return s.repo.Delete(m)
+}

+ 0 - 0
service/biz_object_rule_repo.go → service/biz_object_rule_service.go


+ 52 - 0
service/biz_rule_service.go

@@ -0,0 +1,52 @@
+package service
+
+import (
+    "xps/datamodels"
+    "xps/datasource"
+    "xps/repositories"
+    "xps/viewmodels"
+)
+
+type BizRuleService interface {
+    GetList(m map[string]interface{}) ([]viewmodels.BizRuleInfo, error)
+    GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
+    GetById(ruleId int64) (*viewmodels.BizRuleInfo, error)
+    Create(d *datamodels.BizRule) error
+    Update(d *datamodels.BizRule) error
+    Delete(m map[string]interface{}) error
+}
+
+type bizRuleService struct {
+    repo *repositories.BizRuleRepo
+}
+
+func NewBizRuleService() BizRuleService {
+    return &bizRuleService{
+        repo: repositories.NewBizRuleRepo(datasource.InstanceMaster()),
+    }
+}
+
+func (s *bizRuleService) GetList(m map[string]interface{}) ([]viewmodels.BizRuleInfo, error) {
+    return s.repo.GetList(m)
+}
+
+func (s *bizRuleService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+    return s.repo.GetPage(m)
+}
+
+func (s *bizRuleService) GetById(ruleId int64) (*viewmodels.BizRuleInfo, error) {
+    return s.repo.GetById(ruleId)
+}
+
+func (s *bizRuleService) Create(m *datamodels.BizRule) error {
+    m.RuleId = NewID()
+    return s.repo.Create(m)
+}
+
+func (s *bizRuleService) Update(m *datamodels.BizRule) error {
+    return s.repo.Update(m)
+}
+
+func (s *bizRuleService) Delete(m map[string]interface{}) error {
+    return s.repo.Delete(m)
+}

+ 1 - 1
service/model_object_oam_service.go

@@ -21,7 +21,7 @@ type modelObjectOAMService struct {
 
 func NewModelObjectOAMService() ModelObjectOAMService {
     return &modelObjectOAMService{
-        repo: repositories.NewObjectOAMRepo(datasource.InstanceMaster()),
+        repo: repositories.NewModelObjectOAMRepo(datasource.InstanceMaster()),
     }
 }
 

+ 20 - 0
viewmodels/biz_object_oam_info.go

@@ -0,0 +1,20 @@
+package viewmodels
+
+type BizObjectOAMInfo struct {
+    BizId        int64     `json:"bizId"           xorm:"'biz_id'          bigint      pk comment('Biz ID')         "`
+    ObjectId     int64     `json:"objectId"        xorm:"'object_id'       bigint      pk comment('Object ID')      "`
+    OamId        int64     `json:"oamId"           xorm:"'oam_id'          bigint      pk comment('OAM ID')         "`
+    OamTitle     string    `json:"oamTitle"        xorm:"'oam_title'       varchar(127)   comment('OAMTitle')       "`
+    OamCode      string    `json:"oamCode"         xorm:"'oam_code'        varchar(127)   comment('OAMCode')        "`
+    OamType      int64     `json:"oamType"         xorm:"'oam_type'        bigint         comment('Type')           "`
+    SqlStatement string    `json:"sqlStatement"    xorm:"'sql_statement'   varchar(1023)  comment('Statement')      "`
+    SqlSelect    string    `json:"sqlSelect"       xorm:"'sql_select'      varchar(1023)  comment('Statement')      "`
+    SqlFrom      string    `json:"sqlFrom"         xorm:"'sql_from'        varchar(1023)  comment('Statement')      "`
+    SqlWhere     string    `json:"sqlWhere"        xorm:"'sql_where'       varchar(1023)  comment('Statement')      "`
+    SqlOrder     string    `json:"sqlOrder"        xorm:"'sql_order'       varchar(1023)  comment('Statement')      "`
+    OamDesc      string    `json:"oamDesc"         xorm:"'oam_desc'        varchar(1023)  comment('描述')            "`
+}
+
+func (t *BizObjectOAMInfo) TableName() string {
+    return "biz_object_oam"
+}

+ 8 - 8
web/controllers/api_module_controller.go

@@ -6,12 +6,12 @@ import (
     "xps/service"
 )
 
-type ModuleController struct {
+type ApiModuleController struct {
     Base
     Service service.ApiModuleService
 }
 
-func (c *ModuleController) BeforeActivation(b mvc.BeforeActivation) {
+func (c *ApiModuleController) BeforeActivation(b mvc.BeforeActivation) {
     b.Handle("GET",         "/",                        "GetList"   )
     b.Handle("GET",         "/page",                    "GetPage"   )
     b.Handle("GET",         "/{moduleId:int64}",        "GetById"   )
@@ -20,7 +20,7 @@ func (c *ModuleController) BeforeActivation(b mvc.BeforeActivation) {
     b.Handle("DELETE",      "/{moduleId:int64}",        "DeleteByID")
 }
 
-func (c *ModuleController) GetList() *JsonResult {
+func (c *ApiModuleController) GetList() *JsonResult {
     params    := c.buildParams()
     data, err := c.Service.GetList(params)
     if err != nil {
@@ -30,7 +30,7 @@ func (c *ModuleController) GetList() *JsonResult {
     }
 }
 
-func (c *ModuleController) GetPage() *JsonResult {
+func (c *ApiModuleController) GetPage() *JsonResult {
     params    := c.buildParams()
     data, err := c.Service.GetPage(params)
     if err != nil {
@@ -40,7 +40,7 @@ func (c *ModuleController) GetPage() *JsonResult {
     }
 }
 
-func (c *ModuleController) GetById(moduleId int64) *JsonResult {
+func (c *ApiModuleController) GetById(moduleId int64) *JsonResult {
     
     data, err := c.Service.GetById(moduleId)
     if err != nil {
@@ -50,7 +50,7 @@ func (c *ModuleController) GetById(moduleId int64) *JsonResult {
     }
 }
 
-func (c *ModuleController) Create() *JsonResult {
+func (c *ApiModuleController) Create() *JsonResult {
     userId := c.GetCurUserId()
     
     module := datamodels.ApiModule{}
@@ -66,7 +66,7 @@ func (c *ModuleController) Create() *JsonResult {
     }
 }
 
-func (c *ModuleController) Update() *JsonResult {
+func (c *ApiModuleController) Update() *JsonResult {
     userId := c.GetCurUserId()
     
     module := datamodels.ApiModule{}
@@ -82,7 +82,7 @@ func (c *ModuleController) Update() *JsonResult {
     }
 }
 
-func (c *ModuleController) DeleteByID(moduleId int64) *JsonResult {
+func (c *ApiModuleController) DeleteByID(moduleId int64) *JsonResult {
     userId := c.GetCurUserId()
     
     m := make(map[string]interface{})

+ 98 - 0
web/controllers/biz_controller.go

@@ -0,0 +1,98 @@
+package controllers
+
+import (
+    "github.com/kataras/iris/v12/mvc"
+    "xps/datamodels"
+    "xps/service"
+)
+
+type BizController struct {
+    Base
+    Service service.BizService
+}
+
+func (c *BizController) BeforeActivation(b mvc.BeforeActivation) {
+    b.Handle("GET",         "/",                "GetList"   )
+    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 *BizController) GetList() *JsonResult {
+    params    := c.buildParams()
+    data, err := c.Service.GetList(params)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *BizController) GetPage() *JsonResult {
+    params    := c.buildParams()
+    data, err := c.Service.GetPage(params)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *BizController) GetById(modelId int64) *JsonResult {
+    
+    data, err := c.Service.GetById(modelId)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *BizController) Create() *JsonResult {
+    userId := c.GetCurUserId()
+    
+    mod := datamodels.Biz{}
+    mod.CreatedBy = userId
+    if err := c.Ctx.ReadJSON(&mod); err != nil {
+        return ResultErr("读取数据失败", nil)
+    }
+    
+    
+    if err := c.Service.Create(&mod); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("新增成功", nil)
+    }
+}
+
+func (c *BizController) Update() *JsonResult {
+    userId := c.GetCurUserId()
+    
+    mod  := datamodels.Biz{}
+    if err := c.Ctx.ReadJSON(&mod); err != nil {
+        return ResultErr("读取数据失败", nil)
+    }
+    
+    mod.UpdatedBy = userId
+    if err := c.Service.Update(&mod); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("更新成功", nil)
+    }
+}
+
+func (c *BizController) DeleteByID(modelId int64) *JsonResult {
+    userId := c.GetCurUserId()
+    
+    m := make(map[string]interface{})
+    m["modelId"]   = modelId
+    m["deletedBy"] = userId
+    if err := c.Service.Delete(m); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("删除成功", nil)
+    }
+}
+

+ 97 - 0
web/controllers/biz_object_attr_controller.go

@@ -0,0 +1,97 @@
+package controllers
+
+import (
+    "github.com/kataras/iris/v12/mvc"
+    "xps/datamodels"
+    "xps/service"
+)
+
+type BizObjectAttrController struct {
+    Base
+    Service service.BizObjectAttrService
+}
+
+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("POST",    "/add",                                             "Create"    )
+    b.Handle("PUT",     "/update",                                          "Update"    )
+    b.Handle("DELETE",  "/{modelId:int64}/{objectId:int64}/{attrId:int64}", "DeleteByID")
+}
+
+func (c *BizObjectAttrController) GetList() *JsonResult {
+    params    := c.buildParams()
+    data, err := c.Service.GetList(params)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *BizObjectAttrController) GetPage() *JsonResult {
+    params    := c.buildParams()
+    data, err := c.Service.GetPage(params)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *BizObjectAttrController) GetById(modelId, objectId, attrId int64) *JsonResult {
+    data, err := c.Service.GetById(modelId, objectId, attrId)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *BizObjectAttrController) Create() *JsonResult {
+    userId := c.GetCurUserId()
+    
+    attr   := datamodels.BizObjectAttr{}
+    if err := c.Ctx.ReadJSON(&attr); err != nil {
+        return ResultErr("读取数据失败", nil)
+    }
+    
+    attr.CreatedBy = userId
+    if err := c.Service.Create(&attr); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("新增成功", nil)
+    }
+}
+
+func (c *BizObjectAttrController) Update() *JsonResult {
+    userId := c.GetCurUserId()
+    
+    attr   := datamodels.BizObjectAttr{}
+    if err := c.Ctx.ReadJSON(&attr); err != nil {
+        return ResultErr("读取数据失败", nil)
+    }
+    
+    attr.UpdatedBy = userId
+    if err := c.Service.Update(&attr); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("更新成功", nil)
+    }
+}
+
+func (c *BizObjectAttrController) DeleteByID(modelId, objectId, attrId int64) *JsonResult {
+    userId := c.GetCurUserId()
+    
+    m := make(map[string]interface{})
+    m["modelId"]   = modelId
+    m["objectId"]  = objectId
+    m["attrId"]    = attrId
+    m["deletedBy"] = userId
+    if err := c.Service.Delete(m); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("删除成功", nil)
+    }
+}

+ 107 - 0
web/controllers/biz_object_controller.go

@@ -0,0 +1,107 @@
+package controllers
+
+import (
+    "github.com/kataras/iris/v12/mvc"
+    "xps/service"
+    "xps/viewmodels"
+)
+
+type BizObjectController struct {
+    Base
+    Service service.BizObjectService
+}
+
+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("POST",        "/add",                              "Create"    )
+    b.Handle("PUT",         "/update",                           "Update"    )
+    b.Handle("DELETE",      "/{modelId:int64}/{objectId:int64}", "DeleteByID")
+}
+
+func (c *BizObjectController) GetList() *JsonResult {
+    params  := c.buildParams()
+    modelId := c.Ctx.URLParamInt64Default("modelId", 0)
+    if modelId <= 0 {
+        return ResultErr("参数不完整", nil)
+    }
+    params["modelId"] = modelId
+    data, err := c.Service.GetList(params)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *BizObjectController) GetPage() *JsonResult {
+    params  := c.buildParams()
+    modelId := c.Ctx.URLParamInt64Default("modelId", 0)
+    if modelId <= 0 {
+        return ResultErr("参数不完整", nil)
+    }
+    
+    params["modelId"] = modelId
+    data, err := c.Service.GetPage(params)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *BizObjectController) GetById(modelId, objectId int64) *JsonResult {
+    data, err := c.Service.GetObjectDataById(modelId, objectId)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *BizObjectController) Create() *JsonResult {
+    userId     := c.GetCurUserId()
+    
+    objectData := viewmodels.BizObjectData{}
+    if err := c.Ctx.ReadJSON(&objectData); err != nil {
+        return ResultErr("读取数据失败", nil)
+    }
+    
+    objectData.CreatedBy = userId
+    if err := c.Service.CreateObjectData(&objectData); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("新增成功", nil)
+    }
+}
+
+func (c *BizObjectController) Update() *JsonResult {
+    userId     := c.GetCurUserId()
+    
+    objectData := viewmodels.BizObjectData{}
+    if err := c.Ctx.ReadJSON(&objectData); err != nil {
+        return ResultErr("读取数据失败", nil)
+    }
+    
+    objectData.UpdatedBy = userId
+    if err := c.Service.UpdateObjectData(&objectData); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("更新成功", nil)
+    }
+}
+
+func (c *BizObjectController) DeleteByID(modelId, objectId int64) *JsonResult {
+    userId := c.GetCurUserId()
+    
+    m := make(map[string]interface{})
+    m["modelId"]   = modelId
+    m["objectId"]  = objectId
+    m["deletedBy"] = userId
+    if err := c.Service.Delete(m); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("删除成功", nil)
+    }
+}

+ 86 - 0
web/controllers/biz_object_oam_controller.go

@@ -0,0 +1,86 @@
+package controllers
+
+import (
+    "github.com/kataras/iris/v12/mvc"
+    "xps/datamodels"
+    "xps/service"
+)
+
+type BizObjectOAMController struct {
+    Base
+    Service service.BizObjectOAMService
+}
+
+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")
+}
+
+func (c *BizObjectOAMController) GetList() *JsonResult {
+    params    := c.buildParams()
+    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 {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *BizObjectOAMController) Create() *JsonResult {
+    userId := c.GetCurUserId()
+    
+    attr   := datamodels.BizObjectOAM{}
+    if err := c.Ctx.ReadJSON(&attr); err != nil {
+        return ResultErr("读取数据失败", nil)
+    }
+    
+    attr.CreatedBy = userId
+    if err := c.Service.Create(&attr); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("新增成功", nil)
+    }
+}
+
+func (c *BizObjectOAMController) Update() *JsonResult {
+    userId := c.GetCurUserId()
+    
+    attr   := datamodels.BizObjectOAM{}
+    if err := c.Ctx.ReadJSON(&attr); err != nil {
+        return ResultErr("读取数据失败", nil)
+    }
+    
+    attr.UpdatedBy = userId
+    if err := c.Service.Update(&attr); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("更新成功", nil)
+    }
+}
+
+func (c *BizObjectOAMController) DeleteByID(modelId, objectId, oamId int64) *JsonResult {
+    userId := c.GetCurUserId()
+    
+    m := make(map[string]interface{})
+    m["modelId"]   = modelId
+    m["objectId"]  = objectId
+    m["oamId"]     = oamId
+    m["deletedBy"] = userId
+    if err := c.Service.Delete(m); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("删除成功", nil)
+    }
+}

+ 98 - 0
web/controllers/biz_rule_controller.go

@@ -0,0 +1,98 @@
+package controllers
+
+import (
+    "github.com/kataras/iris/v12/mvc"
+    "xps/datamodels"
+    "xps/service"
+)
+
+type BizRuleController struct {
+    Base
+    Service service.BizRuleService
+}
+
+func (c *BizRuleController) BeforeActivation(b mvc.BeforeActivation) {
+    b.Handle("GET",         "/",                "GetList"   )
+    b.Handle("GET",         "/page",            "GetPage"   )
+    b.Handle("GET",         "/{ruleId:int64}",  "GetById"   )
+    b.Handle("POST",        "/add",             "Create"    )
+    b.Handle("PUT",         "/update",          "Update"    )
+    b.Handle("DELETE",      "/{ruleId:int64}",  "DeleteByID")
+}
+
+func (c *BizRuleController) GetList() *JsonResult {
+    params    := c.buildParams()
+    data, err := c.Service.GetList(params)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *BizRuleController) GetPage() *JsonResult {
+    params    := c.buildParams()
+    data, err := c.Service.GetPage(params)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *BizRuleController) GetById(ruleId int64) *JsonResult {
+    
+    data, err := c.Service.GetById(ruleId)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *BizRuleController) Create() *JsonResult {
+    userId := c.GetCurUserId()
+    
+    rule := datamodels.BizRule{}
+    rule.CreatedBy = userId
+    if err := c.Ctx.ReadJSON(&rule); err != nil {
+        return ResultErr("读取数据失败", nil)
+    }
+    
+    
+    if err := c.Service.Create(&rule); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("新增成功", nil)
+    }
+}
+
+func (c *BizRuleController) Update() *JsonResult {
+    userId := c.GetCurUserId()
+    
+    rule  := datamodels.BizRule{}
+    if err := c.Ctx.ReadJSON(&rule); err != nil {
+        return ResultErr("读取数据失败", nil)
+    }
+    
+    rule.UpdatedBy = userId
+    if err := c.Service.Update(&rule); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("更新成功", nil)
+    }
+}
+
+func (c *BizRuleController) DeleteByID(ruleId int64) *JsonResult {
+    userId := c.GetCurUserId()
+    
+    m := make(map[string]interface{})
+    m["ruleId"]    = ruleId
+    m["deletedBy"] = userId
+    if err := c.Service.Delete(m); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("删除成功", nil)
+    }
+}
+

+ 8 - 8
web/controllers/model_object_attr_controller.go

@@ -6,12 +6,12 @@ import (
     "xps/service"
 )
 
-type ObjectAttrController struct {
+type ModelObjectAttrController struct {
 	Base
 	Service service.ModelObjectAttrService
 }
 
-func (c *ObjectAttrController) BeforeActivation(b mvc.BeforeActivation) {
+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"   )
@@ -20,7 +20,7 @@ func (c *ObjectAttrController) BeforeActivation(b mvc.BeforeActivation) {
 	b.Handle("DELETE",  "/{modelId:int64}/{objectId:int64}/{attrId:int64}", "DeleteByID")
 }
 
-func (c *ObjectAttrController) GetList() *JsonResult {
+func (c *ModelObjectAttrController) GetList() *JsonResult {
 	params    := c.buildParams()
 	data, err := c.Service.GetList(params)
 	if err != nil {
@@ -30,7 +30,7 @@ func (c *ObjectAttrController) GetList() *JsonResult {
 	}
 }
 
-func (c *ObjectAttrController) GetPage() *JsonResult {
+func (c *ModelObjectAttrController) GetPage() *JsonResult {
 	params    := c.buildParams()
 	data, err := c.Service.GetPage(params)
 	if err != nil {
@@ -40,7 +40,7 @@ func (c *ObjectAttrController) GetPage() *JsonResult {
 	}
 }
 
-func (c *ObjectAttrController) GetById(modelId, objectId, attrId int64) *JsonResult {
+func (c *ModelObjectAttrController) GetById(modelId, objectId, attrId int64) *JsonResult {
 	data, err := c.Service.GetById(modelId, objectId, attrId)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
@@ -49,7 +49,7 @@ func (c *ObjectAttrController) GetById(modelId, objectId, attrId int64) *JsonRes
 	}
 }
 
-func (c *ObjectAttrController) Create() *JsonResult {
+func (c *ModelObjectAttrController) Create() *JsonResult {
 	userId := c.GetCurUserId()
 	
 	attr   := datamodels.ModelObjectAttr{}
@@ -65,7 +65,7 @@ func (c *ObjectAttrController) Create() *JsonResult {
 	}
 }
 
-func (c *ObjectAttrController) Update() *JsonResult {
+func (c *ModelObjectAttrController) Update() *JsonResult {
 	userId := c.GetCurUserId()
 	
 	attr   := datamodels.ModelObjectAttr{}
@@ -81,7 +81,7 @@ func (c *ObjectAttrController) Update() *JsonResult {
 	}
 }
 
-func (c *ObjectAttrController) DeleteByID(modelId, objectId, attrId int64) *JsonResult {
+func (c *ModelObjectAttrController) DeleteByID(modelId, objectId, attrId int64) *JsonResult {
 	userId := c.GetCurUserId()
 	
 	m := make(map[string]interface{})

+ 8 - 8
web/controllers/model_object_controller.go

@@ -6,12 +6,12 @@ import (
     "xps/viewmodels"
 )
 
-type ObjectController struct {
+type ModelObjectController struct {
 	Base
 	Service service.ModelObjectService
 }
 
-func (c *ObjectController) BeforeActivation(b mvc.BeforeActivation) {
+func (c *ModelObjectController) BeforeActivation(b mvc.BeforeActivation) {
 	b.Handle("GET",         "/",                                 "GetList"   )
 	b.Handle("GET",         "/page",                             "GetPage"   )
 	b.Handle("GET",         "/{modelId:int64}/{objectId:int64}", "GetById"   )
@@ -20,7 +20,7 @@ func (c *ObjectController) BeforeActivation(b mvc.BeforeActivation) {
 	b.Handle("DELETE",      "/{modelId:int64}/{objectId:int64}", "DeleteByID")
 }
 
-func (c *ObjectController) GetList() *JsonResult {
+func (c *ModelObjectController) GetList() *JsonResult {
 	params  := c.buildParams()
 	modelId := c.Ctx.URLParamInt64Default("modelId", 0)
 	if modelId <= 0 {
@@ -35,7 +35,7 @@ func (c *ObjectController) GetList() *JsonResult {
 	}
 }
 
-func (c *ObjectController) GetPage() *JsonResult {
+func (c *ModelObjectController) GetPage() *JsonResult {
 	params  := c.buildParams()
 	modelId := c.Ctx.URLParamInt64Default("modelId", 0)
 	if modelId <= 0 {
@@ -51,7 +51,7 @@ func (c *ObjectController) GetPage() *JsonResult {
 	}
 }
 
-func (c *ObjectController) GetById(modelId, objectId int64) *JsonResult {
+func (c *ModelObjectController) GetById(modelId, objectId int64) *JsonResult {
 	data, err := c.Service.GetObjectDataById(modelId, objectId)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
@@ -60,7 +60,7 @@ func (c *ObjectController) GetById(modelId, objectId int64) *JsonResult {
 	}
 }
 
-func (c *ObjectController) Create() *JsonResult {
+func (c *ModelObjectController) Create() *JsonResult {
 	userId     := c.GetCurUserId()
 	
 	objectData := viewmodels.ModelObjectData{}
@@ -76,7 +76,7 @@ func (c *ObjectController) Create() *JsonResult {
 	}
 }
 
-func (c *ObjectController) Update() *JsonResult {
+func (c *ModelObjectController) Update() *JsonResult {
 	userId     := c.GetCurUserId()
 	
 	objectData := viewmodels.ModelObjectData{}
@@ -92,7 +92,7 @@ func (c *ObjectController) Update() *JsonResult {
 	}
 }
 
-func (c *ObjectController) DeleteByID(modelId, objectId int64) *JsonResult {
+func (c *ModelObjectController) DeleteByID(modelId, objectId int64) *JsonResult {
 	userId := c.GetCurUserId()
 	
 	m := make(map[string]interface{})

+ 7 - 7
web/controllers/model_object_oam_controller.go

@@ -6,12 +6,12 @@ import (
     "xps/service"
 )
 
-type ObjectOAMController struct {
+type ModelObjectOAMController struct {
     Base
     Service service.ModelObjectOAMService
 }
 
-func (c *ObjectOAMController) BeforeActivation(b mvc.BeforeActivation) {
+func (c *ModelObjectOAMController) BeforeActivation(b mvc.BeforeActivation) {
     b.Handle("GET",     "/",                                                "GetList"   )
     b.Handle("GET",     "/{modelId:int64}/{objectId:int64}/{oamId:int64}",  "GetById"   )
     b.Handle("POST",    "/add",                                             "Create"    )
@@ -19,7 +19,7 @@ func (c *ObjectOAMController) BeforeActivation(b mvc.BeforeActivation) {
     b.Handle("DELETE",  "/{modelId:int64}/{objectId:int64}/{oamId:int64}", "DeleteByID")
 }
 
-func (c *ObjectOAMController) GetList() *JsonResult {
+func (c *ModelObjectOAMController) GetList() *JsonResult {
     params    := c.buildParams()
     data, err := c.Service.GetList(params)
     if err != nil {
@@ -29,7 +29,7 @@ func (c *ObjectOAMController) GetList() *JsonResult {
     }
 }
 
-func (c *ObjectOAMController) GetById(modelId, objectId, oamId int64) *JsonResult {
+func (c *ModelObjectOAMController) GetById(modelId, objectId, oamId int64) *JsonResult {
     data, err := c.Service.GetById(modelId, objectId, oamId)
     if err != nil {
         return ResultErr(err.Error(), nil)
@@ -38,7 +38,7 @@ func (c *ObjectOAMController) GetById(modelId, objectId, oamId int64) *JsonResul
     }
 }
 
-func (c *ObjectOAMController) Create() *JsonResult {
+func (c *ModelObjectOAMController) Create() *JsonResult {
     userId := c.GetCurUserId()
     
     attr   := datamodels.ModelObjectOAM{}
@@ -54,7 +54,7 @@ func (c *ObjectOAMController) Create() *JsonResult {
     }
 }
 
-func (c *ObjectOAMController) Update() *JsonResult {
+func (c *ModelObjectOAMController) Update() *JsonResult {
     userId := c.GetCurUserId()
     
     attr   := datamodels.ModelObjectOAM{}
@@ -70,7 +70,7 @@ func (c *ObjectOAMController) Update() *JsonResult {
     }
 }
 
-func (c *ObjectOAMController) DeleteByID(modelId, objectId, oamId int64) *JsonResult {
+func (c *ModelObjectOAMController) DeleteByID(modelId, objectId, oamId int64) *JsonResult {
     userId := c.GetCurUserId()
     
     m := make(map[string]interface{})

+ 56 - 20
web/router/routes.go

@@ -155,50 +155,86 @@ func Configure(b *bootstrap.Bootstrapper) {
 		modelObjectService := service.NewModelObjectService()
 		modelObjectApp := mvc.New(modelParty.Party("/object"))
 		modelObjectApp.Register(modelObjectService)
-		modelObjectApp.Handle(new(controllers.ObjectController))
+		modelObjectApp.Handle(new(controllers.ModelObjectController))
 		
 		modelObjectAttrService := service.NewModelObjectAttrService()
 		modelObjectAttrApp := mvc.New(modelParty.Party("/object/attribute"))
 		modelObjectAttrApp.Register(modelObjectAttrService)
-		modelObjectAttrApp.Handle(new(controllers.ObjectAttrController))
+		modelObjectAttrApp.Handle(new(controllers.ModelObjectAttrController))
 		
 		modelObjectOAMService := service.NewModelObjectOAMService()
 		modelObjectOAMApp := mvc.New(modelParty.Party("/object/oam"))
 		modelObjectOAMApp.Register(modelObjectOAMService)
-		modelObjectOAMApp.Handle(new(controllers.ObjectOAMController))
+		modelObjectOAMApp.Handle(new(controllers.ModelObjectOAMController))
 	}
 	
-	// DaaS
-	daasParty := b.Party("/daas", crs).AllowMethods(iris.MethodOptions)
+	
+	// Biz
+	bizParty := b.Party("/biz", crs).AllowMethods(iris.MethodOptions)
 	{
-		daasParty.Use(middleware.AuthToken)
-		dbTypeService := service.NewDbTypeService()
-		dbTypeApp := mvc.New(daasParty.Party("/dbType"))
-		dbTypeApp.Register(dbTypeService)
-		dbTypeApp.Handle(new(controllers.DbTypeController))
+		bizParty.Use(middleware.AuthToken)
+		bizService := service.NewBizService()
+		bizApp := mvc.New(bizParty.Party(""))
+		bizApp.Register(bizService)
+		bizApp.Handle(new(controllers.BizController))
+		
+		bizObjectService := service.NewBizObjectService()
+		bizObjectApp := mvc.New(bizParty.Party("/object"))
+		bizObjectApp.Register(bizObjectService)
+		bizObjectApp.Handle(new(controllers.BizObjectController))
+		
+		bizObjectAttrService := service.NewModelObjectAttrService()
+		bizObjectAttrApp := mvc.New(bizParty.Party("/object/attribute"))
+		bizObjectAttrApp.Register(bizObjectAttrService)
+		bizObjectAttrApp.Handle(new(controllers.BizObjectAttrController))
+		
+		bizObjectOAMService := service.NewModelObjectOAMService()
+		bizObjectOAMApp := mvc.New(modelParty.Party("/object/oam"))
+		bizObjectOAMApp.Register(bizObjectOAMService)
+		bizObjectOAMApp.Handle(new(controllers.BizObjectOAMController))
+		
+		bizRuleService := service.NewBizRuleService()
+		bizRuleApp := mvc.New(bizParty.Party("/rule"))
+		bizRuleApp.Register(bizRuleService)
+		bizRuleApp.Handle(new(controllers.BizRuleController))
+	}
+	
+	// database
+	databaseParty := b.Party("/database", crs).AllowMethods(iris.MethodOptions)
+	{
+		databaseParty.Use(middleware.AuthToken)
+		databaseTypeService := service.NewDbTypeService()
+		databaseTypeApp := mvc.New(databaseParty.Party("/type"))
+		databaseTypeApp.Register(databaseTypeService)
+		databaseTypeApp.Handle(new(controllers.DbTypeController))
+		
+		dataService := service.NewDbTypeService()
+		dataApp := mvc.New(databaseParty.Party("/data"))
+		dataApp.Register(dataService)
+		dataApp.Handle(new(controllers.DbTypeController))
 	}
 	
-	// PaaS
-	paasParty := b.Party("/paas", crs).AllowMethods(iris.MethodOptions)
+	// Api
+	apiParty := b.Party("/api", crs).AllowMethods(iris.MethodOptions)
 	{
-		paasParty.Use(middleware.AuthToken)
-		moduleService := service.NewModuleService()
-		moduleApp := mvc.New(paasParty.Party("/module"))
-		moduleApp.Register(moduleService)
-		moduleApp.Handle(new(controllers.ModuleController))
+		apiParty.Use(middleware.AuthToken)
+		apiModuleService := service.NewApiService()
+		apiModuleApp := mvc.New(apiParty.Party("/module"))
+		apiModuleApp.Register(apiModuleService)
+		apiModuleApp.Handle(new(controllers.ApiModuleController))
 		
 		apiService := service.NewApiService()
-		apiApp := mvc.New(paasParty.Party("/api"))
+		apiApp := mvc.New(apiParty.Party("/api"))
 		apiApp.Register(apiService)
 		apiApp.Handle(new(controllers.ApiController))
 		
 		apiLogService := service.NewApiLogService()
-		apiLogApp := mvc.New(paasParty.Party("/api/request"))
+		apiLogApp := mvc.New(apiParty.Party("/api/request"))
 		apiLogApp.Register(apiLogService)
 		apiLogApp.Handle(new(controllers.ApiLogController))
 		
 		atuService := service.NewApiTransUnitService()
-		apiAtuApp := mvc.New(paasParty.Party("/api/atu"))
+		apiAtuApp := mvc.New(apiParty.Party("/api/atu"))
 		apiAtuApp.Register(atuService)
 		apiAtuApp.Handle(new(controllers.ApiTransUnitController))
 	}