|
|
@@ -8,14 +8,14 @@ import (
|
|
|
)
|
|
|
|
|
|
type ApiGatewayService interface {
|
|
|
- Get(apiCode string, m map[string]interface{})(map[string]interface{}, error)
|
|
|
- GetPage(apiCode string, m map[string]interface{})(*viewmodels.PageResult, error)
|
|
|
- GetList(apiCode string, m map[string]interface{})([]map[string]interface{}, error)
|
|
|
-
|
|
|
- Create(apiCode string, m map[string]interface{})error
|
|
|
- Update(apiCode string, m map[string]interface{})error
|
|
|
- Patch(apiCode string, m map[string]interface{})error
|
|
|
- Delete(apiCode string, m map[string]interface{})error
|
|
|
+ Get(objectCode, oamCode string, m map[string]interface{})(map[string]interface{}, error)
|
|
|
+ GetPage(objectCode, oamCode string, m map[string]interface{})(*viewmodels.PageResult, error)
|
|
|
+ GetList(objectCode, oamCode string, m map[string]interface{})([]map[string]interface{}, error)
|
|
|
+
|
|
|
+ Create(objectCode, oamCode string, m map[string]interface{})error
|
|
|
+ Update(objectCode, oamCode string, m map[string]interface{})error
|
|
|
+ Patch(objectCode, oamCode string, m map[string]interface{})error
|
|
|
+ Delete(objectCode, oamCode string, m map[string]interface{})error
|
|
|
}
|
|
|
|
|
|
type apiGatewayService struct {
|
|
|
@@ -28,63 +28,53 @@ func NewApiGatewayService() ApiGatewayService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-func (a *apiGatewayService) Get(apiCode string, m map[string]interface{})(map[string]interface{}, error) {
|
|
|
- apiDef, err1 := cache.GetApiData(apiCode)
|
|
|
- if err1 != nil{
|
|
|
+func (a *apiGatewayService) Get(objectCode, oamCode string, m map[string]interface{})(map[string]interface{}, error) {
|
|
|
+ params, err1 := a.Mapping2ModelObjectAttr(objectCode, m)
|
|
|
+ if err1 != nil {
|
|
|
return nil, err1
|
|
|
}
|
|
|
|
|
|
- objectCode := apiDef.ObjectCode
|
|
|
- params, err2 := a.Mapping2ModelField(objectCode, m)
|
|
|
+ oam , err2:= cache.GetBizObjectOAMData(objectCode, oamCode)
|
|
|
if err2 != nil {
|
|
|
return nil, err2
|
|
|
}
|
|
|
|
|
|
- sqlStatement := apiDef.SqlStatement
|
|
|
+ sqlStatement := oam.SqlStatement
|
|
|
return a.dataBus.GetById(sqlStatement, params)
|
|
|
}
|
|
|
|
|
|
-func (a *apiGatewayService) GetList(apiCode string, m map[string]interface{})([]map[string]interface{}, error) {
|
|
|
- apiDef, err1 := cache.GetApiData(apiCode)
|
|
|
- if err1 != nil{
|
|
|
- return nil, err1
|
|
|
+func (a *apiGatewayService) GetList(objectCode, oamCode string, m map[string]interface{})([]map[string]interface{}, error) {
|
|
|
+ params, err2 := a.Mapping2ModelObjectAttr(objectCode, m)
|
|
|
+ if err2 != nil {
|
|
|
+ return nil, err2
|
|
|
}
|
|
|
|
|
|
- objectCode := apiDef.ObjectCode
|
|
|
- params, err2 := a.Mapping2ModelField(objectCode, m)
|
|
|
+ oam , err2:= cache.GetBizObjectOAMData(objectCode, oamCode)
|
|
|
if err2 != nil {
|
|
|
return nil, err2
|
|
|
}
|
|
|
-
|
|
|
- sqlStatement := apiDef.SqlStatement
|
|
|
+ sqlStatement := oam.SqlStatement
|
|
|
return a.dataBus.GetList(sqlStatement, params)
|
|
|
}
|
|
|
|
|
|
-func (a *apiGatewayService) GetPage(apiCode string, m map[string]interface{}) (*viewmodels.PageResult, error) {
|
|
|
- apiDef, err1 := cache.GetApiData(apiCode)
|
|
|
- if err1 != nil{
|
|
|
+func (a *apiGatewayService) GetPage(objectCode, oamCode string, m map[string]interface{}) (*viewmodels.PageResult, error) {
|
|
|
+ params, err1 := a.Mapping2ModelObjectAttr(objectCode, m)
|
|
|
+ if err1 != nil {
|
|
|
return nil, err1
|
|
|
}
|
|
|
|
|
|
- objectCode := apiDef.ObjectCode
|
|
|
- params, err2 := a.Mapping2ModelField(objectCode, m)
|
|
|
+ oam , err2:= cache.GetBizObjectOAMData(objectCode, oamCode)
|
|
|
if err2 != nil {
|
|
|
return nil, err2
|
|
|
}
|
|
|
|
|
|
- sqlStatement := apiDef.SqlStatement
|
|
|
- sqlCount := apiDef.SqlCount
|
|
|
+ sqlStatement := oam.SqlStatement
|
|
|
+ sqlCount := oam.SqlCount
|
|
|
return a.dataBus.GetPage(sqlStatement, sqlCount, params)
|
|
|
}
|
|
|
|
|
|
-func (a *apiGatewayService) Create(apiCode string, m map[string]interface{}) error {
|
|
|
- apiDef, err1 := cache.GetApiData(apiCode)
|
|
|
- if err1 != nil{
|
|
|
- return err1
|
|
|
- }
|
|
|
-
|
|
|
- objectCode := apiDef.ObjectCode
|
|
|
- params, err2 := a.Mapping2ModelField(objectCode, m)
|
|
|
+func (a *apiGatewayService) Create(objectCode, oamCode string, m map[string]interface{}) error {
|
|
|
+ params, err2 := a.Mapping2ModelObjectAttr(objectCode, m)
|
|
|
if err2 != nil {
|
|
|
return err2
|
|
|
}
|
|
|
@@ -92,14 +82,8 @@ func (a *apiGatewayService) Create(apiCode string, m map[string]interface{}) err
|
|
|
return a.dataBus.Create(objectCode, params)
|
|
|
}
|
|
|
|
|
|
-func (a *apiGatewayService) Update(apiCode string, m map[string]interface{}) error {
|
|
|
- apiDef, err1 := cache.GetApiData(apiCode)
|
|
|
- if err1 != nil{
|
|
|
- return err1
|
|
|
- }
|
|
|
-
|
|
|
- objectCode := apiDef.ObjectCode
|
|
|
- params, err2 := a.Mapping2ModelField(objectCode, m)
|
|
|
+func (a *apiGatewayService) Update(objectCode, oamCode string, m map[string]interface{}) error {
|
|
|
+ params, err2 := a.Mapping2ModelObjectAttr(objectCode, m)
|
|
|
if err2 != nil {
|
|
|
return err2
|
|
|
}
|
|
|
@@ -107,14 +91,8 @@ func (a *apiGatewayService) Update(apiCode string, m map[string]interface{}) err
|
|
|
return a.dataBus.Update(objectCode, params)
|
|
|
}
|
|
|
|
|
|
-func (a *apiGatewayService) Patch(apiCode string, m map[string]interface{}) error {
|
|
|
- apiDef, err1 := cache.GetApiData(apiCode)
|
|
|
- if err1 != nil{
|
|
|
- return err1
|
|
|
- }
|
|
|
-
|
|
|
- objectCode := apiDef.ObjectCode
|
|
|
- params, err2 := a.Mapping2ModelField(objectCode, m)
|
|
|
+func (a *apiGatewayService) Patch(objectCode, oamCode string, m map[string]interface{}) error {
|
|
|
+ params, err2 := a.Mapping2ModelObjectAttr(objectCode, m)
|
|
|
if err2 != nil {
|
|
|
return err2
|
|
|
}
|
|
|
@@ -122,14 +100,8 @@ func (a *apiGatewayService) Patch(apiCode string, m map[string]interface{}) erro
|
|
|
return a.dataBus.Patch(objectCode, params)
|
|
|
}
|
|
|
|
|
|
-func (a *apiGatewayService) Delete(apiCode string, m map[string]interface{}) error {
|
|
|
- apiDef, err1 := cache.GetApiData(apiCode)
|
|
|
- if err1 != nil{
|
|
|
- return err1
|
|
|
- }
|
|
|
-
|
|
|
- objectCode := apiDef.ObjectCode
|
|
|
- params, err2 := a.Mapping2ModelField(objectCode, m)
|
|
|
+func (a *apiGatewayService) Delete(objectCode, oamCode string, m map[string]interface{}) error {
|
|
|
+ params, err2 := a.Mapping2ModelObjectAttr(objectCode, m)
|
|
|
if err2 != nil {
|
|
|
return err2
|
|
|
}
|
|
|
@@ -137,7 +109,7 @@ func (a *apiGatewayService) Delete(apiCode string, m map[string]interface{}) err
|
|
|
return a.dataBus.Delete(objectCode, params)
|
|
|
}
|
|
|
|
|
|
-func (a *apiGatewayService) Mapping2ModelField(objectCode string, m map[string]interface{})(map[string]interface{}, error) {
|
|
|
+func (a *apiGatewayService) Mapping2ModelObjectAttr(objectCode string, m map[string]interface{})(map[string]interface{}, error) {
|
|
|
bzObject, err := cache.GetBizObjectData(objectCode)
|
|
|
if err != nil {
|
|
|
return nil, err
|