init

cache/redis.go

@@ -90,12 +90,12 @@ func SetUserData(userId int64, userData *viewmodels.UserData) error {
 }
 
 func SetObjectData(objectCode string, data *viewmodels.ObjectDataInfo) error {
-	keyStr := fmt.Sprintf("model_%s", objectCode)
+	keyStr := fmt.Sprintf("model_object_%s", objectCode)
 	return SetCache(keyStr, data, 0)
 }
 
 func GetObjectData(objectCode string)(*viewmodels.ObjectDataInfo, error){
-	keyStr := fmt.Sprintf("model_%s", objectCode)
+	keyStr := fmt.Sprintf("model_object_%s", objectCode)
 	modelData := &viewmodels.ObjectDataInfo{}
 	err := Instance().Get(context.Background(), keyStr).Scan(modelData)
 	if err != nil {
@@ -110,7 +110,7 @@ func SetApiData(apiCode string, data *viewmodels.ApiDataInfo) error {
 }
 
 func GetApiData(apiCode string)(*viewmodels.ApiDataInfo, error){
-	keyStr := fmt.Sprintf("model_%s", apiCode)
+	keyStr := fmt.Sprintf("api_%s", apiCode)
 	apiData := &viewmodels.ApiDataInfo{}
 	err := Instance().Get(context.Background(), keyStr).Scan(apiData)
 	if err != nil {

datamodels/api.go

@@ -1,23 +1,15 @@
 package datamodels
 
-import "time"
-
 type Api struct {
-    ModId       int64     `json:"modId"             xorm:"'mod_id'       bigint     pk comment('Module ID' "`
-    ApiId       int64     `json:"apiId"             xorm:"'api_id'       bigint     pk comment('Api ID')   "`
-    ApiType     int64     `json:"apiType"           xorm:"'api_type'     bigint     pk comment('Api Type') "`
-    ApiTitle    string    `json:"apiTitle"          xorm:"'api_title'    varchar(127)  comment('名称')     "`
-    ApiCode     string    `json:"apiCode"           xorm:"'api_code'     varchar(127)  comment('编码')     "`
-    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('描述')      "`
-    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'"`
+    ModuleId    int64     `json:"moduleId"        xorm:"'module_id'     bigint pk  pk comment('Module ID') "`
+    ApiId       int64     `json:"apiId"           xorm:"'api_id'        bigint     pk comment('Api ID')    "`
+    ApiType     int64     `json:"apiType"         xorm:"'api_type'      bigint     pk comment('Api Type')  "`
+    ApiTitle    string    `json:"apiTitle"        xorm:"'api_title'     varchar(127)  comment('名称')      "`
+    ApiCode     string    `json:"apiCode"         xorm:"'api_code'      varchar(127)  comment('编码')      "`
+    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('描述')      "`
+    Base
 }
 
 func (t *Api) TableName() string {

datamodels/api_trans_unit.go

@@ -3,11 +3,12 @@ package datamodels
 import "time"
 
 type ApiTransUnit struct {
+    ModuleId        int64       `json:"moduleId"        xorm:"'module_id'           bigint pk comment('Module ID')    "`
     ApiId           int64       `json:"apiId"           xorm:"'api_id'              bigint pk comment('ApiId')    "`
     AtuId           int64       `json:"atuId"           xorm:"'atu_id'              bigint pk comment('AtuId')    "`
     ModelId         int64       `json:"modelId"         xorm:"'model_id'            bigint comment('ModelId')     "`
     ObjectId        int64       `json:"objectId"        xorm:"'object_id'           bigint comment('ObjectId')    "`
-    ObjectOamType   int64       `json:"objectOamType"   xorm:"'object_oam_type'     bigint comment('ObjectOamType')"`
+    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'"`

datamodels/base.go

@@ -0,0 +1,13 @@
+package datamodels
+
+import "time"
+
+type Base struct {
+    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'"`
+}

datamodels/module.go

@@ -3,9 +3,9 @@ package datamodels
 import "time"
 
 type Module struct {
-    ModId       int64     `json:"modId"           xorm:"'mod_id'        bigint     pk comment('主键ID')      "`
-    ModTitle    string    `json:"modTitle"        xorm:"'mod_title'     varchar(50)   comment('模型名称')     "`
-    ModDesc     string    `json:"modDesc"         xorm:"'mod_desc'      varchar(50)   comment('描述')        "`
+    ModuleId    int64     `json:"moduleId"        xorm:"'module_id'     bigint pk     comment('Module ID')    "`
+    ModuleTitle string    `json:"moduleTitle"     xorm:"'module_title'  varchar(127)  comment('Module Title') "`
+    ModuleDesc  string    `json:"moduleDesc"      xorm:"'module_desc'   varchar(50)   comment('Module Desc')  "`
     IsFixed     int64     `json:"isFixed"         xorm:"'is_fixed'      int           comment('是否可修改')   "`
     CreatedBy   int64     `json:"createdBy"       xorm:"'created_by'"`
     CreatedAt   time.Time `json:"createdAt"       xorm:"'created_at'"`

datamodels/object_oam.go

@@ -8,8 +8,13 @@ type ObjectOAM struct {
     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')           "`
-    OamStatement string    `json:"oamStatement"    xorm:"'oam_statement'   varchar(1023)  comment('Statement')      "`
+    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'"`

repositories/api_repo.go

@@ -23,9 +23,9 @@ func (d *ApiRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, err
     page  := m["page"].(int)
     
     sqlSelect := ` SELECT    A.*,
-                             B.mod_title  `
+                             B.module_title  `
     sqlFrom   := ` FROM      ps_api    AS A
-                   LEFT JOIN ps_module AS B ON (A.mod_id = B.mod_id) `
+                   LEFT JOIN ps_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) + "%'"
@@ -36,7 +36,7 @@ func (d *ApiRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, err
     if err1 != nil {
         return nil, err1
     }
-    sqlOrderBy := " ORDER BY api_id DESC "
+    sqlOrderBy := " ORDER BY A.module_id, A.api_id ASC "
     
     pageStart  := (page - 1) * limit
     sqlLimit   := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
@@ -56,18 +56,20 @@ func (d *ApiRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, err
 }
 
 func (d *ApiRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiInfo, error) {
-    modId     := m["modId"].(int64)
+    moduleId  := m["moduleId"].(int64)
     
     sqlSelect := ` SELECT    A.*,
-                             B.mod_title  `
+                             B.module_title  `
     sqlFrom   := ` FROM      ps_api    AS A
-                   LEFT JOIN ps_module AS B ON (A.mod_id = B.mod_id) `
-    sqlWhere  := ` WHERE  A.deleted_flag = 0 AND A.mod_id =` + fmt.Sprintf("%d", modId)
+                   LEFT JOIN ps_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)
+    
     if keywords, ok := m["keywords"]; ok {
         sqlWhere += ` AND A.api_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
     }
+    sqlOrderBy := " ORDER BY A.module_id, A.api_id ASC "
     
-    sqlOrderBy := " ORDER BY mod_id ASC "
     datalist := make([]viewmodels.ApiInfo, 0)
     err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
     if err != nil {
@@ -79,12 +81,12 @@ func (d *ApiRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiInfo, error
 
 func (d *ApiRepo) GetAll() ([]viewmodels.ApiInfo, error) {
     
-    sqlSelect := ` SELECT    A.*,
-                             B.mod_title  `
-    sqlFrom   := ` FROM      ps_api    AS A
-                   LEFT JOIN ps_module AS B ON (A.mod_id = B.mod_id) `
-    sqlWhere  := ` WHERE  A.deleted_flag = 0 `
-    sqlOrderBy := " ORDER BY mod_id ASC "
+    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) `
+    sqlWhere   := ` WHERE  A.deleted_flag = 0 `
+    sqlOrderBy := " ORDER BY A.module_id, A.api_id ASC "
     datalist := make([]viewmodels.ApiInfo, 0)
     err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
     if err != nil {
@@ -94,12 +96,13 @@ func (d *ApiRepo) GetAll() ([]viewmodels.ApiInfo, error) {
     }
 }
 
-func (d *ApiRepo) GetById(modId, apiId int64) (*viewmodels.ApiInfo, error) {
+func (d *ApiRepo) GetById(moduleId, apiId int64) (*viewmodels.ApiInfo, error) {
     sqlSelect := ` SELECT    A.*,
-                             B.mod_title  `
+                             B.module_title  `
     sqlFrom   := ` FROM      ps_api    AS A
-                   LEFT JOIN ps_module AS B ON (A.mod_id = B.mod_id) `
-    sqlWhere  := ` WHERE  A.deleted_flag = 0 AND A.mod_id =` + fmt.Sprintf("%d", modId)
+                   LEFT JOIN ps_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)
     
     data := &viewmodels.ApiInfo{}
@@ -130,19 +133,19 @@ func (d *ApiRepo) Create(data *datamodels.Api) error {
 }
 
 func (d *ApiRepo) Update(data *datamodels.Api) error {
-    modId := data.ModId
-    apiId := data.ApiId
+    moduleId := data.ModuleId
+    apiId    := data.ApiId
     
     data.UpdatedAt = time.Now()
     _, err := d.engine.
-        Where("mod_id = ?", modId).
+        Where("module_id = ?", moduleId).
         Where("api_id = ?", apiId).
         Update(data)
     return err
 }
 
 func (d *ApiRepo) Delete(m map[string]interface{}) error {
-    modId     := m["modId"].(int64)
+    moduleId     := m["moduleId"].(int64)
     apiId     := m["apiId"].(int64)
     deletedBy := m["deletedBy"].(int64)
     
@@ -151,7 +154,7 @@ func (d *ApiRepo) Delete(m map[string]interface{}) error {
     data.DeletedBy = deletedBy
     data.DeletedAt = time.Now()
     _, err := d.engine.
-        Where("mod_id = ?", modId).
+        Where("module_id = ?", moduleId).
         Where("api_id = ?", apiId).
         Update(data)
     return err

repositories/api_trans_unit_repo.go

@@ -24,7 +24,8 @@ func (d *ApiTransUnitRepo) GetPage(m map[string]interface{}) (*viewmodels.PageRe
     
     sqlSelect := ` SELECT     A.*,
                               B.model_title,
-                              C.object_title `
+                              C.object_title,
+                              C.object_code  `
     sqlFrom   := ` FROM       ps_api_trans_unit AS A
                    LEFT  JOIN ds_model          AS B ON (A.model_id = B.model_id)
                    LEFT  JOIN ds_object         AS C ON (A.model_id = C.model_id AND A.object_id = C.object_id)`
@@ -65,12 +66,24 @@ func (d *ApiTransUnitRepo) GetPage(m map[string]interface{}) (*viewmodels.PageRe
 func (d *ApiTransUnitRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiTransUnitInfo, error) {
     sqlSelect := ` SELECT     A.*,
                               B.model_title,
-                              C.object_title `
+                              C.object_title,
+                              C.object_code,
+                              D.oam_title,
+                              D.oam_code,
+                              D.oam_type,
+                              D.sql_type,
+                              D.sql_statement,
+                              D.sql_select,
+                              D.sql_from,
+                              D.sql_where,
+                              D.sql_order,
+                              D.oam_desc `
     sqlFrom   := ` FROM       ps_api_trans_unit AS A
                    LEFT  JOIN ds_model          AS B ON (A.model_id = B.model_id)
-                   LEFT  JOIN ds_object         AS C ON (A.model_id = C.model_id AND A.object_id = C.object_id)`
-    sqlWhere  := ` WHERE 1 = 1  AND A.deleted_flag = 0 `
-    
+                   LEFT  JOIN ds_object         AS C ON (A.model_id = C.model_id AND A.object_id = C.object_id)
+                   LEFT  JOIN ds_object_oam     AS D ON (A.model_id = D.model_id AND A.object_id = D.object_id AND A.oam_id = D.oam_id)`
+    sqlWhere  := ` WHERE A.deleted_flag = 0 `
+    sqlOrderBy := " ORDER BY A.api_id, A.sort_no ASC "
     if apiId, ok := m["apiId"]; ok {
         sqlWhere += ` AND A.api_id = `+ fmt.Sprintf("%d", apiId)
     }
@@ -78,7 +91,6 @@ func (d *ApiTransUnitRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiTr
     if keywords, ok := m["keywords"]; ok {
         sqlWhere += ` AND C.object_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
     }
-    sqlOrderBy := " ORDER BY A.atu_id ASC "
     
     datalist := make([]viewmodels.ApiTransUnitInfo, 0)
     err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
@@ -92,10 +104,22 @@ func (d *ApiTransUnitRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiTr
 func (d *ApiTransUnitRepo) GetAll() ([]viewmodels.ApiTransUnitInfo, error) {
     sqlSelect := ` SELECT     A.*,
                               B.model_title,
-                              C.object_title `
+                              C.object_title,
+                              C.object_code,
+                              D.oam_title,
+                              D.oam_code,
+                              D.oam_type,
+                              D.sql_type,
+                              D.sql_statement,
+                              D.sql_select,
+                              D.sql_from,
+                              D.sql_where,
+                              D.sql_order,
+                              D.oam_desc `
     sqlFrom   := ` FROM       ps_api_trans_unit AS A
                    LEFT  JOIN ds_model          AS B ON (A.model_id = B.model_id)
-                   LEFT  JOIN ds_object         AS C ON (A.model_id = C.model_id AND A.object_id = C.object_id)`
+                   LEFT  JOIN ds_object         AS C ON (A.model_id = C.model_id AND A.object_id = C.object_id)
+                   LEFT  JOIN ds_object_oam     AS D ON (A.model_id = D.model_id AND A.object_id = D.object_id AND A.oam_id = D.oam_id)`
     sqlWhere  := ` WHERE A.deleted_flag = 0 `
     sqlOrderBy := " ORDER BY A.api_id, A.sort_no ASC "
     datalist := make([]viewmodels.ApiTransUnitInfo, 0)
@@ -107,15 +131,28 @@ func (d *ApiTransUnitRepo) GetAll() ([]viewmodels.ApiTransUnitInfo, error) {
     }
 }
 
-func (d *ApiTransUnitRepo) GetListById(apiId int64) ([]viewmodels.ApiTransUnitInfo, error) {
+func (d *ApiTransUnitRepo) GetListById(moduleId, apiId int64) ([]viewmodels.ApiTransUnitInfo, error) {
     sqlSelect := ` SELECT     A.*,
                               B.model_title,
-                              C.object_title `
+                              C.object_title,
+                              C.object_code,
+                              D.oam_title,
+                              D.oam_code,
+                              D.oam_type,
+                              D.sql_type,
+                              D.sql_statement,
+                              D.sql_select,
+                              D.sql_from,
+                              D.sql_where,
+                              D.sql_order,
+                              D.oam_desc `
     sqlFrom   := ` FROM       ps_api_trans_unit AS A
                    LEFT  JOIN ds_model          AS B ON (A.model_id = B.model_id)
-                   LEFT  JOIN ds_object         AS C ON (A.model_id = C.model_id AND A.object_id = C.object_id)`
-    sqlWhere  := ` WHERE 1 = 1  AND A.deleted_flag = 0 `
-    sqlWhere  += ` AND A.api_id = `+ fmt.Sprintf("%d", apiId)
+                   LEFT  JOIN ds_object         AS C ON (A.model_id = C.model_id AND A.object_id = C.object_id)
+                   LEFT  JOIN ds_object_oam     AS D ON (A.model_id = D.model_id AND A.object_id = D.object_id AND A.oam_id = D.oam_id)`
+    sqlWhere  := ` WHERE A.deleted_flag = 0 `
+    sqlWhere  += ` AND A.module_id = `+ fmt.Sprintf("%d", moduleId)
+    sqlWhere  += ` AND A.api_id    = `+ fmt.Sprintf("%d", apiId)
     sqlOrderBy := " ORDER BY A.atu_id ASC "
     
     datalist := make([]viewmodels.ApiTransUnitInfo, 0)
@@ -127,13 +164,22 @@ func (d *ApiTransUnitRepo) GetListById(apiId int64) ([]viewmodels.ApiTransUnitIn
     }
 }
 
-func (d *ApiTransUnitRepo) GetById(apiId, atuId int64) (*viewmodels.ApiTransUnitInfo, error) {
+func (d *ApiTransUnitRepo) GetById(moduleId, apiId, atuId int64) (*viewmodels.ApiTransUnitInfo, error) {
+    sqlSelect := ` SELECT     A.*,
+                              B.model_title,
+                              C.object_title,
+                              C.object_code  `
+    sqlFrom   := ` FROM       ps_api_trans_unit AS A
+                   LEFT  JOIN ds_model          AS B ON (A.model_id = B.model_id)
+                   LEFT  JOIN ds_object         AS C ON (A.model_id = C.model_id AND A.object_id = C.object_id)`
+    sqlWhere  := ` WHERE A.deleted_flag = 0 `
+    sqlWhere  += ` AND A.module_id = `+ fmt.Sprintf("%d", moduleId)
+    sqlWhere  += ` AND A.api_id    = `+ fmt.Sprintf("%d", apiId)
+    sqlWhere  += ` AND A.atu_id    = `+ fmt.Sprintf("%d", atuId)
+    
     data := &viewmodels.ApiTransUnitInfo{}
-    ok, err := d.engine.
-        Where("api_id = ?", apiId).
-        Where("atu_id = ?", atuId).
-        Get(data)
-    if !ok && err == nil {
+    has, err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere).Get(data)
+    if !has || err != nil {
         return nil, err
     } else {
         return data, nil
@@ -146,11 +192,13 @@ func (d *ApiTransUnitRepo) Create(data *datamodels.ApiTransUnit) error {
 }
 
 func (d *ApiTransUnitRepo) Update(data *datamodels.ApiTransUnit) error {
-    apiId := data.ApiId
-    atuId := data.AtuId
+    moduleId := data.ModuleId
+    apiId    := data.ApiId
+    atuId    := data.AtuId
     
     data.UpdatedAt = time.Now()
     _, err := d.engine.
+        Where("module_id = ?", moduleId).
         Where("api_id = ?", apiId).
         Where("atu_id = ?", atuId).
         Update(data)
@@ -158,11 +206,13 @@ func (d *ApiTransUnitRepo) Update(data *datamodels.ApiTransUnit) error {
 }
 
 func (d *ApiTransUnitRepo) Delete(m map[string]interface{}) error {
+    moduleId  := m["moduleId"].(int64)
     apiId     := m["apiId"].(int64)
     atuId     := m["atuId"].(int64)
     
     data := &datamodels.ApiTransUnit{}
     _, err := d.engine.
+        Where("module_id = ?", moduleId).
         Where("api_id = ?", apiId).
         Where("atu_id = ?", atuId).
         Delete(data)

repositories/data_bus_rebo.go

@@ -54,7 +54,7 @@ func (d *DataBusRepo) GetList(sqlSelect, sqlFrom, sqlWhere, sqlOrderBy string, m
     return results, nil
 }
 
-func (d *DataBusRepo) GetById(statement string, fields map[string]interface{})(map[string]interface{}, error){
+func (d *DataBusRepo) GetById(statement string, fields map[string]interface{})([]map[string]interface{}, error){
     
     sql := statement
     sql += " WHERE 1 = 1"
@@ -71,7 +71,7 @@ func (d *DataBusRepo) GetById(statement string, fields map[string]interface{})(m
         return nil, errors.New(" 主键不唯一")
     }
     
-    return results[0], nil
+    return results, nil
 }
 
 func (d *DataBusRepo) Create(object *viewmodels.ObjectDataInfo, values map[string]interface{}) error {

repositories/module_repo.go

@@ -27,7 +27,7 @@ func (d *ModuleRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
     sqlWhere  := ` WHERE A.deleted_flag = 0  `
     
     if keywords, ok := m["keywords"]; ok {
-        sqlWhere += ` AND A.mod_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
+        sqlWhere += ` AND A.module_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
     }
     
     sqlCount    := ` SELECT COUNT(*) `
@@ -35,7 +35,7 @@ func (d *ModuleRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
     if err1 != nil {
         return nil, err1
     }
-    sqlOrderBy  := " ORDER BY object_id DESC "
+    sqlOrderBy  := " ORDER BY A.module_id ASC "
     
     pageStart   := (page - 1) * limit
     sqlLimit    := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
@@ -59,9 +59,9 @@ func (d *ModuleRepo) GetList(m map[string]interface{}) ([]viewmodels.ModuleInfo,
     sqlFrom   := ` FROM  ps_module   AS A    `
     sqlWhere  := ` WHERE A.deleted_flag = 0  `
     if keywords, ok := m["keywords"]; ok {
-        sqlWhere += ` AND A.mod_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
+        sqlWhere += ` AND A.module_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
     }
-    sqlOrderBy := " ORDER BY mod_id ASC "
+    sqlOrderBy := " ORDER BY A.module_id ASC "
     
     datalist   := make([]viewmodels.ModuleInfo, 0)
     err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
@@ -72,12 +72,15 @@ func (d *ModuleRepo) GetList(m map[string]interface{}) ([]viewmodels.ModuleInfo,
     }
 }
 
-func (d *ModuleRepo) GetById(modId int64) (*viewmodels.ModuleInfo, error) {
+func (d *ModuleRepo) GetById(moduleId int64) (*viewmodels.ModuleInfo, error) {
+    sqlSelect := ` SELECT A.*                `
+    sqlFrom   := ` FROM  ps_module   AS A    `
+    sqlWhere  := ` WHERE A.deleted_flag = 0  `
+    sqlWhere  += fmt.Sprintf(" AND A.module_id = %d", moduleId)
+    
     data := &viewmodels.ModuleInfo{}
-    ok, err := d.engine.
-        Where("mod_id = ?", modId).
-        Get(data)
-    if !ok && err == nil {
+    has, err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere).Get(data)
+    if !has || err != nil {
         return nil, err
     } else {
         return data, nil
@@ -91,17 +94,17 @@ func (d *ModuleRepo) Create(data *datamodels.Module) error {
 }
 
 func (d *ModuleRepo) Update(data *datamodels.Module) error {
-    modId := data.ModId
+    moduleId := data.ModuleId
     
     data.UpdatedAt = time.Now()
     _, err := d.engine.
-        Where("mod_id = ?", modId).
+        Where("module_id = ?", moduleId).
         Update(data)
     return err
 }
 
 func (d *ModuleRepo) Delete(m map[string]interface{}) error {
-    modId     := m["modId"].(int64)
+    moduleId  := m["moduleId"].(int64)
     deletedBy := m["deletedBy"].(int64)
     
     data := &datamodels.Module{}
@@ -109,7 +112,7 @@ func (d *ModuleRepo) Delete(m map[string]interface{}) error {
     data.DeletedBy = deletedBy
     data.DeletedAt = time.Now()
     _, err := d.engine.
-        Where("mod_id = ?", modId).
+        Where("module_id = ?", moduleId).
         Update(data)
     return err
 }

repositories/object_oam_repo.go

@@ -65,6 +65,7 @@ func (d *ObjectOAMRepo) Update(data *datamodels.ObjectOAM) error {
         Where("model_id = ?", modelId).
         Where("object_id = ?", objectId).
         Where("oam_id = ?", oamId).
+        AllCols().
         Update(data)
     return err
 }

service/api_gateway_service.go

@@ -25,11 +25,37 @@ func NewApiGatewayService() ApiGatewayService {
     }
 }
 
-func (a apiGatewayService) Get(apiCode string, m map[string]interface{}) ([]map[string]interface{}, error) {
-    return nil, errors.New("TEST")
+func (a *apiGatewayService) Get(apiCode string, m map[string]interface{}) ([]map[string]interface{}, error) {
+    apiInfo, err1 := cache.GetApiData(apiCode)
+    if err1 != nil{
+        return nil, err1
+    }
+    
+    transUnits := apiInfo.TransUnits
+    if len(transUnits) > 0 {
+        trans := transUnits[0]
+        oamType      := trans.OamType
+        sqlStatement := trans.SqlStatement
+        sqlSelect    := trans.SqlSelect
+        sqlFrom      := trans.SqlFrom
+        sqlWhere     := trans.SqlWhere
+        sqlOrder     := trans.SqlOrder
+        
+        if oamType == 1 {
+           return a.dataBus.GetById(sqlStatement, m)
+        }
+        
+        if oamType == 2 {
+            return a.dataBus.GetList(sqlSelect, sqlFrom, sqlWhere, sqlOrder, m)
+        }
+        
+        return a.dataBus.GetList(sqlSelect, sqlFrom, sqlWhere, sqlOrder, m)
+    }
+    
+    return nil, errors.New("API交易数据不完整")
 }
 
-func (a apiGatewayService) Handle(apiCode string, action int, m map[string]interface{}) error{
+func (a *apiGatewayService) Handle(apiCode string, action int, m map[string]interface{}) error{
    apiInfo, err1 := cache.GetApiData(apiCode)
    if err1 == nil{
        return err1
@@ -73,18 +99,18 @@ func (a apiGatewayService) Handle(apiCode string, action int, m map[string]inter
    return nil
 }
 
-func (a apiGatewayService) Create(apiCode string, m map[string]interface{}) error {
+func (a *apiGatewayService) Create(apiCode string, m map[string]interface{}) error {
     return a.Handle(apiCode, 1, m)
 }
 
-func (a apiGatewayService) Update(apiCode string, m map[string]interface{}) error {
+func (a *apiGatewayService) Update(apiCode string, m map[string]interface{}) error {
     return a.Handle(apiCode, 2, m)
 }
 
-func (a apiGatewayService) Patch(apiCode string, m map[string]interface{}) error {
+func (a *apiGatewayService) Patch(apiCode string, m map[string]interface{}) error {
     return a.Handle(apiCode, 3, m)
 }
 
-func (a apiGatewayService) Delete(apiCode string, m map[string]interface{}) error {
+func (a *apiGatewayService) Delete(apiCode string, m map[string]interface{}) error {
     return a.Handle(apiCode, 4, m)
 }

service/api_service.go

@@ -12,12 +12,12 @@ import (
 type ApiService interface {
     GetList(m map[string]interface{}) ([]viewmodels.ApiInfo, error)
     GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
-    GetById(modId, apiId int64) (*viewmodels.ApiInfo, error)
+    GetById(moduleId, apiId int64) (*viewmodels.ApiInfo, error)
     Create(d *datamodels.Api) error
     Update(d *datamodels.Api) error
-    ChangeStatus(modId, apiId, status int64) error
+    ChangeStatus(moduleId, apiId, status int64) error
     Delete(m map[string]interface{}) error
-    CacheApiData(modId, apiId int64) error
+    CacheApiData(moduleId, apiId int64) error
 }
 
 type apiService struct {
@@ -40,8 +40,8 @@ func (s *apiService) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
     return s.apiRepo.GetPage(m)
 }
 
-func (s *apiService) GetById(modId, apiId int64) (*viewmodels.ApiInfo, error) {
-    return s.apiRepo.GetById(modId, apiId)
+func (s *apiService) GetById(moduleId, apiId int64) (*viewmodels.ApiInfo, error) {
+    return s.apiRepo.GetById(moduleId, apiId)
 }
 
 func (s *apiService) Create(api *datamodels.Api) error {
@@ -51,9 +51,9 @@ func (s *apiService) Create(api *datamodels.Api) error {
         return err
     }
     
-    modId := api.ModId
-    apiId := api.ApiId
-    return s.CacheApiData(modId, apiId)
+    moduleId := api.ModuleId
+    apiId    := api.ApiId
+    return s.CacheApiData(moduleId, apiId)
 }
 
 func (s *apiService) Update(api *datamodels.Api) error {
@@ -62,14 +62,14 @@ func (s *apiService) Update(api *datamodels.Api) error {
         return err
     }
     
-    modId := api.ModId
-    apiId := api.ApiId
-    return s.CacheApiData(modId, apiId)
+    moduleId := api.ModuleId
+    apiId    := api.ApiId
+    return s.CacheApiData(moduleId, apiId)
 }
 
-func (s *apiService) ChangeStatus(modId, apiId, status int64) error {
+func (s *apiService) ChangeStatus(moduleId, apiId, status int64) error {
     data := &datamodels.Api{
-        ModId: modId,
+        ModuleId: moduleId,
         ApiId: apiId,
         Status: status,
     }
@@ -78,34 +78,34 @@ func (s *apiService) ChangeStatus(modId, apiId, status int64) error {
         return err
     }
     
-    return s.CacheApiData(modId, apiId)
+    return s.CacheApiData(moduleId, apiId)
 }
 
 func (s *apiService) Delete(m map[string]interface{}) error {
     return s.apiRepo.Delete(m)
 }
 
-func (s *apiService) CacheApiData(modId, apiId int64) error {
-    api, err := s.apiRepo.GetById(modId, apiId)
+func (s *apiService) CacheApiData(moduleId, apiId int64) error {
+    api, err := s.apiRepo.GetById(moduleId, apiId)
     if err != nil {
         return nil
     }
     
-    trans, err := s.transRepo.GetListById(apiId)
+    trans, err := s.transRepo.GetListById(moduleId, apiId)
     if err != nil {
         return nil
     }
     
     cacheData := &viewmodels.ApiDataInfo{
-        ModId: api.ModId,
-        ModTitle: api.ModTitle,
-        ApiId: api.ApiId,
-        ApiCode: api.ApiCode,
-        ApiTitle: api.ApiTitle,
-        ApiType: api.ApiType,
-        ApiParams: api.ApiParams,
-        ApiDesc: api.ApiDesc,
-        Status: api.Status,
+        ModuleId:    api.ModuleId,
+        ModuleTitle: api.ModuleTitle,
+        ApiId:       api.ApiId,
+        ApiCode:     api.ApiCode,
+        ApiTitle:    api.ApiTitle,
+        ApiType:     api.ApiType,
+        ApiParams:   api.ApiParams,
+        ApiDesc:     api.ApiDesc,
+        Status:      api.Status,
         TransUnits: trans,
     }
     

service/api_trans_unit_service.go

@@ -12,10 +12,11 @@ import (
 type ApiTransUnitService interface {
     GetList(m map[string]interface{}) ([]viewmodels.ApiTransUnitInfo, error)
     GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
-    GetById(apiId, atuId int64) (*viewmodels.ApiTransUnitInfo, error)
+    GetById(moduleId, apiId, atuId int64) (*viewmodels.ApiTransUnitInfo, error)
     Create(d *datamodels.ApiTransUnit) error
     Update(d *datamodels.ApiTransUnit) error
     Delete(m map[string]interface{}) error
+    GenerateParams(apiCode string)(map[string]interface{}, error)
 }
 
 type apiTransUnitService struct {
@@ -23,6 +24,7 @@ type apiTransUnitService struct {
     transRepo *repositories.ApiTransUnitRepo
 }
 
+
 func NewApiTransUnitService() ApiTransUnitService {
     return &apiTransUnitService{
         apiRepo: repositories.NewApiRepo(datasource.InstanceMaster()),
@@ -38,8 +40,8 @@ func (s *apiTransUnitService) GetPage(m map[string]interface{}) (*viewmodels.Pag
     return s.transRepo.GetPage(m)
 }
 
-func (s *apiTransUnitService) GetById(apiId, atuId int64) (*viewmodels.ApiTransUnitInfo, error) {
-    return s.transRepo.GetById(apiId, atuId)
+func (s *apiTransUnitService) GetById(moduleId, apiId, atuId int64) (*viewmodels.ApiTransUnitInfo, error) {
+    return s.transRepo.GetById(moduleId, apiId, atuId)
 }
 
 func (s *apiTransUnitService) Create(atu *datamodels.ApiTransUnit) error {
@@ -49,9 +51,9 @@ func (s *apiTransUnitService) Create(atu *datamodels.ApiTransUnit) error {
         return err
     }
     
-    modId := atu.ModelId
-    apiId := atu.ApiId
-    return s.CacheApiData(modId, apiId)
+    moduleId := atu.ModuleId
+    apiId    := atu.ApiId
+    return s.CacheApiData(moduleId, apiId)
 }
 
 func (s *apiTransUnitService) Update(atu *datamodels.ApiTransUnit) error {
@@ -60,36 +62,36 @@ func (s *apiTransUnitService) Update(atu *datamodels.ApiTransUnit) error {
         return err
     }
     
-    modId := atu.ModelId
-    apiId := atu.ApiId
-    return s.CacheApiData(modId, apiId)
+    moduleId := atu.ModuleId
+    apiId    := atu.ApiId
+    return s.CacheApiData(moduleId, apiId)
 }
 
 func (s *apiTransUnitService) Delete(m map[string]interface{}) error {
     return s.transRepo.Delete(m)
 }
 
-func (s *apiTransUnitService) CacheApiData(modId, apiId int64) error {
-    api, err := s.apiRepo.GetById(modId, apiId)
+func (s *apiTransUnitService) CacheApiData(moduleId, apiId int64) error {
+    api, err := s.apiRepo.GetById(moduleId, apiId)
     if err != nil {
         return nil
     }
     
-    trans, err := s.transRepo.GetListById(apiId)
+    trans, err := s.transRepo.GetListById(moduleId, apiId)
     if err != nil {
         return nil
     }
     
     cacheData := &viewmodels.ApiDataInfo{
-        ModId: api.ModId,
-        ModTitle: api.ModTitle,
-        ApiId: api.ApiId,
-        ApiCode: api.ApiCode,
-        ApiTitle: api.ApiTitle,
-        ApiType: api.ApiType,
-        ApiParams: api.ApiParams,
-        ApiDesc: api.ApiDesc,
-        Status: api.Status,
+        ModuleId:    api.ModuleId,
+        ModuleTitle: api.ModuleTitle,
+        ApiId:       api.ApiId,
+        ApiCode:     api.ApiCode,
+        ApiTitle:    api.ApiTitle,
+        ApiType:     api.ApiType,
+        ApiParams:   api.ApiParams,
+        ApiDesc:     api.ApiDesc,
+        Status:      api.Status,
         TransUnits: trans,
     }
     
@@ -101,3 +103,46 @@ func (s *apiTransUnitService) CacheApiData(modId, apiId int64) error {
     
     return nil
 }
+
+
+func (s *apiTransUnitService) GenerateParams(apiCode string)(map[string]interface{}, error){
+    apiInfo, err1 := cache.GetApiData(apiCode)
+    if err1 != nil {
+        return nil, err1
+    }
+    
+    params := make(map[string]interface{})
+    transUnits := apiInfo.TransUnits
+    for _, transUnit := range transUnits {
+        objectCode := transUnit.ObjectCode
+        objectInfo, err2 := cache.GetObjectData(objectCode)
+        if err2 != nil {
+            return nil, err2
+        }
+        
+        attrs := objectInfo.Attrs
+        for _, attr := range attrs {
+            attrCode := attr.AttrCode
+            if _, ok := params[attrCode]; !ok{
+                switch attr.AttrType {
+                case 1: // int
+                   params[attrCode] = 0
+                case 2: // string
+                    params[attrCode] = "test"
+                case 3: // decimal
+                    params[attrCode] = 0.01
+                case 4: // datetime
+                    params[attrCode] = "2020-01-01 10:10:10"
+                case 5: // date
+                    params[attrCode] = "2020-01-01"
+                case 6: // time
+                    params[attrCode] = "10:10:10"
+                default:
+                    params[attrCode] = "NaN"
+                }
+            }
+        }
+    }
+    
+    return params, nil
+}

service/init_service.go

@@ -85,25 +85,26 @@ func (s *initService) CacheApiData() error {
     }
     
     for _, api := range apiList {
-        apiId := api.ApiId
+        moduleId := api.ModuleId
+        apiId    := api.ApiId
         trans := make([]viewmodels.ApiTransUnitInfo, 0)
         for _, tran := range transList{
-            if tran.ApiId == apiId {
+            if tran.ModuleId == moduleId && tran.ApiId == apiId {
                trans = append(trans, tran)
             }
         }
     
         cacheData := &viewmodels.ApiDataInfo{
-            ModId: api.ModId,
-            ModTitle: api.ModTitle,
-            ApiId: api.ApiId,
-            ApiCode: api.ApiCode,
-            ApiTitle: api.ApiTitle,
-            ApiType: api.ApiType,
-            ApiParams: api.ApiParams,
-            ApiDesc: api.ApiDesc,
-            Status: api.Status,
-            TransUnits: trans,
+            ModuleId:    api.ModuleId,
+            ModuleTitle: api.ModuleTitle,
+            ApiId:       api.ApiId,
+            ApiCode:     api.ApiCode,
+            ApiTitle:    api.ApiTitle,
+            ApiType:     api.ApiType,
+            ApiParams:   api.ApiParams,
+            ApiDesc:     api.ApiDesc,
+            Status:      api.Status,
+            TransUnits:  trans,
         }
     
         // 缓存数据
@@ -116,7 +117,7 @@ func (s *initService) CacheApiData() error {
     return nil
 }
 
-func (i initService) CacheDBData() error {
+func (s *initService) CacheDBData() error {
     return nil
 }
 

service/module_service.go

@@ -10,7 +10,7 @@ import (
 type ModuleService interface {
     GetList(m map[string]interface{}) ([]viewmodels.ModuleInfo, error)
     GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
-    GetById(modId int64) (*viewmodels.ModuleInfo, error)
+    GetById(moduleId int64) (*viewmodels.ModuleInfo, error)
     Create(d *datamodels.Module) error
     Update(d *datamodels.Module) error
     Delete(m map[string]interface{}) error
@@ -34,12 +34,12 @@ func (s *moduleService) GetPage(m map[string]interface{}) (*viewmodels.PageResul
     return s.repo.GetPage(m)
 }
 
-func (s *moduleService) GetById(modId int64) (*viewmodels.ModuleInfo, error) {
-    return s.repo.GetById(modId)
+func (s *moduleService) GetById(moduleId int64) (*viewmodels.ModuleInfo, error) {
+    return s.repo.GetById(moduleId)
 }
 
 func (s *moduleService) Create(Module *datamodels.Module) error {
-    Module.ModId = NewID()
+    Module.ModuleId = NewID()
     return s.repo.Create(Module)
 }
 

utils/http_status.go

@@ -5,7 +5,7 @@ type HttpStatusCode int
 
 // Result Code List
 const (
-	HTTP_STATUS_OK           = 0
+	HTTP_STATUS_OK           = 200
 	HTTP_STATUS_UNAUTHORIZED = 401
 	HTTP_STATUS_404          = 404
 	HTTP_STATUS_ERR          = 500

viewmodels/api_data_info.go

@@ -3,8 +3,8 @@ package viewmodels
 import "encoding/json"
 
 type ApiDataInfo struct {
-    ModId       int64     `json:"modId"        xorm:"'mod_id'       bigint     pk comment('Module ID')"`
-    ModTitle    string    `json:"modTitle"     xorm:"'mod_title'    varchar(127)  comment('Module Title') "`
+    ModuleId    int64     `json:"moduleId"     xorm:"'module_id'    bigint pk     comment('Module ID')    "`
+    ModuleTitle string    `json:"moduleTitle"  xorm:"'module_title' varchar(127)  comment('Module Title') "`
     ApiId       int64     `json:"apiId"        xorm:"'api_id'       bigint     pk comment('Api ID')   "`
     ApiType     int64     `json:"apiType"      xorm:"'api_type'     bigint     pk comment('Api Type') "`
     ApiTitle    string    `json:"apiTitle"     xorm:"'api_title'    varchar(127)  comment('名称')      "`

viewmodels/api_info.go

@@ -1,15 +1,15 @@
 package viewmodels
 
 type ApiInfo struct {
-    ModId       int64     `json:"modId"        xorm:"'mod_id'       bigint     pk comment('Module ID')"`
-    ModTitle    string    `json:"modTitle"     xorm:"'mod_title'    varchar(127)  comment('Module Title') "`
-    ApiId       int64     `json:"apiId"        xorm:"'api_id'       bigint     pk comment('Api ID')   "`
-    ApiType     int64     `json:"apiType"      xorm:"'api_type'     bigint     pk comment('Api Type') "`
-    ApiTitle    string    `json:"apiTitle"     xorm:"'api_title'    varchar(127)  comment('名称')      "`
-    ApiCode     string    `json:"apiCode"      xorm:"'api_code'     varchar(127)  comment('编码')      "`
-    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('描述')      "`
+    ModuleId    int64     `json:"moduleId"     xorm:"'module_id'    bigint pk     comment('Module ID')    "`
+    ModuleTitle string    `json:"moduleTitle"  xorm:"'module_title' varchar(127)  comment('Module Title') "`
+    ApiId       int64     `json:"apiId"        xorm:"'api_id'       bigint     pk comment('Api ID')       "`
+    ApiType     int64     `json:"apiType"      xorm:"'api_type'     bigint     pk comment('Api Type')     "`
+    ApiTitle    string    `json:"apiTitle"     xorm:"'api_title'    varchar(127)  comment('名称')          "`
+    ApiCode     string    `json:"apiCode"      xorm:"'api_code'     varchar(127)  comment('编码')          "`
+    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('描述')           "`
 }
 
 func (t *ApiInfo) TableName() string {

viewmodels/api_trans_unit_info.go

@@ -2,6 +2,7 @@ package viewmodels
 
 
 type ApiTransUnitInfo struct {
+    ModuleId        int64       `json:"moduleId"        xorm:"'module_id'           bigint pk     comment('主键ID')       "`
     ApiId           int64       `json:"apiId"           xorm:"'api_id'              bigint pk     comment('ApiId')        "`
     AtuId           int64       `json:"atuId"           xorm:"'atu_id'              bigint pk     comment('AtuId')        "`
     ModelId         int64       `json:"modelId"         xorm:"'model_id'            bigint        comment('ModelId')      "`
@@ -9,7 +10,17 @@ type ApiTransUnitInfo struct {
     ObjectId        int64       `json:"objectId"        xorm:"'object_id'           bigint        comment('ObjectId')     "`
     ObjectTitle     string      `json:"objectTitle"     xorm:"'object_title'        varchar(127)  comment('Object Title') "`
     ObjectCode      string      `json:"objectCode"      xorm:"'object_code'         varchar(127)  comment('Object Code')  "`
-    ObjectOamType   int64       `json:"objectOamType"   xorm:"'object_oam_type'     bigint        comment('ObjectOamType')"`
+    OamId           int64       `json:"oamId"           xorm:"'oam_id'              bigint        comment('oamId')        "`
+    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('描述')          "`
 }
 
 func (t *ApiTransUnitInfo) TableName() string {

viewmodels/module_info.go

@@ -1,10 +1,10 @@
 package viewmodels
 
 type ModuleInfo struct {
-    ModuleId    int64  `json:"modId"      xorm:"'mod_id'      bigint      pk comment('主键ID')        "`
-    ModuleTitle string `json:"modTitle"   xorm:"'mod_title'   varchar(50)    comment('群组类型名称')   "`
-    ModuleDesc  string `json:"modDesc"    xorm:"'mod_desc'    varchar(50)    comment('描述')          "`
-    IsFixed     int64  `json:"isFixed"    xorm:"'is_fixed'    bigint         comment('是否可修改')     "`
+    ModuleId    int64  `json:"moduleId"      xorm:"'module_id'      bigint      pk comment('主键ID')        "`
+    ModuleTitle string `json:"moduleTitle"   xorm:"'module_title'   varchar(50)    comment('群组类型名称')   "`
+    ModuleDesc  string `json:"moduleDesc"    xorm:"'module_desc'    varchar(50)    comment('描述')          "`
+    IsFixed     int64  `json:"isFixed"       xorm:"'is_fixed'       bigint         comment('是否可修改')     "`
 }
 
 func (t *ModuleInfo) TableName() string {

viewmodels/object_oam_info.go

@@ -8,7 +8,11 @@ type ObjectOAMInfo struct {
     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')           "`
-    OamStatement string    `json:"oamStatement"    xorm:"'oam_statement'   varchar(1023)  comment('Statement')      "`
+    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('描述')            "`
 }
 

web/controllers/api_controller.go

@@ -14,20 +14,20 @@ type ApiController struct {
 func (c *ApiController) BeforeActivation(b mvc.BeforeActivation) {
     b.Handle("GET",         "/",                                                        "GetList"       )
     b.Handle("GET",         "/page",                                                    "GetPage"       )
-    b.Handle("GET",         "/{modId:int64}/{apiId:int64}",                             "GetById"       )
+    b.Handle("GET",         "/{moduleId:int64}/{apiId:int64}",                             "GetById"       )
     b.Handle("POST",        "/add",                                                     "Create"        )
     b.Handle("PUT",         "/update",                                                  "Update"        )
-    b.Handle("PUT",         "/updateStatus/{modId:int64}/{apiId:int64}/{status:int64}", "UpdateStatus"  )
-    b.Handle("DELETE",      "/{modId:int64}/{apiId:int64}",                             "DeleteByID"    )
+    b.Handle("PUT",         "/updateStatus/{moduleId:int64}/{apiId:int64}/{status:int64}", "UpdateStatus"  )
+    b.Handle("DELETE",      "/{moduleId:int64}/{apiId:int64}",                             "DeleteByID"    )
 }
 
 func (c *ApiController) GetList() *JsonResult {
-    params  := c.buildParams()
-    modId   := c.Ctx.URLParamInt64Default("modId", 0)
-    if modId <= 0 {
+    params   := c.buildParams()
+    moduleId := c.Ctx.URLParamInt64Default("moduleId", 0)
+    if moduleId <= 0 {
         return ResultErr("参数不完整", nil)
     }
-    params["modId"] = modId
+    params["moduleId"] = moduleId
     data, err := c.Service.GetList(params)
     if err != nil {
         return ResultErr(err.Error(), nil)
@@ -37,13 +37,13 @@ func (c *ApiController) GetList() *JsonResult {
 }
 
 func (c *ApiController) GetPage() *JsonResult {
-    params  := c.buildParams()
-    modId   := c.Ctx.URLParamInt64Default("modId", 0)
-    if modId <= 0 {
+    params     := c.buildParams()
+    moduleId   := c.Ctx.URLParamInt64Default("moduleId", 0)
+    if moduleId <= 0 {
         return ResultErr("参数不完整", nil)
     }
     
-    params["modId"] = modId
+    params["moduleId"] = moduleId
     data, err := c.Service.GetPage(params)
     if err != nil {
         return ResultErr(err.Error(), nil)
@@ -52,8 +52,8 @@ func (c *ApiController) GetPage() *JsonResult {
     }
 }
 
-func (c *ApiController) GetById(modId, apiId int64) *JsonResult {
-    data, err := c.Service.GetById(modId, apiId)
+func (c *ApiController) GetById(moduleId, apiId int64) *JsonResult {
+    data, err := c.Service.GetById(moduleId, apiId)
     if err != nil {
         return ResultErr(err.Error(), nil)
     } else {
@@ -93,19 +93,19 @@ func (c *ApiController) Update() *JsonResult {
     }
 }
 
-func (c *ApiController) UpdateStatus(modId, apiId, status int64)*JsonResult{
-    if err := c.Service.ChangeStatus(modId, apiId, status); err != nil {
+func (c *ApiController) UpdateStatus(moduleId, apiId, status int64)*JsonResult{
+    if err := c.Service.ChangeStatus(moduleId, apiId, status); err != nil {
         return ResultErr(err.Error(), nil)
     } else {
         return ResultOk("状态变更成功", nil)
     }
 }
 
-func (c *ApiController) DeleteByID(modId, apiId int64) *JsonResult {
+func (c *ApiController) DeleteByID(moduleId, apiId int64) *JsonResult {
     userId := c.GetCurUserId()
     
     m := make(map[string]interface{})
-    m["modId"]     = modId
+    m["moduleId"]     = moduleId
     m["apiId"]     = apiId
     m["deletedBy"] = userId
     if err := c.Service.Delete(m); err != nil {

web/controllers/api_gateway_controller.go

@@ -19,7 +19,7 @@ func (c *ApiGatewayController) BeforeActivation(b mvc.BeforeActivation) {
     b.Handle("DELETE",      "/{apiCode:string}",              "Delete"  )
 }
 
-func (c *ApiGatewayController) Get(apiCode string) *JsonResult {
+func (c *ApiGatewayController) Get(apiCode string)*JsonResult {
     m := c.buildParams()
     data, err := c.Service.Get(apiCode, m)
     
@@ -33,7 +33,7 @@ func (c *ApiGatewayController) Get(apiCode string) *JsonResult {
     }
 }
 
-func (c *ApiGatewayController) Create(apiCode string) *JsonResult {
+func (c *ApiGatewayController) Create(apiCode string)*JsonResult {
     m, err := c.GetJsonData()
     if err != nil {
         return ResultErr(err.Error(), nil)
@@ -47,7 +47,7 @@ func (c *ApiGatewayController) Create(apiCode string) *JsonResult {
     }
 }
 
-func (c *ApiGatewayController) Update(apiCode string) *JsonResult {
+func (c *ApiGatewayController) Update(apiCode string)*JsonResult {
     m, err := c.GetJsonData()
     if err != nil {
         return ResultErr(err.Error(), nil)
@@ -75,7 +75,7 @@ func (c *ApiGatewayController) Patch(apiCode string)*JsonResult{
     }
 }
 
-func (c *ApiGatewayController) Delete(apiCode string) *JsonResult {
+func (c *ApiGatewayController) Delete(apiCode string)*JsonResult {
     m, err := c.GetJsonData()
     if err != nil {
         return ResultErr(err.Error(), nil)

web/controllers/api_trans_unit_controller.go

@@ -12,12 +12,13 @@ type ApiTransUnitController struct {
 }
 
 func (c *ApiTransUnitController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",         "/",                                "GetList"       )
-    b.Handle("GET",         "/page",                            "GetPage"       )
-    b.Handle("GET",         "/{apiId:int64}/{atuId:int64}",     "GetById"       )
-    b.Handle("POST",        "/add",                             "Create"        )
-    b.Handle("PUT",         "/update",                          "Update"        )
-    b.Handle("DELETE",      "/{apiId:int64}/{atuId:int64}",     "DeleteByID"    )
+    b.Handle("GET",         "/",                                                "GetList"       )
+    b.Handle("GET",         "/generate/params/{apiCode:string}",                "GenerateParams")
+    b.Handle("GET",         "/page",                                            "GetPage"       )
+    b.Handle("GET",         "/{moduleId:int64}/{apiId:int64}/{atuId:int64}",    "GetById"       )
+    b.Handle("POST",        "/add",                                             "Create"        )
+    b.Handle("PUT",         "/update",                                          "Update"        )
+    b.Handle("DELETE",      "/{moduleId:int64}/{apiId:int64}/{atuId:int64}",    "DeleteByID"    )
 }
 
 func (c *ApiTransUnitController) GetList() *JsonResult {
@@ -40,8 +41,8 @@ func (c *ApiTransUnitController) GetPage() *JsonResult {
     }
 }
 
-func (c *ApiTransUnitController) GetById(apiId, atuId int64) *JsonResult {
-    data, err := c.Service.GetById(apiId, atuId)
+func (c *ApiTransUnitController) GetById(moduleId, apiId, atuId int64) *JsonResult {
+    data, err := c.Service.GetById(moduleId, apiId, atuId)
     if err != nil {
         return ResultErr(err.Error(), nil)
     } else {
@@ -82,10 +83,11 @@ func (c *ApiTransUnitController) Update() *JsonResult {
     }
 }
 
-func (c *ApiTransUnitController) DeleteByID(apiId, atuId int64) *JsonResult {
+func (c *ApiTransUnitController) DeleteByID(moduleId, apiId, atuId int64) *JsonResult {
     userId := c.GetCurUserId()
     
     m := make(map[string]interface{})
+    m["moduleId"]  = moduleId
     m["apiId"]     = apiId
     m["atuId"]     = atuId
     m["deletedBy"] = userId
@@ -96,4 +98,12 @@ func (c *ApiTransUnitController) DeleteByID(apiId, atuId int64) *JsonResult {
     }
 }
 
+func (c *ApiTransUnitController) GenerateParams(apiCode string) *JsonResult {
+    data, err := c.Service.GenerateParams(apiCode);
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("生成成功", data)
+    }
+}
 

web/controllers/base_controller.go

@@ -114,7 +114,7 @@ type RetCode int
 
 // Result Code List
 const (
-	RetOk  RetCode = 0
+	RetOk  RetCode = 200
 	RetErr RetCode = 500
 )
 

web/controllers/module_controller.go

@@ -12,12 +12,12 @@ type ModuleController struct {
 }
 
 func (c *ModuleController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",         "/",                "GetList"   )
-    b.Handle("GET",         "/page",            "GetPage"   )
-    b.Handle("GET",         "/{modId:int64}",   "GetById"   )
-    b.Handle("POST",        "/add",             "Create"    )
-    b.Handle("PUT",         "/update",          "Update"    )
-    b.Handle("DELETE",      "/{modId:int64}",   "DeleteByID")
+    b.Handle("GET",         "/",                    "GetList"   )
+    b.Handle("GET",         "/page",                "GetPage"   )
+    b.Handle("GET",         "/{moduleId:int64}",    "GetById"   )
+    b.Handle("POST",        "/add",                 "Create"    )
+    b.Handle("PUT",         "/update",              "Update"    )
+    b.Handle("DELETE",      "/{moduleId:int64}",    "DeleteByID")
 }
 
 func (c *ModuleController) GetList() *JsonResult {
@@ -40,9 +40,9 @@ func (c *ModuleController) GetPage() *JsonResult {
     }
 }
 
-func (c *ModuleController) GetById(modId int64) *JsonResult {
+func (c *ModuleController) GetById(moduleId int64) *JsonResult {
     
-    data, err := c.Service.GetById(modId)
+    data, err := c.Service.GetById(moduleId)
     if err != nil {
         return ResultErr(err.Error(), nil)
     } else {
@@ -53,14 +53,14 @@ func (c *ModuleController) GetById(modId int64) *JsonResult {
 func (c *ModuleController) Create() *JsonResult {
     userId := c.GetCurUserId()
     
-    mod := datamodels.Module{}
-    mod.CreatedBy = userId
-    if err := c.Ctx.ReadJSON(&mod); err != nil {
+    module := datamodels.Module{}
+    module.CreatedBy = userId
+    if err := c.Ctx.ReadJSON(&module); err != nil {
         return ResultErr("读取数据失败", nil)
     }
     
     
-    if err := c.Service.Create(&mod); err != nil {
+    if err := c.Service.Create(&module); err != nil {
         return ResultErr(err.Error(), nil)
     } else {
         return ResultOk("新增成功", nil)
@@ -70,24 +70,24 @@ func (c *ModuleController) Create() *JsonResult {
 func (c *ModuleController) Update() *JsonResult {
     userId := c.GetCurUserId()
     
-    mod  := datamodels.Module{}
-    if err := c.Ctx.ReadJSON(&mod); err != nil {
+    module  := datamodels.Module{}
+    if err := c.Ctx.ReadJSON(&module); err != nil {
         return ResultErr("读取数据失败", nil)
     }
     
-    mod.UpdatedBy = userId
-    if err := c.Service.Update(&mod); err != nil {
+    module.UpdatedBy = userId
+    if err := c.Service.Update(&module); err != nil {
         return ResultErr(err.Error(), nil)
     } else {
         return ResultOk("更新成功", nil)
     }
 }
 
-func (c *ModuleController) DeleteByID(modId int64) *JsonResult {
+func (c *ModuleController) DeleteByID(moduleId int64) *JsonResult {
     userId := c.GetCurUserId()
     
     m := make(map[string]interface{})
-    m["modId"]   = modId
+    m["moduleId"]  = moduleId
     m["deletedBy"] = userId
     if err := c.Service.Delete(m); err != nil {
         return ResultErr(err.Error(), nil)

web/controllers/object_oam_controller.go

@@ -13,11 +13,10 @@ type ObjectOAMController struct {
 
 func (c *ObjectOAMController) 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}/{oamId: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",  "/{modelId:int64}/{objectId:int64}/{oamId:int64}", "DeleteByID")
 }
 
 func (c *ObjectOAMController) GetList() *JsonResult {

web/middleware/auth.go

@@ -25,7 +25,7 @@ type xHeaders struct {
 }
 
 func GenerateToken(ocId, ocTypeId, userId int64) (string, error) {
-	signer := jwt.NewSigner(jwt.HS256, sigKey, 10*time.Minute)
+	signer := jwt.NewSigner(jwt.HS256, sigKey, 24*time.Hour)
 
 	claims := XClaims{OcId: ocId, OcTypeId: ocTypeId, UserId: userId}
 	token, err := signer.Sign(claims)
@@ -36,7 +36,6 @@ func GenerateToken(ocId, ocTypeId, userId int64) (string, error) {
 }
 
 func AuthToken(ctx iris.Context) {
-
 	var hs xHeaders
 	if err := ctx.ReadHeaders(&hs); err != nil {
 		_ = ctx.JSON(utils.HttpStatusErr(utils.HTTP_STATUS_ERR, err.Error(), nil))

web/router/routes.go

@@ -161,6 +161,11 @@ func Configure(b *bootstrap.Bootstrapper) {
 		objectAttrApp := mvc.New(modelParty.Party("/object/attribute"))
 		objectAttrApp.Register(objectAttrService)
 		objectAttrApp.Handle(new(controllers.ObjectAttrController))
+		
+		objectOAMService := service.NewObjectOAMService()
+		objectOAMApp := mvc.New(modelParty.Party("/object/oam"))
+		objectOAMApp.Register(objectOAMService)
+		objectOAMApp.Handle(new(controllers.ObjectOAMController))
 	}
 	
 	// DaaS