init

datamodels/biz_object.go

@@ -9,7 +9,6 @@ type BizObject struct {
     ObjectTitle string    `json:"objectTitle"     xorm:"'object_title'    varchar(127)   comment('Object Title')   "`
     ObjectCode  string    `json:"objectCode"      xorm:"'object_code'     varchar(127)   comment('Object Code')    "`
     Comment     string    `json:"comment"         xorm:"'comment'         varchar(255)   comment('Comment')        "`
-    IsFixed     int64     `json:"isFixed"         xorm:"'is_fixed'        int            comment('Is Fixed')       "`
     CreatedBy   int64     `json:"createdBy"       xorm:"'created_by'"`
     CreatedAt   time.Time `json:"createdAt"       xorm:"'created_at'"`
     UpdatedBy   int64     `json:"updatedBy"       xorm:"'updated_by'"`

datamodels/biz_object_attr.go

@@ -25,5 +25,5 @@ type BizObjectAttr struct {
 }
 
 func (t *BizObjectAttr) TableName() string {
-    return "ds_object_attr"
+    return "biz_object_attr"
 }

repositories/api_module_repo.go

@@ -8,17 +8,17 @@ import (
     "xps/viewmodels"
 )
 
-type ModuleRepo struct {
+type ApiModuleRepo struct {
     engine *xorm.Engine
 }
 
-func NewModuleRepo(engine *xorm.Engine) *ModuleRepo {
-    return &ModuleRepo{
+func NewApiModuleRepo(engine *xorm.Engine) *ApiModuleRepo {
+    return &ApiModuleRepo{
         engine: engine,
     }
 }
 
-func (d *ModuleRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+func (d *ApiModuleRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
     limit     := m["limit"].(int)
     page      := m["page"].(int)
     
@@ -54,7 +54,7 @@ func (d *ModuleRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
     return pageResult, nil
 }
 
-func (d *ModuleRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiModuleInfo, error) {
+func (d *ApiModuleRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiModuleInfo, error) {
     sqlSelect := ` SELECT A.*                 `
     sqlFrom   := ` FROM  api_module   AS A    `
     sqlWhere  := ` WHERE A.deleted_flag = 0   `
@@ -72,7 +72,7 @@ func (d *ModuleRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiModuleIn
     }
 }
 
-func (d *ModuleRepo) GetById(moduleId int64) (*viewmodels.ApiModuleInfo, error) {
+func (d *ApiModuleRepo) GetById(moduleId int64) (*viewmodels.ApiModuleInfo, error) {
     sqlSelect := ` SELECT A.*                 `
     sqlFrom   := ` FROM  api_module   AS A    `
     sqlWhere  := ` WHERE A.deleted_flag = 0   `
@@ -87,13 +87,13 @@ func (d *ModuleRepo) GetById(moduleId int64) (*viewmodels.ApiModuleInfo, error)
     }
 }
 
-func (d *ModuleRepo) Create(data *datamodels.ApiModule) error {
+func (d *ApiModuleRepo) Create(data *datamodels.ApiModule) error {
     data.CreatedAt = time.Now()
     _, err := d.engine.Insert(data)
     return err
 }
 
-func (d *ModuleRepo) Update(data *datamodels.ApiModule) error {
+func (d *ApiModuleRepo) Update(data *datamodels.ApiModule) error {
     moduleId := data.ModuleId
     
     data.UpdatedAt = time.Now()
@@ -103,7 +103,7 @@ func (d *ModuleRepo) Update(data *datamodels.ApiModule) error {
     return err
 }
 
-func (d *ModuleRepo) Delete(m map[string]interface{}) error {
+func (d *ApiModuleRepo) Delete(m map[string]interface{}) error {
     moduleId  := m["moduleId"].(int64)
     deletedBy := m["deletedBy"].(int64)
     

repositories/biz_object_repo.go

@@ -57,7 +57,7 @@ func (d *BizObjectRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResul
 }
 
 func (d *BizObjectRepo) GetList(m map[string]interface{}) ([]viewmodels.BizObjectInfo, error) {
-    bizId   := m["bizId"].(int64)
+    bizId     := m["bizId"].(int64)
     
     sqlSelect := ` SELECT    A.*,
                              B.biz_title      `
@@ -131,7 +131,7 @@ func (d *BizObjectRepo) Update(data *datamodels.BizObject) error {
 }
 
 func (d *BizObjectRepo) Delete(m map[string]interface{}) error {
-    bizId   := m["bizId"].(int64)
+    bizId     := m["bizId"].(int64)
     objectId  := m["objectId"].(int64)
     deletedBy := m["deletedBy"].(int64)
     

service/api_module_service.go

@@ -16,37 +16,37 @@ type ApiModuleService interface {
     Delete(m map[string]interface{}) error
 }
 
-type moduleService struct {
-    repo *repositories.ModuleRepo
+type apiModuleService struct {
+    repo *repositories.ApiModuleRepo
 }
 
-func NewModuleService() ApiModuleService {
-    return &moduleService{
-        repo: repositories.NewModuleRepo(datasource.InstanceMaster()),
+func NewApiModuleService() ApiModuleService {
+    return &apiModuleService{
+        repo: repositories.NewApiModuleRepo(datasource.InstanceMaster()),
     }
 }
 
-func (s *moduleService) GetList(m map[string]interface{}) ([]viewmodels.ApiModuleInfo, error) {
+func (s *apiModuleService) GetList(m map[string]interface{}) ([]viewmodels.ApiModuleInfo, error) {
     return s.repo.GetList(m)
 }
 
-func (s *moduleService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+func (s *apiModuleService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
     return s.repo.GetPage(m)
 }
 
-func (s *moduleService) GetById(moduleId int64) (*viewmodels.ApiModuleInfo, error) {
+func (s *apiModuleService) GetById(moduleId int64) (*viewmodels.ApiModuleInfo, error) {
     return s.repo.GetById(moduleId)
 }
 
-func (s *moduleService) Create(m *datamodels.ApiModule) error {
+func (s *apiModuleService) Create(m *datamodels.ApiModule) error {
     m.ModuleId = NewID()
     return s.repo.Create(m)
 }
 
-func (s *moduleService) Update(m *datamodels.ApiModule) error {
+func (s *apiModuleService) Update(m *datamodels.ApiModule) error {
     return s.repo.Update(m)
 }
 
-func (s *moduleService) Delete(m map[string]interface{}) error {
+func (s *apiModuleService) Delete(m map[string]interface{}) error {
     return s.repo.Delete(m)
 }

service/biz_object_service.go

@@ -101,7 +101,6 @@ func (s *bizObjectService) CreateObjectData(o *viewmodels.BizObjectData) error {
         ObjectTitle: o.ObjectTitle,
         ObjectCode:  o.ObjectCode,
         Comment:     o.Comment,
-        IsFixed:     0,
         CreatedBy:   createdBy,
         CreatedAt:   time.Now(),
     }
@@ -116,7 +115,7 @@ func (s *bizObjectService) CreateObjectData(o *viewmodels.BizObjectData) error {
     for _, a := range o.Attrs {
         newId := NewID()
         objectAttr := &datamodels.BizObjectAttr{
-            BizId:      bizId,
+            BizId:        bizId,
             ObjectId:     objectId,
             AttrId:       newId,
             AttrTitle:    a.AttrTitle,
@@ -159,7 +158,6 @@ func (s *bizObjectService) CreateObjectData(o *viewmodels.BizObjectData) error {
         ObjectTitle: o.ObjectTitle,
         ObjectCode:  o.ObjectCode,
         Comment:     o.Comment,
-        IsFixed:     o.IsFixed,
         Attrs:       attrsCache,
     }
     
@@ -185,7 +183,6 @@ func (s *bizObjectService) UpdateObjectData(o *viewmodels.BizObjectData) error {
         ObjectTitle: o.ObjectTitle,
         ObjectCode:  o.ObjectCode,
         Comment:     o.Comment,
-        IsFixed:     0,
         UpdatedBy:   updatedBy,
     }
     
@@ -246,7 +243,6 @@ func (s *bizObjectService) UpdateObjectData(o *viewmodels.BizObjectData) error {
         ObjectTitle: o.ObjectTitle,
         ObjectCode:  o.ObjectCode,
         Comment:     o.Comment,
-        IsFixed:     o.IsFixed,
         Attrs:       attrsCache,
     }
     

viewmodels/biz_object_data.go

@@ -6,10 +6,9 @@ type BizObjectData struct {
     BizTitle    string           `json:"bizTitle"        xorm:"'biz_title'       varchar(127)   comment('Biz Title') "`
     ObjectId    int64            `json:"objectId"        xorm:"'object_id'       bigint      pk comment('主键ID')      "`
     ObjectType  int64            `json:"objectType"      xorm:"'object_type'     bigint         comment('Type')       "`
-    ObjectTitle string           `json:"objectTitle"     xorm:"'object_title'    varchar(127)   comment('模型名称')    "`
-    ObjectCode  string           `json:"objectCode"      xorm:"'object_code'     varchar(127)   comment('模型名称')    "`
+    ObjectTitle string           `json:"objectTitle"     xorm:"'object_title'    varchar(127)   comment('Object Title')"`
+    ObjectCode  string           `json:"objectCode"      xorm:"'object_code'     varchar(127)   comment('Object Code') "`
     Comment     string           `json:"comment"         xorm:"'comment'         varchar(255)   comment('描述')       "`
-    IsFixed     int64            `json:"isFixed"         xorm:"'is_fixed'        int            comment('是否可修改')  "`
     CreatedBy   int64            `json:"createdBy"       xorm:"'created_by'"`
     CreatedAt   time.Time        `json:"createdAt"       xorm:"'created_at'"`
     UpdatedBy   int64            `json:"updatedBy"       xorm:"'updated_by'"`

viewmodels/biz_object_data_info.go

@@ -1,6 +1,9 @@
 package viewmodels
 
-import "time"
+import (
+    "encoding/json"
+    "time"
+)
 
 type BizObjectDataInfo struct {
     BizId       int64            `json:"bizId"           xorm:"'biz_id'          bigint      pk comment('主键ID')      "`
@@ -18,3 +21,11 @@ type BizObjectDataInfo struct {
 func (t *BizObjectDataInfo) TableName() string {
     return "biz_object"
 }
+
+func (g *BizObjectDataInfo) MarshalBinary() (data []byte, err error){
+    return json.Marshal(g)
+}
+
+func (g *BizObjectDataInfo) UnmarshalBinary(data []byte) (err error){
+    return json.Unmarshal(data, g)
+}

web/controllers/biz_object_controller.go

@@ -22,11 +22,11 @@ func (c *BizObjectController) BeforeActivation(b mvc.BeforeActivation) {
 
 func (c *BizObjectController) GetList() *JsonResult {
     params  := c.buildParams()
-    modelId := c.Ctx.URLParamInt64Default("modelId", 0)
-    if modelId <= 0 {
+    bizId := c.Ctx.URLParamInt64Default("bizId", 0)
+    if bizId <= 0 {
         return ResultErr("参数不完整", nil)
     }
-    params["modelId"] = modelId
+    params["bizId"] = bizId
     data, err := c.Service.GetList(params)
     if err != nil {
         return ResultErr(err.Error(), nil)
@@ -37,12 +37,12 @@ func (c *BizObjectController) GetList() *JsonResult {
 
 func (c *BizObjectController) GetPage() *JsonResult {
     params  := c.buildParams()
-    modelId := c.Ctx.URLParamInt64Default("modelId", 0)
-    if modelId <= 0 {
+    bizId   := c.Ctx.URLParamInt64Default("bizId", 0)
+    if bizId <= 0 {
         return ResultErr("参数不完整", nil)
     }
     
-    params["modelId"] = modelId
+    params["bizId"] = bizId
     data, err := c.Service.GetPage(params)
     if err != nil {
         return ResultErr(err.Error(), nil)
@@ -51,8 +51,8 @@ func (c *BizObjectController) GetPage() *JsonResult {
     }
 }
 
-func (c *BizObjectController) GetById(modelId, objectId int64) *JsonResult {
-    data, err := c.Service.GetObjectDataById(modelId, objectId)
+func (c *BizObjectController) GetById(bizId, objectId int64) *JsonResult {
+    data, err := c.Service.GetObjectDataById(bizId, objectId)
     if err != nil {
         return ResultErr(err.Error(), nil)
     } else {
@@ -92,11 +92,11 @@ func (c *BizObjectController) Update() *JsonResult {
     }
 }
 
-func (c *BizObjectController) DeleteByID(modelId, objectId int64) *JsonResult {
+func (c *BizObjectController) DeleteByID(bizId, objectId int64) *JsonResult {
     userId := c.GetCurUserId()
     
     m := make(map[string]interface{})
-    m["modelId"]   = modelId
+    m["bizId"]     = bizId
     m["objectId"]  = objectId
     m["deletedBy"] = userId
     if err := c.Service.Delete(m); err != nil {

web/router/routes.go

@@ -218,23 +218,23 @@ func Configure(b *bootstrap.Bootstrapper) {
 	apiParty := b.Party("/api", crs).AllowMethods(iris.MethodOptions)
 	{
 		apiParty.Use(middleware.AuthToken)
-		apiModuleService := service.NewApiService()
+		apiModuleService := service.NewApiModuleService()
 		apiModuleApp := mvc.New(apiParty.Party("/module"))
 		apiModuleApp.Register(apiModuleService)
 		apiModuleApp.Handle(new(controllers.ApiModuleController))
 		
 		apiService := service.NewApiService()
-		apiApp := mvc.New(apiParty.Party("/api"))
+		apiApp := mvc.New(apiParty.Party(""))
 		apiApp.Register(apiService)
 		apiApp.Handle(new(controllers.ApiController))
 		
 		apiLogService := service.NewApiLogService()
-		apiLogApp := mvc.New(apiParty.Party("/api/log"))
+		apiLogApp := mvc.New(apiParty.Party("/log"))
 		apiLogApp.Register(apiLogService)
 		apiLogApp.Handle(new(controllers.ApiLogController))
 		
 		atuService := service.NewApiTransUnitService()
-		apiAtuApp := mvc.New(apiParty.Party("/api/atu"))
+		apiAtuApp := mvc.New(apiParty.Party("/atu"))
 		apiAtuApp.Register(atuService)
 		apiAtuApp.Handle(new(controllers.ApiTransUnitController))
 	}