init

cache/redis.go

@@ -125,7 +125,10 @@ func GetModelObjectAttrs(objectCode string)([]viewmodels.ModelObjectAttrInfo, er
 	}
 	
 	modelObjectAttrInfo := make([]viewmodels.ModelObjectAttrInfo, 0)
-	json.Unmarshal(bytes, modelObjectAttrInfo)
+	err = json.Unmarshal(bytes, &modelObjectAttrInfo)
+	if err != nil {
+		return nil, err
+	}
 	return modelObjectAttrInfo, nil
 }
 
@@ -168,7 +171,7 @@ func GetBizObjectAttrs(objectCode string)([]viewmodels.BizObjectAttrInfo, error)
 	}
 	
 	bizObjectAttrs := make([]viewmodels.BizObjectAttrInfo, 0)
-	err2 := json.Unmarshal(bytes, bizObjectAttrs)
+	err2 := json.Unmarshal(bytes, &bizObjectAttrs)
 	if err2 != nil {
 		return nil, err2
 	}
@@ -212,7 +215,7 @@ func GetBizObjectOAMRules(objectCode, oamCode string)([]viewmodels.BizObjectOAMR
 	}
 	
 	dataList := make([]viewmodels.BizObjectOAMRuleInfo, 0)
-	err2 := json.Unmarshal(bytes, dataList)
+	err2 := json.Unmarshal(bytes, &dataList)
 	if err2 != nil {
 		return nil, err2
 	}
@@ -239,7 +242,7 @@ func GetBizObjectOAMParams(objectCode, oamCode string)([]viewmodels.BizObjectOAM
 	}
 	
 	dataList := make([]viewmodels.BizObjectOAMParamsInfo, 0)
-	err2 := json.Unmarshal(bytes, dataList)
+	err2 := json.Unmarshal(bytes, &dataList)
 	if err2 != nil {
 		return nil, err2
 	}
@@ -267,7 +270,7 @@ func GetBizObjectMapping(objectCode string)([]viewmodels.BizObjectMappingInfo, e
 	}
 	
 	dataList := make([]viewmodels.BizObjectMappingInfo, 0)
-	err2 := json.Unmarshal(bytes, dataList)
+	err2 := json.Unmarshal(bytes, &dataList)
 	if err2 != nil {
 		return nil, err2
 	}

service/biz_object_attr_service.go

@@ -49,11 +49,25 @@ func (s *bizObjectAttrService) GetById(bizId, objectId, attrId int64) (*viewmode
 
 func (s *bizObjectAttrService) Create(attr *datamodels.BizObjectAttr) error {
     attr.AttrId = NewID()
-    return s.repo.Create(attr)
+    err := s.repo.Create(attr)
+    if err != nil {
+        return nil
+    }
+    
+    bizId    := attr.BizId
+    objectId := attr.ObjectId
+    return s.CacheBizObjectAttrs(bizId, objectId)
 }
 
 func (s *bizObjectAttrService) Update(attr *datamodels.BizObjectAttr) error {
-    return s.repo.Update(attr)
+    err := s.repo.Update(attr)
+    if err != nil {
+        return nil
+    }
+    
+    bizId    := attr.BizId
+    objectId := attr.ObjectId
+    return s.CacheBizObjectAttrs(bizId, objectId)
 }
 
 func (s *bizObjectAttrService) Delete(m map[string]interface{}) error {

service/biz_object_mapping_service.go

@@ -50,11 +50,25 @@ func (s *bizObjectMappingService) GetById(bizId, objectId, attrId int64) (*viewm
 
 func (s *bizObjectMappingService) Create(attr *datamodels.BizObjectMapping) error {
     attr.MappingId = NewID()
-    return s.repo.Create(attr)
+    err := s.repo.Create(attr)
+    if err != nil {
+        return nil
+    }
+    
+    bizId    := attr.BizId
+    objectId := attr.ObjectId
+    return s.CacheBizObjectMapping(bizId, objectId)
 }
 
 func (s *bizObjectMappingService) Update(attr *datamodels.BizObjectMapping) error {
-    return s.repo.Update(attr)
+    err := s.repo.Update(attr)
+    if err != nil {
+        return nil
+    }
+    
+    bizId    := attr.BizId
+    objectId := attr.ObjectId
+    return s.CacheBizObjectMapping(bizId, objectId)
 }
 
 func (s *bizObjectMappingService) Delete(m map[string]interface{}) error {

service/biz_object_oam_params_service.go

@@ -48,7 +48,10 @@ func (s *bizObjectOAMParamsService) Create(param *datamodels.BizObjectOAMParams)
         return err1
     }
     
-    return s.CacheObjectOAMParams(param.BizId, param.ObjectId, param.OamId)
+    bizId    := param.BizId
+    objectId := param.ObjectId
+    oamId    := param.OamId
+    return s.CacheObjectOAMParams(bizId, objectId, oamId)
 }
 
 func (s *bizObjectOAMParamsService) Update(param *datamodels.BizObjectOAMParams) error {
@@ -56,7 +59,11 @@ func (s *bizObjectOAMParamsService) Update(param *datamodels.BizObjectOAMParams)
     if err1 != nil {
         return err1
     }
-    return s.CacheObjectOAMParams(param.BizId, param.ObjectId, param.OamId)
+    
+    bizId    := param.BizId
+    objectId := param.ObjectId
+    oamId    := param.OamId
+    return s.CacheObjectOAMParams(bizId, objectId, oamId)
 }
 
 func (s *bizObjectOAMParamsService) Delete(m map[string]interface{}) error {

service/biz_object_oam_rule_service.go

@@ -42,20 +42,27 @@ func (s *bizObjectOAMRuleService) GetById(bizId, objectId, oamId, orId int64) (*
 func (s *bizObjectOAMRuleService) Create(or *datamodels.BizObjectOAMRule) error {
     orId    := NewID()
     or.OrId = orId
-    err1 := s.oamRuleRepo.Create(or)
-    if err1 != nil {
-        return err1
+    err := s.oamRuleRepo.Create(or)
+    if err != nil {
+        return err
     }
     
-    return s.CacheObjectOAMRules(or.BizId, or.ObjectId, or.OamId)
+    bizId    := or.BizId
+    objectId := or.ObjectId
+    oamId    := or.OamId
+    return s.CacheObjectOAMRules(bizId, objectId, oamId)
 }
 
 func (s *bizObjectOAMRuleService) Update(or *datamodels.BizObjectOAMRule) error {
-    err1 := s.oamRuleRepo.Update(or)
-    if err1 != nil {
-        return err1
+    err := s.oamRuleRepo.Update(or)
+    if err != nil {
+        return err
     }
-    return s.CacheObjectOAMRules(or.BizId, or.ObjectId, or.OamId)
+    
+    bizId    := or.BizId
+    objectId := or.ObjectId
+    oamId    := or.OamId
+    return s.CacheObjectOAMRules(bizId, objectId, oamId)
 }
 
 func (s *bizObjectOAMRuleService) Delete(m map[string]interface{}) error {

service/biz_object_oam_service.go

@@ -46,8 +46,6 @@ func (s *bizObjectOAMService) GetById(bizId, objectId, oamId int64) (*viewmodels
 }
 
 func (s *bizObjectOAMService) Create(oam *datamodels.BizObjectOAM) error {
-    bizId    := oam.BizId
-    objectId := oam.ObjectId
     oamId    := NewID()
     
     oam.OamId = oamId
@@ -55,17 +53,21 @@ func (s *bizObjectOAMService) Create(oam *datamodels.BizObjectOAM) error {
     if err != nil {
         return err
     }
+    
+    bizId    := oam.BizId
+    objectId := oam.ObjectId
     return s.CacheBizObjectOAM(bizId, objectId, oamId)
 }
 
 func (s *bizObjectOAMService) Update(oam *datamodels.BizObjectOAM) error {
-    bizId    := oam.BizId
-    objectId := oam.ObjectId
-    oamId    := oam.OamId
     err := s.repo.Update(oam)
     if err != nil {
         return err
     }
+    
+    bizId    := oam.BizId
+    objectId := oam.ObjectId
+    oamId    := oam.OamId
     return s.CacheBizObjectOAM(bizId, objectId, oamId)
 }
 

service/biz_object_service.go

@@ -16,7 +16,6 @@ type BizObjectService interface {
     Create(d *datamodels.BizObject) error
     Update(d *datamodels.BizObject) error
     Delete(m map[string]interface{}) error
-    GetObjectDataById(bizId, objectId int64) (*viewmodels.BizObjectDataInfo, error)
     
     CacheBizObject(bizId, objectId int64) error
 }
@@ -69,7 +68,7 @@ func (s *bizObjectService) Update(o *datamodels.BizObject) error {
 }
 
 func (s *bizObjectService) Delete(m map[string]interface{}) error {
-    bizId  := m["bizId"].(int64)
+    bizId    := m["bizId"].(int64)
     objectId := m["objectId"].(int64)
     err := s.bizObjectRepo.Delete(m)
     if err != nil {
@@ -78,31 +77,6 @@ func (s *bizObjectService) Delete(m map[string]interface{}) error {
     return s.bizObjectAttrRepo.DeleteByObjectId(bizId, objectId)
 }
 
-func (s *bizObjectService) GetObjectDataById(bizId, objectId int64) (*viewmodels.BizObjectDataInfo, error) {
-    objectInfo, err := s.bizObjectRepo.GetById(bizId, objectId)
-    if err != nil {
-        return nil, err
-    }
-    
-    attrs, err := s.bizObjectAttrRepo.GetListById(bizId, objectId)
-    if err != nil {
-        return nil, err
-    }
-    
-    objectDataInfo := &viewmodels.BizObjectDataInfo{
-        BizId:       objectInfo.BizId,
-        ObjectId:    objectInfo.ObjectId,
-        ObjectType:  objectInfo.ObjectType,
-        ObjectTitle: objectInfo.ObjectTitle,
-        ObjectCode:  objectInfo.ObjectCode,
-        Comment:     objectInfo.Comment,
-        IsFixed:     objectInfo.IsFixed,
-        Attrs:       attrs,
-    }
-    
-    return objectDataInfo, nil
-}
-
 func (s *bizObjectService) CacheBizObject(bizId, objectId int64) error {
     o, err1 := s.bizObjectRepo.GetById(bizId, objectId)
     if err1 != nil {

service/model_object_attr_service.go

@@ -17,6 +17,8 @@ type ModelObjectAttrService interface {
 	Create(d *datamodels.ModelObjectAttr) error
 	Update(d *datamodels.ModelObjectAttr) error
 	Delete(m map[string]interface{}) error
+	
+	CacheModelObjectAttrs(modelId, objectId int64) error
 }
 
 type modelObjectAttrService struct {

service/model_object_service.go

@@ -2,11 +2,10 @@ package service
 
 import (
 	"errors"
-	"time"
 	"xps/cache"
 	"xps/datamodels"
-    "xps/datasource"
-    "xps/repositories"
+	"xps/datasource"
+	"xps/repositories"
 	"xps/viewmodels"
 )
 
@@ -17,9 +16,6 @@ type ModelObjectService interface {
 	Create(d *datamodels.ModelObject) error
 	Update(d *datamodels.ModelObject) error
 	Delete(m map[string]interface{}) error
-	GetObjectDataById(modelId, objectId int64) (*viewmodels.ModelObjectDataInfo, error)
-	CreateObjectData(d *viewmodels.ModelObjectData) error
-	UpdateObjectData(d *viewmodels.ModelObjectData) error
 	
 	CacheModelObject(modelId, objectId int64) error
 }
@@ -67,134 +63,6 @@ func (s *modelObjectService) Delete(m map[string]interface{}) error {
 	return s.modelObjectAttrRepo.DeleteByObjectId(modelId, objectId)
 }
 
-func (s *modelObjectService) GetObjectDataById(modelId, objectId int64) (*viewmodels.ModelObjectDataInfo, error) {
-	objectInfo, err := s.modelObjectRepo.GetById(modelId, objectId)
-	if err != nil {
-		return nil, err
-	}
-	
-	attrs, err := s.modelObjectAttrRepo.GetListById(modelId, objectId)
-	if err != nil {
-		return nil, err
-	}
-
-	objectDataInfo := &viewmodels.ModelObjectDataInfo{
-		ModelId:     objectInfo.ModelId,
-		ObjectId:    objectInfo.ObjectId,
-		ObjectType:  objectInfo.ObjectType,
-		ObjectTitle: objectInfo.ObjectTitle,
-		ObjectCode:  objectInfo.ObjectCode,
-		Comment:     objectInfo.Comment,
-		IsFixed:     objectInfo.IsFixed,
-		Attrs:       attrs,
-	}
-
-	return objectDataInfo, nil
-}
-
-func (s *modelObjectService) CreateObjectData(o *viewmodels.ModelObjectData) error {
-	modelId   := o.ModelId
-	objectId  := NewID()
-	createdBy := o.CreatedBy
-	object := &datamodels.ModelObject{
-		ModelId:     modelId,
-		ObjectId:    objectId,
-		ObjectType:  o.ObjectType,
-		ObjectTitle: o.ObjectTitle,
-		ObjectCode:  o.ObjectCode,
-		Comment:     o.Comment,
-		IsFixed:     0,
-		CreatedBy:   createdBy,
-		CreatedAt:   time.Now(),
-	}
-
-	err := s.modelObjectRepo.Create(object)
-	if err != nil {
-		return err
-	}
-	
-	// cache object
-	for _, a := range o.Attrs {
-		newId := NewID()
-		objectAttr := &datamodels.ModelObjectAttr{
-			ModelId:      modelId,
-			ObjectId:     objectId,
-			AttrId:       newId,
-			AttrTitle:    a.AttrTitle,
-			AttrCode:     a.AttrCode,
-			AttrType:     a.AttrType,
-			AttrLength:   a.AttrLength,
-			AttrDecimals: a.AttrDecimals,
-			Comment:      a.Comment,
-			IsFixed:      a.IsFixed,
-			IsNotNull:    a.IsNotNull,
-			IsPKey:       a.IsPKey,
-			CreatedAt:    time.Now(),
-			CreatedBy:    createdBy,
-		}
-
-		err = s.modelObjectAttrRepo.Create(objectAttr)
-		if err != nil {
-			return err
-		}
-	}
-	
-	return 	s.CacheModelObject(modelId, objectId)
-}
-
-func (s *modelObjectService) UpdateObjectData(o *viewmodels.ModelObjectData) error {
-	modelId   := o.ModelId
-	objectId  := o.ObjectId
-	updatedBy := o.UpdatedBy
-	object := &datamodels.ModelObject{
-		ModelId:     modelId,
-		ObjectId:    objectId,
-		ObjectType:  o.ObjectType,
-		ObjectTitle: o.ObjectTitle,
-		ObjectCode:  o.ObjectCode,
-		Comment:     o.Comment,
-		IsFixed:     0,
-		UpdatedBy:   updatedBy,
-	}
-
-	err := s.modelObjectRepo.Update(object)
-	if err != nil {
-		return err
-	}
-
-	err = s.modelObjectAttrRepo.DeleteByObjectId(modelId, objectId)
-	if err != nil {
-		return err
-	}
-	
-	for _, a := range o.Attrs {
-		newId := NewID()
-		objectAttr := &datamodels.ModelObjectAttr{
-			ModelId:      modelId,
-			ObjectId:     objectId,
-			AttrId:       newId,
-			AttrTitle:    a.AttrTitle,
-			AttrCode:     a.AttrCode,
-			AttrType:     a.AttrType,
-			AttrLength:   a.AttrLength,
-			AttrDecimals: a.AttrDecimals,
-			Comment:      a.Comment,
-			IsFixed:      a.IsFixed,
-			IsNotNull:    a.IsNotNull,
-			IsPKey:       a.IsPKey,
-			CreatedBy:    updatedBy,
-		}
-
-		err = s.modelObjectAttrRepo.Create(objectAttr)
-		if err != nil {
-			return err
-		}
-	}
-	
-	return s.CacheModelObject(modelId, objectId)
-}
-
-
 func (s *modelObjectService) CacheModelObject(modelId, objectId int64) error {
 	o, err1 := s.modelObjectRepo.GetById(modelId, objectId)
 	if err1 != nil {

viewmodels/biz_object_oam_data.go

@@ -1,38 +0,0 @@
-package viewmodels
-
-import "encoding/json"
-
-type BizObjectOAMData 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')      "`
-    ObjectTitle  string    `json:"objectTitle"     xorm:"'object_title'    varchar(127)   comment('Object Title')   "`
-    ObjectType   int64     `json:"objectType"      xorm:"'object_type'     bigint         comment('Object Type')    "`
-    ObjectCode   string    `json:"objectCode"      xorm:"'object_code'     varchar(127)   comment('Object Code')    "`
-    OamId        int64     `json:"oamId"           xorm:"'oam_id'          bigint      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')      "`
-    SqlCount     string    `json:"sqlCount"        xorm:"'sql_count'       varchar(1023)  comment('Sql Count')      "`
-    SqlOrder     string    `json:"sqlOrder"        xorm:"'sql_order'       varchar(1023)  comment('Statement')      "`
-    OamDesc      string    `json:"oamDesc"         xorm:"'oam_desc'        varchar(1023)  comment('描述')            "`
-    OamRules      []BizObjectOAMRuleInfo   `json:"oamRules"`
-    OamParams     []BizObjectOAMParamsInfo `json:"oamParams"`
-}
-
-func (t *BizObjectOAMData) TableName() string {
-    return "biz_object_oam"
-}
-
-
-func (t *BizObjectOAMData) MarshalBinary() (data []byte, err error){
-    return json.Marshal(t)
-}
-
-func (t *BizObjectOAMData) UnmarshalBinary(data []byte) (err error){
-    return json.Unmarshal(data, t)
-}

web/controllers/biz_object_controller.go

@@ -52,7 +52,7 @@ func (c *BizObjectController) GetPage() *JsonResult {
 }
 
 func (c *BizObjectController) GetById(bizId, objectId int64) *JsonResult {
-    data, err := c.Service.GetObjectDataById(bizId, objectId)
+    data, err := c.Service.GetById(bizId, objectId)
     if err != nil {
         return ResultErr(err.Error(), nil)
     } else {
@@ -61,8 +61,7 @@ func (c *BizObjectController) GetById(bizId, objectId int64) *JsonResult {
 }
 
 func (c *BizObjectController) Create() *JsonResult {
-    userId     := c.GetCurUserId()
-    
+    userId := c.GetCurUserId()
     object := datamodels.BizObject{}
     if err := c.Ctx.ReadJSON(&object); err != nil {
         return ResultErr("读取数据失败", nil)
@@ -77,15 +76,14 @@ func (c *BizObjectController) Create() *JsonResult {
 }
 
 func (c *BizObjectController) Update() *JsonResult {
-    userId     := c.GetCurUserId()
-    
-    objectData := datamodels.BizObject{}
-    if err := c.Ctx.ReadJSON(&objectData); err != nil {
+    userId := c.GetCurUserId()
+    object := datamodels.BizObject{}
+    if err := c.Ctx.ReadJSON(&object); err != nil {
         return ResultErr("读取数据失败", nil)
     }
     
-    objectData.UpdatedBy = userId
-    if err := c.Service.Update(&objectData); err != nil {
+    object.UpdatedBy = userId
+    if err := c.Service.Update(&object); err != nil {
         return ResultErr(err.Error(), nil)
     } else {
         return ResultOk("更新成功", nil)

web/controllers/model_object_controller.go

@@ -1,9 +1,9 @@
 package controllers
 
 import (
-    "github.com/kataras/iris/v12/mvc"
-    "xps/service"
-    "xps/viewmodels"
+	"github.com/kataras/iris/v12/mvc"
+	"xps/datamodels"
+	"xps/service"
 )
 
 type ModelObjectController struct {
@@ -52,7 +52,7 @@ func (c *ModelObjectController) GetPage() *JsonResult {
 }
 
 func (c *ModelObjectController) GetById(modelId, objectId int64) *JsonResult {
-	data, err := c.Service.GetObjectDataById(modelId, objectId)
+	data, err := c.Service.GetById(modelId, objectId)
 	if err != nil {
 		return ResultErr(err.Error(), nil)
 	} else {
@@ -63,13 +63,13 @@ func (c *ModelObjectController) GetById(modelId, objectId int64) *JsonResult {
 func (c *ModelObjectController) Create() *JsonResult {
 	userId := c.GetCurUserId()
 	
-	objectData := viewmodels.ModelObjectData{}
+	objectData := datamodels.ModelObject{}
 	if err := c.Ctx.ReadJSON(&objectData); err != nil {
 		return ResultErr("读取数据失败", nil)
 	}
 	
 	objectData.CreatedBy = userId
-	if err := c.Service.CreateObjectData(&objectData); err != nil {
+	if err := c.Service.Create(&objectData); err != nil {
 		return ResultErr(err.Error(), nil)
 	} else {
 		return ResultOk("新增成功", nil)
@@ -79,13 +79,13 @@ func (c *ModelObjectController) Create() *JsonResult {
 func (c *ModelObjectController) Update() *JsonResult {
 	userId     := c.GetCurUserId()
 	
-	objectData := viewmodels.ModelObjectData{}
-	if err := c.Ctx.ReadJSON(&objectData); err != nil {
+	object := datamodels.ModelObject{}
+	if err := c.Ctx.ReadJSON(&object); err != nil {
 		return ResultErr("读取数据失败", nil)
 	}
-
-	objectData.UpdatedBy = userId
-	if err := c.Service.UpdateObjectData(&objectData); err != nil {
+	
+	object.UpdatedBy = userId
+	if err := c.Service.Update(&object); err != nil {
 		return ResultErr(err.Error(), nil)
 	} else {
 		return ResultOk("更新成功", nil)