init

cmd/datasource/dbhelper.go

@@ -49,8 +49,8 @@ func InstanceMaster() *xorm.Engine {
     engine.SetTZLocation(configs2.SysTimeLocation)
 
     //performance
-    cacher := caches.NewLRUCacher(caches.NewMemoryStore(), 1000)
-    engine.SetDefaultCacher(cacher)
+    cache := caches.NewLRUCacher(caches.NewMemoryStore(), 1000)
+    engine.SetDefaultCacher(cache)
 
     masterEngine = engine
     return engine

pkg/api/repository/api_log_repo.go

@@ -5,7 +5,7 @@ import (
     "xorm.io/xorm"
     "xps/pkg/api/datamodel"
     "xps/pkg/api/viewmodel"
-    "xps/pkg/base"
+    "xps/pkg/common"
 )
 
 type ApiLogRepo struct {
@@ -18,7 +18,7 @@ func NewApiLogRepo(engine *xorm.Engine) *ApiLogRepo {
     }
 }
 
-func (d *ApiLogRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *ApiLogRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -55,7 +55,7 @@ func (d *ApiLogRepo) GetPage(m map[string]interface{}) (*base.PageResult, error)
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/api/repository/api_repo.go

@@ -6,7 +6,7 @@ import (
     "xorm.io/xorm"
     "xps/pkg/api/datamodel"
     "xps/pkg/api/viewmodel"
-    "xps/pkg/base"
+    "xps/pkg/common"
 )
 
 type ApiRepo struct {
@@ -19,7 +19,7 @@ func NewApiRepo(engine *xorm.Engine) *ApiRepo {
     }
 }
 
-func (d *ApiRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *ApiRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -68,7 +68,7 @@ func (d *ApiRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/api/service/api_log_service.go

@@ -5,12 +5,12 @@ import (
     "xps/pkg/api/datamodel"
     "xps/pkg/api/repository"
     "xps/pkg/api/viewmodel"
-    "xps/pkg/base"
+    "xps/pkg/common"
 )
 
 type ApiLogService interface {
     GetList(m map[string]interface{}) ([]viewmodel.ApiLogInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(reqId int64) (*viewmodel.ApiLogInfo, error)
     Create(d *datamodel.ApiLog) error
 }
@@ -29,7 +29,7 @@ func (s *apiLogService) GetList(m map[string]interface{}) ([]viewmodel.ApiLogInf
     return s.repo.GetList(m)
 }
 
-func (s *apiLogService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *apiLogService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/api/service/api_service.go

@@ -7,12 +7,12 @@ import (
     "xps/pkg/api/datamodel"
     "xps/pkg/api/repository"
     "xps/pkg/api/viewmodel"
-    "xps/pkg/base"
+    "xps/pkg/common"
 )
 
 type ApiService interface {
     GetList(m map[string]interface{}) ([]viewmodel.ApiInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(apiId int64) (*viewmodel.ApiInfo, error)
     Create(d *datamodel.Api) error
     Update(d *datamodel.Api) error
@@ -36,7 +36,7 @@ func (s *apiService) GetList(m map[string]interface{}) ([]viewmodel.ApiInfo, err
     return s.apiRepo.GetList(m)
 }
 
-func (s *apiService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *apiService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.apiRepo.GetPage(m)
 }
 

pkg/app/repository/app_cat_repo.go

@@ -6,7 +6,7 @@ import (
     "xorm.io/xorm"
     "xps/pkg/app/datamodel"
     "xps/pkg/app/viewmodel"
-    "xps/pkg/base"
+    "xps/pkg/common"
 )
 
 type AppCatRepo struct {
@@ -19,7 +19,7 @@ func NewAppCatRepo(engine *xorm.Engine) *AppCatRepo {
     }
 }
 
-func (d *AppCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *AppCatRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -46,7 +46,7 @@ func (d *AppCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error)
         return nil, err2
     }
 
-    pageResult := &base.PageResult{
+    pageResult := &common.PageResult{
         Total:    total,
         PageSize: limit,
         Page:     page,

pkg/app/repository/app_repo.go

@@ -6,7 +6,7 @@ import (
     "xorm.io/xorm"
     "xps/pkg/app/datamodel"
     "xps/pkg/app/viewmodel"
-    "xps/pkg/base"
+    "xps/pkg/common"
 )
 
 type AppRepo struct {
@@ -19,7 +19,7 @@ func NewAppRepo(engine *xorm.Engine) *AppRepo {
     }
 }
 
-func (d *AppRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *AppRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page  := m["page"].(int)
 
@@ -48,7 +48,7 @@ func (d *AppRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
         return nil, err2
     }
 
-    pageResult := &base.PageResult{
+    pageResult := &common.PageResult{
         Total:    total,
         PageSize: limit,
         Page:     page,

pkg/app/service/app_cat_service.go

@@ -5,12 +5,12 @@ import (
     "xps/pkg/app/datamodel"
     "xps/pkg/app/repository"
     "xps/pkg/app/viewmodel"
-    "xps/pkg/base"
+    "xps/pkg/common"
 )
 
 type AppCatService interface {
     GetList(m map[string]interface{}) ([]viewmodel.AppCatInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(appCatId int64) (*viewmodel.AppCatInfo, error)
     Create(d *datamodel.AppCat) error
     Update(d *datamodel.AppCat) error
@@ -31,7 +31,7 @@ func (s *appCatService) GetList(m map[string]interface{}) ([]viewmodel.AppCatInf
     return s.repo.GetList(m)
 }
 
-func (s *appCatService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *appCatService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/app/service/app_service.go

@@ -5,12 +5,12 @@ import (
     "xps/pkg/app/datamodel"
     "xps/pkg/app/repository"
     "xps/pkg/app/viewmodel"
-    "xps/pkg/base"
+    "xps/pkg/common"
 )
 
 type AppService interface {
     GetList(m map[string]interface{}) ([]viewmodel.AppInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(appId int64) (*viewmodel.AppInfo, error)
     Create(d *datamodel.App) error
     Update(d *datamodel.App) error
@@ -32,7 +32,7 @@ func (s *appService) GetList(m map[string]interface{}) ([]viewmodel.AppInfo, err
     return s.appRepo.GetList(m)
 }
 
-func (s *appService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *appService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.appRepo.GetPage(m)
 }
 

pkg/biz/controller/biz_controller.go

@@ -12,13 +12,13 @@ type BizController struct {
 }
 
 func (c *BizController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",     "/",                         "GetList"    )
-    b.Handle("GET",     "/data",                     "GetTreeData")
-    b.Handle("GET",     "/page",                     "GetPage"    )
-    b.Handle("GET",     "/{bizId:int64}",             "GetById"    )
-    b.Handle("POST",     "/add",                     "Create"    )
-    b.Handle("PUT",     "/update",                     "Update"    )
-    b.Handle("DELETE",     "/{bizId:int64}",             "DeleteByID")
+    b.Handle("GET",         "/",                            "GetList"    )
+    b.Handle("GET",         "/data",                        "GetTreeData")
+    b.Handle("GET",         "/page",                        "GetPage"    )
+    b.Handle("GET",         "/{bizId:int64}",               "GetById"    )
+    b.Handle("POST",        "/add",                         "Create"     )
+    b.Handle("PUT",         "/update",                      "Update"     )
+    b.Handle("DELETE",      "/{bizId:int64}",               "DeleteByID" )
 }
 
 func (c *BizController) GetList() *JsonResult {
@@ -51,7 +51,6 @@ func (c *BizController) GetPage() *JsonResult {
 }
 
 func (c *BizController) GetById(bizId int64) *JsonResult {
-
     data, err := c.Service.GetById(bizId)
     if err != nil {
         return ResultErr(err.Error(), nil)
@@ -62,7 +61,6 @@ func (c *BizController) GetById(bizId int64) *JsonResult {
 
 func (c *BizController) Create() *JsonResult {
     userId := c.GetCurUserId()
-
     biz := datamodel.Biz{}
     biz.CreatedBy = userId
     if err := c.Ctx.ReadJSON(&biz); err != nil {
@@ -78,7 +76,6 @@ func (c *BizController) Create() *JsonResult {
 
 func (c *BizController) Update() *JsonResult {
     userId := c.GetCurUserId()
-
     biz := datamodel.Biz{}
     if err := c.Ctx.ReadJSON(&biz); err != nil {
         return ResultErr("读取数据失败", nil)
@@ -94,7 +91,6 @@ func (c *BizController) Update() *JsonResult {
 
 func (c *BizController) DeleteByID(bizId int64) *JsonResult {
     userId := c.GetCurUserId()
-
     m := make(map[string]interface{})
     m["bizId"] = bizId
     m["deletedBy"] = userId

pkg/biz/controller/biz_object_attr_controller.go

@@ -12,13 +12,13 @@ type BizObjectAttrController struct {
 }
 
 func (c *BizObjectAttrController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",     "/",                                                 "GetList"    )
-    b.Handle("GET",     "/page",                                             "GetPage"    )
-    b.Handle("GET",     "/{bizId:int64}/{objectId:int64}}",                 "GetListById")
-    b.Handle("GET",     "/{bizId:int64}/{objectId:int64}/{attrId:int64}",     "GetById"    )
-    b.Handle("POST",     "/add",                                             "Create"    )
-    b.Handle("PUT",     "/update",                                             "Update"    )
-    b.Handle("DELETE",     "/{bizId:int64}/{objectId:int64}/{attrId:int64}",     "DeleteByID")
+    b.Handle("GET",         "/",                                                    "GetList"       )
+    b.Handle("GET",         "/page",                                                "GetPage"       )
+    b.Handle("GET",         "/{bizId:int64}/{objectId:int64}}",                     "GetListById"   )
+    b.Handle("GET",         "/{bizId:int64}/{objectId:int64}/{attrId:int64}",       "GetById"       )
+    b.Handle("POST",        "/add",                                                 "Create"        )
+    b.Handle("PUT",         "/update",                                              "Update"        )
+    b.Handle("DELETE",      "/{bizId:int64}/{objectId:int64}/{attrId:int64}",       "DeleteByID"    )
 }
 
 func (c *BizObjectAttrController) GetList() *JsonResult {
@@ -61,7 +61,6 @@ func (c *BizObjectAttrController) GetListById(bizId, objectId int64) *JsonResult
 
 func (c *BizObjectAttrController) Create() *JsonResult {
     userId := c.GetCurUserId()
-
     attr := datamodel.BizObjectAttr{}
     if err := c.Ctx.ReadJSON(&attr); err != nil {
         return ResultErr("读取数据失败", nil)
@@ -77,7 +76,6 @@ func (c *BizObjectAttrController) Create() *JsonResult {
 
 func (c *BizObjectAttrController) Update() *JsonResult {
     userId := c.GetCurUserId()
-
     attr := datamodel.BizObjectAttr{}
     if err := c.Ctx.ReadJSON(&attr); err != nil {
         return ResultErr("读取数据失败", nil)
@@ -93,7 +91,6 @@ func (c *BizObjectAttrController) Update() *JsonResult {
 
 func (c *BizObjectAttrController) DeleteByID(bizId, objectId, attrId int64) *JsonResult {
     userId := c.GetCurUserId()
-
     m := make(map[string]interface{})
     m["bizId"] = bizId
     m["objectId"] = objectId

pkg/biz/controller/biz_object_controller.go

@@ -12,13 +12,13 @@ type BizObjectController struct {
 }
 
 func (c *BizObjectController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",     "/",                                 "GetList"    )
-    b.Handle("GET",     "/page",                             "GetPage"    )
-    b.Handle("GET",     "/{bizId:int64}",                     "GetListById")
-    b.Handle("GET",     "/{bizId:int64}/{objectId:int64}",     "GetById"    )
-    b.Handle("POST",     "/add",                             "Create"    )
-    b.Handle("PUT",     "/update",                             "Update"    )
-    b.Handle("DELETE",     "/{bizId:int64}/{objectId:int64}",     "DeleteByID")
+    b.Handle("GET",     "/",                                    "GetList"       )
+    b.Handle("GET",     "/page",                                "GetPage"       )
+    b.Handle("GET",     "/{bizId:int64}",                       "GetListById"   )
+    b.Handle("GET",     "/{bizId:int64}/{objectId:int64}",      "GetById"       )
+    b.Handle("POST",    "/add",                                 "Create"        )
+    b.Handle("PUT",     "/update",                              "Update"        )
+    b.Handle("DELETE",  "/{bizId:int64}/{objectId:int64}",      "DeleteByID"    )
 }
 
 func (c *BizObjectController) GetList() *JsonResult {
@@ -104,8 +104,8 @@ func (c *BizObjectController) DeleteByID(bizId, objectId int64) *JsonResult {
     userId := c.GetCurUserId()
 
     m := make(map[string]interface{})
-    m["bizId"] = bizId
-    m["objectId"] = objectId
+    m["bizId"]     = bizId
+    m["objectId"]  = objectId
     m["deletedBy"] = userId
     if err := c.Service.Delete(m); err != nil {
         return ResultErr(err.Error(), nil)

pkg/biz/controller/biz_object_mapping_controller.go

@@ -12,17 +12,17 @@ type BizObjectMappingController struct {
 }
 
 func (c *BizObjectMappingController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",     "/",                                                     "GetList"    )
-    b.Handle("GET",     "/page",                                                 "GetPage"    )
-    b.Handle("GET",     "/{bizId:int64}/{objectId:int64}/{mappingId:int64}",    "GetById"    )
-    b.Handle("GET",     "/{bizId:int64}/{objectId:int64}",                         "GetListById")
-    b.Handle("POST",     "/add",                                                 "Create"    )
-    b.Handle("DELETE",     "/{bizId:int64}/{objectId:int64}/{mappingId:int64}",     "DeleteByID")
+    b.Handle("GET",      "/",                                                    "GetList"    )
+    b.Handle("GET",      "/page",                                                "GetPage"    )
+    b.Handle("GET",      "/{bizId:int64}/{objectId:int64}/{mappingId:int64}",    "GetById"    )
+    b.Handle("GET",      "/{bizId:int64}/{objectId:int64}",                      "GetListById")
+    b.Handle("POST",     "/add",                                                 "Create"     )
+    b.Handle("DELETE",   "/{bizId:int64}/{objectId:int64}/{mappingId:int64}",    "DeleteByID" )
 }
 
 func (c *BizObjectMappingController) GetList() *JsonResult {
     params := c.buildParams()
-    bizId := c.Ctx.URLParamInt64Default("bizId", 0)
+    bizId  := c.Ctx.URLParamInt64Default("bizId", 0)
     if bizId <= 0 {
         return ResultErr("参数不完整", nil)
     }
@@ -49,7 +49,7 @@ func (c *BizObjectMappingController) GetListById(bizId, objectId int64) *JsonRes
 
 func (c *BizObjectMappingController) GetPage() *JsonResult {
     params := c.buildParams()
-    bizId := c.Ctx.URLParamInt64Default("bizId", 0)
+    bizId  := c.Ctx.URLParamInt64Default("bizId", 0)
     if bizId <= 0 {
         return ResultErr("参数不完整", nil)
     }
@@ -73,7 +73,7 @@ func (c *BizObjectMappingController) GetById(bizId, objectId, mappingId int64) *
 }
 
 func (c *BizObjectMappingController) Create() *JsonResult {
-    userId := c.GetCurUserId()
+    userId     := c.GetCurUserId()
     objectData := datamodel.BizObjectMapping{}
     if err := c.Ctx.ReadJSON(&objectData); err != nil {
         return ResultErr("读取数据失败", nil)
@@ -91,8 +91,8 @@ func (c *BizObjectMappingController) DeleteByID(bizId, objectId, mappingId int64
     userId := c.GetCurUserId()
 
     m := make(map[string]interface{})
-    m["bizId"] = bizId
-    m["objectId"] = objectId
+    m["bizId"]     = bizId
+    m["objectId"]  = objectId
     m["mappingId"] = mappingId
     m["deletedBy"] = userId
     if err := c.Service.Delete(m); err != nil {

pkg/biz/controller/biz_object_oam_controller.go

@@ -12,12 +12,12 @@ type BizObjectOAMController struct {
 }
 
 func (c *BizObjectOAMController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",     "/",                                                 "GetList"    )
-    b.Handle("GET",     "/{bizId:int64}/{objectId:int64}",                     "GetListById")
-    b.Handle("GET",     "/{bizId:int64}/{objectId:int64}/{oamId:int64}",     "GetById"    )
-    b.Handle("POST",     "/add",                                             "Create"    )
-    b.Handle("PUT",     "/update",                                             "Update"    )
-    b.Handle("DELETE",     "/{bizId:int64}/{objectId:int64}/{oamId:int64}",     "DeleteByID")
+    b.Handle("GET",     "/",                                                    "GetList"    )
+    b.Handle("GET",     "/{bizId:int64}/{objectId:int64}",                      "GetListById")
+    b.Handle("GET",     "/{bizId:int64}/{objectId:int64}/{oamId:int64}",        "GetById"    )
+    b.Handle("POST",    "/add",                                                 "Create"     )
+    b.Handle("PUT",     "/update",                                              "Update"     )
+    b.Handle("DELETE",  "/{bizId:int64}/{objectId:int64}/{oamId:int64}",        "DeleteByID" )
 }
 
 func (c *BizObjectOAMController) GetList() *JsonResult {
@@ -83,9 +83,9 @@ func (c *BizObjectOAMController) Update() *JsonResult {
 func (c *BizObjectOAMController) DeleteByID(bizId, objectId, oamId int64) *JsonResult {
     userId := c.GetCurUserId()
     m := make(map[string]interface{})
-    m["bizId"] = bizId
-    m["objectId"] = objectId
-    m["oamId"] = oamId
+    m["bizId"]     = bizId
+    m["objectId"]  = objectId
+    m["oamId"]     = oamId
     m["deletedBy"] = userId
 
     if err := c.Service.Delete(m); err != nil {

pkg/biz/controller/biz_object_oam_mapping_controller.go

@@ -12,12 +12,12 @@ type BizObjectOAMMappingController struct {
 }
 
 func (c *BizObjectOAMMappingController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",     "/",                                                                 "GetList"        )
-    b.Handle("GET",     "/{bizId:int64}/{objectId:int64}/{oamId:int64}",                     "GetListById"    )
-    b.Handle("GET",     "/{bizId:int64}/{objectId:int64}/{oamId:int64}/{mappingId:int64}",     "GetById"        )
-    b.Handle("POST",     "/add",                                                             "Create"        )
-    b.Handle("PUT",     "/update",                                                             "Update"        )
-    b.Handle("DELETE",     "/{bizId:int64}/{objectId:int64}/{oamId:int64}/{mappingId:int64}", "DeleteByID"        )
+    b.Handle("GET",     "/",                                                                "GetList"        )
+    b.Handle("GET",     "/{bizId:int64}/{objectId:int64}/{oamId:int64}",                    "GetListById"    )
+    b.Handle("GET",     "/{bizId:int64}/{objectId:int64}/{oamId:int64}/{mappingId:int64}",  "GetById"        )
+    b.Handle("POST",    "/add",                                                             "Create"         )
+    b.Handle("PUT",     "/update",                                                          "Update"         )
+    b.Handle("DELETE",  "/{bizId:int64}/{objectId:int64}/{oamId:int64}/{mappingId:int64}",  "DeleteByID"     )
 }
 
 func (c *BizObjectOAMMappingController) GetList() *JsonResult {
@@ -80,9 +80,9 @@ func (c *BizObjectOAMMappingController) Update() *JsonResult {
 
 func (c *BizObjectOAMMappingController) DeleteByID(bizId, objectId, oamId, mappingId int64) *JsonResult {
     m := make(map[string]interface{})
-    m["bizId"] = bizId
-    m["objectId"] = objectId
-    m["oamId"] = oamId
+    m["bizId"]     = bizId
+    m["objectId"]  = objectId
+    m["oamId"]     = oamId
     m["mappingId"] = mappingId
     if err := c.Service.Delete(m); err != nil {
         return ResultErr(err.Error(), nil)

pkg/biz/controller/biz_object_oam_params_controller.go

@@ -15,9 +15,9 @@ func (c *BizObjectOAMParamsController) BeforeActivation(b mvc.BeforeActivation)
     b.Handle("GET",         "/",                                                                 "GetList"    )
     b.Handle("GET",         "/{bizId:int64}/{objectId:int64}/{oamId:int64}",                     "GetListById")
     b.Handle("GET",         "/{bizId:int64}/{objectId:int64}/{oamId:int64}/{paramId:int64}",     "GetById"    )
-    b.Handle("POST",         "/add",                                                             "Create"    )
-    b.Handle("PUT",         "/update",                                                             "Update"    )
-    b.Handle("DELETE",         "/{bizId:int64}/{objectId:int64}/{oamId:int64}/{paramId:int64}",     "DeleteByID")
+    b.Handle("POST",        "/add",                                                              "Create"     )
+    b.Handle("PUT",         "/update",                                                           "Update"     )
+    b.Handle("DELETE",      "/{bizId:int64}/{objectId:int64}/{oamId:int64}/{paramId:int64}",     "DeleteByID" )
 }
 
 func (c *BizObjectOAMParamsController) GetList() *JsonResult {

pkg/biz/controller/biz_object_oam_rule_controller.go

@@ -12,12 +12,12 @@ type BizObjectOAMRuleController struct {
 }
 
 func (c *BizObjectOAMRuleController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",         "/",                                                             "GetList"    )
-    b.Handle("GET",         "/{bizId:int64}/{objectId:int64}/{oamId:int64}",                 "GetListById")
-    b.Handle("GET",         "/{bizId:int64}/{objectId:int64}/{oamId:int64}/{roId:int64}",     "GetById"    )
-    b.Handle("POST",         "/add",                                                         "Create"    )
-    b.Handle("PUT",         "/update",                                                         "Update"    )
-    b.Handle("DELETE",         "/{bizId:int64}/{objectId:int64}/{oamId:int64}/{roId:int64}",     "DeleteByID")
+    b.Handle("GET",         "/",                                                                "GetList"    )
+    b.Handle("GET",         "/{bizId:int64}/{objectId:int64}/{oamId:int64}",                    "GetListById")
+    b.Handle("GET",         "/{bizId:int64}/{objectId:int64}/{oamId:int64}/{roId:int64}",       "GetById"    )
+    b.Handle("POST",        "/add",                                                             "Create"    )
+    b.Handle("PUT",         "/update",                                                          "Update"    )
+    b.Handle("DELETE",      "/{bizId:int64}/{objectId:int64}/{oamId:int64}/{roId:int64}",       "DeleteByID")
 }
 
 func (c *BizObjectOAMRuleController) GetList() *JsonResult {

pkg/biz/controller/biz_rule_controller.go

@@ -12,12 +12,12 @@ type BizRuleController struct {
 }
 
 func (c *BizRuleController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",         "/",                             "GetList"    )
-    b.Handle("GET",         "/page",                         "GetPage"    )
-    b.Handle("GET",         "/{ruleId:int64}",                 "GetById"    )
-    b.Handle("POST",         "/add",                         "Create"    )
-    b.Handle("PUT",         "/update",                         "Update"    )
-    b.Handle("DELETE",         "/{ruleId:int64}",                 "DeleteByID")
+    b.Handle("GET",         "/",                             "GetList"   )
+    b.Handle("GET",         "/page",                         "GetPage"   )
+    b.Handle("GET",         "/{ruleId:int64}",               "GetById"   )
+    b.Handle("POST",        "/add",                          "Create"    )
+    b.Handle("PUT",         "/update",                       "Update"    )
+    b.Handle("DELETE",      "/{ruleId:int64}",               "DeleteByID")
 }
 
 func (c *BizRuleController) GetList() *JsonResult {
@@ -68,8 +68,7 @@ func (c *BizRuleController) Create() *JsonResult {
 
 func (c *BizRuleController) Update() *JsonResult {
     userId := c.GetCurUserId()
-
-    rule := datamodel.BizRule{}
+    rule   := datamodel.BizRule{}
     if err := c.Ctx.ReadJSON(&rule); err != nil {
         return ResultErr("读取数据失败", nil)
     }
@@ -84,9 +83,8 @@ func (c *BizRuleController) Update() *JsonResult {
 
 func (c *BizRuleController) DeleteByID(ruleId int64) *JsonResult {
     userId := c.GetCurUserId()
-
     m := make(map[string]interface{})
-    m["ruleId"] = ruleId
+    m["ruleId"]    = ruleId
     m["deletedBy"] = userId
     if err := c.Service.Delete(m); err != nil {
         return ResultErr(err.Error(), nil)

pkg/biz/repository/biz_object_attr_repo.go

@@ -4,9 +4,9 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
     "xps/pkg/biz/datamodel"
     "xps/pkg/biz/viewmodel"
+    "xps/pkg/common"
 )
 
 type BizObjectAttrRepo struct {
@@ -19,7 +19,7 @@ func NewBizObjectAttrRepo(engine *xorm.Engine) *BizObjectAttrRepo {
     }
 }
 
-func (d *BizObjectAttrRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *BizObjectAttrRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -48,7 +48,7 @@ func (d *BizObjectAttrRepo) GetPage(m map[string]interface{}) (*base.PageResult,
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/biz/repository/biz_object_mapping_repo.go

@@ -3,9 +3,9 @@ package repository
 import (
     "fmt"
     "xorm.io/xorm"
-    "xps/pkg/base"
     "xps/pkg/biz/datamodel"
     "xps/pkg/biz/viewmodel"
+    "xps/pkg/common"
 )
 
 type BizObjectMappingRepo struct {
@@ -18,7 +18,7 @@ func NewBizObjectMappingRepo(engine *xorm.Engine) *BizObjectMappingRepo {
     }
 }
 
-func (d *BizObjectMappingRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *BizObjectMappingRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -52,7 +52,7 @@ func (d *BizObjectMappingRepo) GetPage(m map[string]interface{}) (*base.PageResu
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/biz/repository/biz_object_repo.go

@@ -4,9 +4,9 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
     "xps/pkg/biz/datamodel"
     "xps/pkg/biz/viewmodel"
+    "xps/pkg/common"
 )
 
 type BizObjectRepo struct {
@@ -19,7 +19,7 @@ func NewBizObjectRepo(engine *xorm.Engine) *BizObjectRepo {
     }
 }
 
-func (d *BizObjectRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *BizObjectRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -48,7 +48,7 @@ func (d *BizObjectRepo) GetPage(m map[string]interface{}) (*base.PageResult, err
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/biz/repository/biz_repo.go

@@ -4,9 +4,9 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
     "xps/pkg/biz/datamodel"
     "xps/pkg/biz/viewmodel"
+    "xps/pkg/common"
 )
 
 type BizRepo struct {
@@ -19,7 +19,7 @@ func NewBizRepo(engine *xorm.Engine) *BizRepo {
     }
 }
 
-func (d *BizRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *BizRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -46,7 +46,7 @@ func (d *BizRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/biz/repository/biz_rule_repo.go

@@ -4,9 +4,9 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
     "xps/pkg/biz/datamodel"
     "xps/pkg/biz/viewmodel"
+    "xps/pkg/common"
 )
 
 type BizRuleRepo struct {
@@ -19,7 +19,7 @@ func NewBizRuleRepo(engine *xorm.Engine) *BizRuleRepo {
     }
 }
 
-func (d *BizRuleRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *BizRuleRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -46,7 +46,7 @@ func (d *BizRuleRepo) GetPage(m map[string]interface{}) (*base.PageResult, error
         return nil, err2
     }
 
-    pageResult := &base.PageResult{
+    pageResult := &common.PageResult{
         Total:    total,
         PageSize: limit,
         Page:     page,

pkg/biz/service/biz_object_attr_service.go

@@ -1,25 +1,21 @@
 package service
 
 import (
-    "errors"
-    "xps/cmd/cache"
     "xps/cmd/datasource"
-    "xps/pkg/base"
     "xps/pkg/biz/datamodel"
     "xps/pkg/biz/repository"
     "xps/pkg/biz/viewmodel"
+    "xps/pkg/common"
 )
 
 type BizObjectAttrService interface {
     GetList(m map[string]interface{}) ([]viewmodel.BizObjectAttrInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(bizId, objectId, attrId int64) (*viewmodel.BizObjectAttrInfo, error)
     GetListById(bizId, objectId int64) ([]viewmodel.BizObjectAttrInfo, error)
     Create(d *datamodel.BizObjectAttr) error
     Update(d *datamodel.BizObjectAttr) error
     Delete(m map[string]interface{}) error
-
-    CacheBizObjectAttrs(bizId, objectId int64) error
 }
 
 type bizObjectAttrService struct {
@@ -40,7 +36,7 @@ func (s *bizObjectAttrService) GetList(m map[string]interface{}) ([]viewmodel.Bi
     return s.repo.GetList(m)
 }
 
-func (s *bizObjectAttrService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *bizObjectAttrService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 
@@ -49,45 +45,15 @@ func (s *bizObjectAttrService) GetById(bizId, objectId, attrId int64) (*viewmode
 }
 
 func (s *bizObjectAttrService) Create(attr *datamodel.BizObjectAttr) error {
-    attr.AttrId = NewID()
-    err := s.repo.Create(attr)
-    if err != nil {
-        return nil
-    }
-
-    bizId := attr.BizId
-    objectId := attr.ObjectId
-    return s.CacheBizObjectAttrs(bizId, objectId)
+    attrId := NewID();
+    attr.AttrId = attrId
+    return s.repo.Create(attr)
 }
 
 func (s *bizObjectAttrService) Update(attr *datamodel.BizObjectAttr) error {
-    err := s.repo.Update(attr)
-    if err != nil {
-        return nil
-    }
-
-    bizId := attr.BizId
-    objectId := attr.ObjectId
-    return s.CacheBizObjectAttrs(bizId, objectId)
+    return s.repo.Update(attr)
 }
 
 func (s *bizObjectAttrService) Delete(m map[string]interface{}) error {
     return s.repo.Delete(m)
-}
-
-func (s *bizObjectAttrService) CacheBizObjectAttrs(bizId, objectId int64) error {
-    attrList, err1 := s.repo.GetListById(bizId, objectId)
-    if err1 != nil {
-        return err1
-    }
-
-    if len(attrList) <= 0 {
-        return errors.New("biz Object Attrs Not Exist")
-    }
-    objectCode := attrList[0].ObjectCode
-    err2 := cache.SetBizObjectAttrs(objectCode, attrList)
-    if err2 != nil {
-        return errors.New("Redis缓存Model数据失败")
-    }
-    return nil
-}
+}

pkg/biz/service/biz_object_mapping_service.go

@@ -1,25 +1,21 @@
 package service
 
 import (
-    "errors"
-    "xps/cmd/cache"
     "xps/cmd/datasource"
-    "xps/pkg/base"
     "xps/pkg/biz/datamodel"
     "xps/pkg/biz/repository"
     "xps/pkg/biz/viewmodel"
+    "xps/pkg/common"
 )
 
 type BizObjectMappingService interface {
     GetList(m map[string]interface{}) ([]viewmodel.BizObjectMappingInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(bizId, objectId, mappingId int64) (*viewmodel.BizObjectMappingInfo, error)
     GetListById(bizId, objectId int64) ([]viewmodel.BizObjectMappingInfo, error)
     Create(d *datamodel.BizObjectMapping) error
     Update(d *datamodel.BizObjectMapping) error
     Delete(m map[string]interface{}) error
-
-    CacheBizObjectMapping(bizId, objectId int64) error
 }
 
 type bizObjectMappingService struct {
@@ -40,7 +36,7 @@ func (s *bizObjectMappingService) GetListById(bizId, objectId int64) ([]viewmode
     return s.repo.GetListById(bizId, objectId)
 }
 
-func (s *bizObjectMappingService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *bizObjectMappingService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 
@@ -50,44 +46,13 @@ func (s *bizObjectMappingService) GetById(bizId, objectId, attrId int64) (*viewm
 
 func (s *bizObjectMappingService) Create(m *datamodel.BizObjectMapping) error {
     m.MappingId = NewID()
-    err := s.repo.Create(m)
-    if err != nil {
-        return nil
-    }
-
-    bizId := m.BizId
-    objectId := m.ObjectId
-    return s.CacheBizObjectMapping(bizId, objectId)
+    return s.repo.Create(m)
 }
 
 func (s *bizObjectMappingService) Update(m *datamodel.BizObjectMapping) error {
-    err := s.repo.Update(m)
-    if err != nil {
-        return nil
-    }
-
-    bizId := m.BizId
-    objectId := m.ObjectId
-    return s.CacheBizObjectMapping(bizId, objectId)
+    return s.repo.Update(m)
 }
 
 func (s *bizObjectMappingService) Delete(m map[string]interface{}) error {
     return s.repo.Delete(m)
 }
-
-func (s *bizObjectMappingService) CacheBizObjectMapping(bizId, objectId int64) error {
-    mappingList, err1 := s.repo.GetListById(bizId, objectId)
-    if err1 != nil {
-        return err1
-    }
-
-    if len(mappingList) <= 0 {
-        return errors.New("biz Object Mapping Not Exist")
-    }
-    objectCode := mappingList[0].ObjectCode
-    err2 := cache.SetBizObjectMapping(objectCode, mappingList)
-    if err2 != nil {
-        return errors.New("Redis缓存Model数据失败")
-    }
-    return nil
-}

pkg/biz/service/biz_object_oam_mapping_service.go

@@ -1,8 +1,6 @@
 package service
 
 import (
-    "errors"
-    "xps/cmd/cache"
     "xps/cmd/datasource"
     "xps/pkg/biz/datamodel"
     "xps/pkg/biz/repository"
@@ -15,8 +13,6 @@ type BizObjectOAMMappingService interface {
     Create(param *datamodel.BizObjectOAMMapping) error
     Update(param *datamodel.BizObjectOAMMapping) error
     Delete(m map[string]interface{}) error
-
-    CacheObjectOAMMapping(bizId, objectId, oamId int64) error
 }
 
 type bizObjectOAMMappingService struct {
@@ -42,55 +38,13 @@ func (s *bizObjectOAMMappingService) GetById(bizId, objectId, oamId, mappingId i
 func (s *bizObjectOAMMappingService) Create(m *datamodel.BizObjectOAMMapping) error {
     mappingId := NewID()
     m.MappingId = mappingId
-    err1 := s.oamMappingRepo.Create(m)
-    if err1 != nil {
-        return err1
-    }
-
-    bizId := m.BizId
-    objectId := m.ObjectId
-    oamId := m.OamId
-    return s.CacheObjectOAMMapping(bizId, objectId, oamId)
+    return s.oamMappingRepo.Create(m)
 }
 
 func (s *bizObjectOAMMappingService) Update(param *datamodel.BizObjectOAMMapping) error {
-    err1 := s.oamMappingRepo.Update(param)
-    if err1 != nil {
-        return err1
-    }
-
-    bizId := param.BizId
-    objectId := param.ObjectId
-    oamId := param.OamId
-    return s.CacheObjectOAMMapping(bizId, objectId, oamId)
+    return s.oamMappingRepo.Update(param)
 }
 
 func (s *bizObjectOAMMappingService) Delete(m map[string]interface{}) error {
-    err1 := s.oamMappingRepo.Delete(m)
-    if err1 != nil {
-        return err1
-    }
-
-    return nil
-}
-
-func (s *bizObjectOAMMappingService) CacheObjectOAMMapping(bizId, objectId, oamId int64) error {
-    dataList, err1 := s.oamMappingRepo.GetListById(bizId, objectId, oamId)
-    if err1 != nil {
-        return err1
-    }
-
-    if len(dataList) <= 0 {
-        return nil
-    }
-
-    objectCode := dataList[0].ObjectCode
-    oamCode := dataList[0].OamCode
-    // 缓存数据
-    err3 := cache.SetBizObjectOAMMapping(objectCode, oamCode, dataList)
-    if err3 != nil {
-        return errors.New("Redis缓存Model数据失败")
-    }
-
-    return nil
-}
+    return s.oamMappingRepo.Delete(m)
+}

pkg/biz/service/biz_object_oam_params_service.go

@@ -1,8 +1,6 @@
 package service
 
 import (
-    "errors"
-    "xps/cmd/cache"
     "xps/cmd/datasource"
     "xps/pkg/biz/datamodel"
     "xps/pkg/biz/repository"
@@ -15,8 +13,6 @@ type BizObjectOAMParamsService interface {
     Create(param *datamodel.BizObjectOAMParams) error
     Update(param *datamodel.BizObjectOAMParams) error
     Delete(m map[string]interface{}) error
-
-    CacheObjectOAMParams(bizId, objectId, oamId int64) error
 }
 
 type bizObjectOAMParamsService struct {
@@ -42,55 +38,13 @@ func (s *bizObjectOAMParamsService) GetById(bizId, objectId, oamId, paramId int6
 func (s *bizObjectOAMParamsService) Create(param *datamodel.BizObjectOAMParams) error {
     paramId := NewID()
     param.ParamId = paramId
-    err1 := s.oamParamsRepo.Create(param)
-    if err1 != nil {
-        return err1
-    }
-
-    bizId := param.BizId
-    objectId := param.ObjectId
-    oamId := param.OamId
-    return s.CacheObjectOAMParams(bizId, objectId, oamId)
+    return s.oamParamsRepo.Create(param)
 }
 
 func (s *bizObjectOAMParamsService) Update(param *datamodel.BizObjectOAMParams) error {
-    err1 := s.oamParamsRepo.Update(param)
-    if err1 != nil {
-        return err1
-    }
-
-    bizId := param.BizId
-    objectId := param.ObjectId
-    oamId := param.OamId
-    return s.CacheObjectOAMParams(bizId, objectId, oamId)
+    return s.oamParamsRepo.Update(param)
 }
 
 func (s *bizObjectOAMParamsService) Delete(m map[string]interface{}) error {
-    err1 := s.oamParamsRepo.Delete(m)
-    if err1 != nil {
-        return err1
-    }
-
-    return nil
-}
-
-func (s *bizObjectOAMParamsService) CacheObjectOAMParams(bizId, objectId, oamId int64) error {
-    dataList, err1 := s.oamParamsRepo.GetListById(bizId, objectId, oamId)
-    if err1 != nil {
-        return err1
-    }
-
-    if len(dataList) <= 0 {
-        return nil
-    }
-
-    objectCode := dataList[0].ObjectCode
-    oamCode := dataList[0].OamCode
-    // 缓存数据
-    err3 := cache.SetBizObjectOAMParams(objectCode, oamCode, dataList)
-    if err3 != nil {
-        return errors.New("Redis缓存Model数据失败")
-    }
-
-    return nil
-}
+    return s.oamParamsRepo.Delete(m)
+}

pkg/biz/service/biz_object_oam_rule_service.go

@@ -1,8 +1,6 @@
 package service
 
 import (
-    "errors"
-    "xps/cmd/cache"
     "xps/cmd/datasource"
     "xps/pkg/biz/datamodel"
     "xps/pkg/biz/repository"
@@ -15,8 +13,6 @@ type BizObjectOAMRuleService interface {
     Create(or *datamodel.BizObjectOAMRule) error
     Update(or *datamodel.BizObjectOAMRule) error
     Delete(m map[string]interface{}) error
-
-    CacheObjectOAMRules(bizId, objectId, oamId int64) error
 }
 
 type bizObjectOAMRuleService struct {
@@ -42,55 +38,13 @@ func (s *bizObjectOAMRuleService) GetById(bizId, objectId, oamId, orId int64) (*
 func (s *bizObjectOAMRuleService) Create(or *datamodel.BizObjectOAMRule) error {
     orId := NewID()
     or.OrId = orId
-    err := s.oamRuleRepo.Create(or)
-    if err != nil {
-        return err
-    }
-
-    bizId := or.BizId
-    objectId := or.ObjectId
-    oamId := or.OamId
-    return s.CacheObjectOAMRules(bizId, objectId, oamId)
+    return s.oamRuleRepo.Create(or)
 }
 
 func (s *bizObjectOAMRuleService) Update(or *datamodel.BizObjectOAMRule) error {
-    err := s.oamRuleRepo.Update(or)
-    if err != nil {
-        return err
-    }
-
-    bizId := or.BizId
-    objectId := or.ObjectId
-    oamId := or.OamId
-    return s.CacheObjectOAMRules(bizId, objectId, oamId)
+    return s.oamRuleRepo.Update(or)
 }
 
 func (s *bizObjectOAMRuleService) Delete(m map[string]interface{}) error {
-    err1 := s.oamRuleRepo.Delete(m)
-    if err1 != nil {
-        return err1
-    }
-
-    return nil
-}
-
-func (s *bizObjectOAMRuleService) CacheObjectOAMRules(bizId, objectId, oamId int64) error {
-    oamRules, err2 := s.oamRuleRepo.GetListById(bizId, objectId, oamId)
-    if err2 != nil {
-        return err2
-    }
-
-    if len(oamRules) <= 0 {
-        return nil
-    }
-
-    objectCode := oamRules[0].ObjectCode
-    oamCode := oamRules[0].OamCode
-    // 缓存数据
-    err3 := cache.SetBizObjectOAMRules(objectCode, oamCode, oamRules)
-    if err3 != nil {
-        return errors.New("Redis缓存Model数据失败")
-    }
-
-    return nil
+    return s.oamRuleRepo.Delete(m)
 }

pkg/biz/service/biz_object_oam_service.go

@@ -1,9 +1,7 @@
 package service
 
 import (
-    "errors"
     "time"
-    "xps/cmd/cache"
     "xps/cmd/constant"
     "xps/cmd/datasource"
     apiDataModel "xps/pkg/api/datamodel"
@@ -20,9 +18,6 @@ type BizObjectOAMService interface {
     Create(d *datamodel.BizObjectOAM) error
     Update(d *datamodel.BizObjectOAM) error
     Delete(m map[string]interface{}) error
-
-    CacheBizObjectOAM(bizId, objectId, oamId int64) error
-    CacheApiData(apiId int64) error
 }
 
 type bizObjectOAMService struct {
@@ -59,15 +54,7 @@ func (s *bizObjectOAMService) Create(oam *datamodel.BizObjectOAM) error {
         return err1
     }
 
-    // 2.Redis缓存Object OAM
-    bizId := oam.BizId
-    objectId := oam.ObjectId
-    err2 := s.CacheBizObjectOAM(bizId, objectId, oamId)
-    if err2 != nil {
-        return err2
-    }
-
-    // 3.生成API
+    // 2.生成API
     apiId := oamId
     apiMethod := s.GetApiMethodByOAMType(oam.OamType)
     api := &apiDataModel.Api{
@@ -89,9 +76,7 @@ func (s *bizObjectOAMService) Create(oam *datamodel.BizObjectOAM) error {
     if err3 != nil {
         return err3
     }
-
-    // 4.缓存API
-    return s.CacheApiData(apiId)
+    return nil
 }
 
 func (s *bizObjectOAMService) Update(oam *datamodel.BizObjectOAM) error {
@@ -102,16 +87,11 @@ func (s *bizObjectOAMService) Update(oam *datamodel.BizObjectOAM) error {
         return err
     }
 
-    // 2.缓存Object OAM
-    bizId := oam.BizId
+    bizId    := oam.BizId
     objectId := oam.ObjectId
-    oamId := oam.OamId
-    err2 := s.CacheBizObjectOAM(bizId, objectId, oamId)
-    if err2 != nil {
-        return err2
-    }
+    oamId    := oam.OamId
 
-    // 3.更新API
+    // 2.更新API
     apiId := oam.OamId
     apiMethod := s.GetApiMethodByOAMType(oam.OamType)
     api := &apiDataModel.Api{
@@ -122,8 +102,8 @@ func (s *bizObjectOAMService) Update(oam *datamodel.BizObjectOAM) error {
         ApiDesc:   "",
         ApiParams: "",
         ApiCode:   oam.OamCode,
-        BizId:     oam.BizId,
-        ObjectId:  oam.ObjectId,
+        BizId:     bizId,
+        ObjectId:  objectId,
         OamId:     oamId,
         Status:    1,
         UpdatedAt: time.Now(),
@@ -134,8 +114,7 @@ func (s *bizObjectOAMService) Update(oam *datamodel.BizObjectOAM) error {
         return err3
     }
 
-    // 4.更新API缓存数据
-    return s.CacheApiData(apiId)
+    return nil
 }
 
 func (s *bizObjectOAMService) Delete(m map[string]interface{}) error {
@@ -154,34 +133,6 @@ func (s *bizObjectOAMService) Delete(m map[string]interface{}) error {
     return nil
 }
 
-func (s *bizObjectOAMService) CacheBizObjectOAM(bizId, objectId, oamId int64) error {
-    oam, err1 := s.bizObjectOAMRepo.GetById(bizId, objectId, oamId)
-    if err1 != nil {
-        return err1
-    }
-
-    err3 := cache.SetBizObjectOAM(oam.ObjectCode, oam.OamCode, oam)
-    if err3 != nil {
-        return errors.New("Redis缓存Model数据失败")
-    }
-    return nil
-}
-
-func (s *bizObjectOAMService) CacheApiData(apiId int64) error {
-    api, err1 := s.apiRepo.GetById(apiId)
-    if err1 != nil {
-        return err1
-    }
-
-    objectCode := api.ObjectCode
-    oamCode := api.OamCode
-    err3 := cache.SetApiData(objectCode, oamCode, api)
-    if err3 != nil {
-        return errors.New("Redis缓存Api数据失败")
-    }
-    return nil
-}
-
 func (s *bizObjectOAMService) GetApiMethodByOAMType(oamType int64) int64 {
     if oamType == constant.OAM_GET_ONE ||
         oamType == constant.OAM_GET_LIST ||

pkg/biz/service/biz_object_service.go

@@ -1,25 +1,21 @@
 package service
 
 import (
-    "errors"
-    "xps/cmd/cache"
     "xps/cmd/datasource"
-    "xps/pkg/base"
     "xps/pkg/biz/datamodel"
     "xps/pkg/biz/repository"
     "xps/pkg/biz/viewmodel"
+    "xps/pkg/common"
 )
 
 type BizObjectService interface {
     GetList(m map[string]interface{}) ([]viewmodel.BizObjectInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(bizId, objectId int64) (*viewmodel.BizObjectInfo, error)
     GetListById(bizId int64) ([]viewmodel.BizObjectInfo, error)
     Create(d *datamodel.BizObject) error
     Update(d *datamodel.BizObject) error
     Delete(m map[string]interface{}) error
-
-    CacheBizObject(bizId, objectId int64) error
 }
 
 type bizObjectService struct {
@@ -42,7 +38,7 @@ func (s *bizObjectService) GetListById(bizId int64) ([]viewmodel.BizObjectInfo,
     return s.bizObjectRepo.GetListById(bizId)
 }
 
-func (s *bizObjectService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *bizObjectService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.bizObjectRepo.GetPage(m)
 }
 
@@ -51,26 +47,13 @@ func (s *bizObjectService) GetById(bizId, objectId int64) (*viewmodel.BizObjectI
 }
 
 func (s *bizObjectService) Create(o *datamodel.BizObject) error {
-    o.ObjectId = NewID()
-    err := s.bizObjectRepo.Create(o)
-    if err != nil {
-        return err
-    }
-
-    bizId := o.BizId
-    objectId := o.ObjectId
-    return s.CacheBizObject(bizId, objectId)
+    objectId := NewID()
+    o.ObjectId = objectId
+    return s.bizObjectRepo.Create(o)
 }
 
 func (s *bizObjectService) Update(o *datamodel.BizObject) error {
-    err := s.bizObjectRepo.Update(o)
-    if err != nil {
-        return err
-    }
-
-    bizId := o.BizId
-    objectId := o.ObjectId
-    return s.CacheBizObject(bizId, objectId)
+    return s.bizObjectRepo.Update(o)
 }
 
 func (s *bizObjectService) Delete(m map[string]interface{}) error {
@@ -81,17 +64,4 @@ func (s *bizObjectService) Delete(m map[string]interface{}) error {
         return err
     }
     return s.bizObjectAttrRepo.DeleteByObjectId(bizId, objectId)
-}
-
-func (s *bizObjectService) CacheBizObject(bizId, objectId int64) error {
-    o, err1 := s.bizObjectRepo.GetById(bizId, objectId)
-    if err1 != nil {
-        return err1
-    }
-
-    err3 := cache.SetBizObject(o.ObjectCode, o)
-    if err3 != nil {
-        return errors.New("Redis缓存Biz Object数据失败")
-    }
-    return nil
-}
+}

pkg/biz/service/biz_rule_service.go

@@ -2,15 +2,15 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
     "xps/pkg/biz/datamodel"
     "xps/pkg/biz/repository"
     "xps/pkg/biz/viewmodel"
+    "xps/pkg/common"
 )
 
 type BizRuleService interface {
     GetList(m map[string]interface{}) ([]viewmodel.BizRuleInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(ruleId int64) (*viewmodel.BizRuleInfo, error)
     Create(d *datamodel.BizRule) error
     Update(d *datamodel.BizRule) error
@@ -31,7 +31,7 @@ func (s *bizRuleService) GetList(m map[string]interface{}) ([]viewmodel.BizRuleI
     return s.repo.GetList(m)
 }
 
-func (s *bizRuleService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *bizRuleService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/biz/service/biz_service.go

@@ -2,16 +2,16 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
     "xps/pkg/biz/datamodel"
     "xps/pkg/biz/repository"
     "xps/pkg/biz/viewmodel"
+    "xps/pkg/common"
 )
 
 type BizService interface {
     GetList(m map[string]interface{}) ([]viewmodel.BizInfo, error)
     GetTreeData() ([]viewmodel.BizTreeInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(bizId int64) (*viewmodel.BizInfo, error)
     Create(d *datamodel.Biz) error
     Update(d *datamodel.Biz) error
@@ -81,7 +81,7 @@ func (s *bizService) GetList(m map[string]interface{}) ([]viewmodel.BizInfo, err
     return s.bizRepo.GetList(m)
 }
 
-func (s *bizService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *bizService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.bizRepo.GetPage(m)
 }
 

pkg/bpm/controller/base.go

@@ -18,21 +18,11 @@ func init() {
     validate = validator.New()
 }
 
-func errorData(errs ...error) {
-    var s string
-    for _, err := range errs {
-        if err != nil {
-            s += err.Error() + "<br/>"
-        }
-    }
-}
-
 type Base struct {
     Ctx iris.Context
 }
 
 func (b *Base) GetCurOcId() int64 {
-
     ocId, _ := b.Ctx.Values().GetInt64("ocId")
     return ocId
 }

pkg/bpm/repository/wf_activity_action_def_repo.go

@@ -4,9 +4,9 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
     "xps/pkg/bpm/datamodel"
     "xps/pkg/bpm/viewmodel"
+    "xps/pkg/common"
 )
 
 type WfActivityActionDefRepo struct {
@@ -19,7 +19,7 @@ func NewWfActivityActionDefRepo(engine *xorm.Engine) *WfActivityActionDefRepo {
     }
 }
 
-func (d *WfActivityActionDefRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *WfActivityActionDefRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit       := m["limit"].(int)
     page        := m["page"].(int)
     sqlSelect   := `    SELECT      A.wf_def_id,
@@ -64,7 +64,7 @@ func (d *WfActivityActionDefRepo) GetPage(m map[string]interface{}) (*base.PageR
         return nil, err
     }
 
-    pageResult := &base.PageResult{
+    pageResult := &common.PageResult{
         Total:    total,
         PageSize: limit,
         Page:     page,

pkg/bpm/repository/wf_activity_action_ins_repo.go

@@ -4,9 +4,9 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
     "xps/pkg/bpm/datamodel"
     "xps/pkg/bpm/viewmodel"
+    "xps/pkg/common"
 )
 
 type WfActivityActionInsRepo struct {
@@ -19,7 +19,7 @@ func NewWfActivityActionInsRepo(engine *xorm.Engine) *WfActivityActionInsRepo {
     }
 }
 
-func (d *WfActivityActionInsRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *WfActivityActionInsRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit       := m["limit"].(int)
     page        := m["page"].(int)
     sqlSelect   := `    SELECT      A.wf_def_id,
@@ -81,7 +81,7 @@ func (d *WfActivityActionInsRepo) GetPage(m map[string]interface{}) (*base.PageR
         return nil, err
     }
 
-    pageResult := &base.PageResult{
+    pageResult := &common.PageResult{
         Total:    total,
         PageSize: limit,
         Page:     page,

pkg/bpm/repository/wf_activity_def_repo.go

@@ -4,9 +4,9 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
     "xps/pkg/bpm/datamodel"
     "xps/pkg/bpm/viewmodel"
+    "xps/pkg/common"
 )
 
 type WfActivityDefRepo struct {
@@ -19,7 +19,7 @@ func NewWfActivityDefRepo(engine *xorm.Engine) *WfActivityDefRepo {
     }
 }
 
-func (d *WfActivityDefRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *WfActivityDefRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit       := m["limit"].(int)
     page        := m["page"].(int)
     sqlSelect   := ` SELECT A.wf_def_id,
@@ -53,7 +53,7 @@ func (d *WfActivityDefRepo) GetPage(m map[string]interface{}) (*base.PageResult,
         return nil, err
     }
 
-    pageResult := &base.PageResult{
+    pageResult := &common.PageResult{
         Total:    total,
         PageSize: limit,
         Page:     page,

pkg/bpm/repository/wf_activity_ins_repo.go

@@ -4,9 +4,9 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
     "xps/pkg/bpm/datamodel"
     "xps/pkg/bpm/viewmodel"
+    "xps/pkg/common"
 )
 
 type WfActivityInsRepo struct {
@@ -19,7 +19,7 @@ func NewWfActivityInsRepo(engine *xorm.Engine) *WfActivityInsRepo {
     }
 }
 
-func (d *WfActivityInsRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *WfActivityInsRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -79,7 +79,7 @@ func (d *WfActivityInsRepo) GetPage(m map[string]interface{}) (*base.PageResult,
         return nil, err
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/bpm/repository/wf_def_repo.go

@@ -4,9 +4,9 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
     "xps/pkg/bpm/datamodel"
     "xps/pkg/bpm/viewmodel"
+    "xps/pkg/common"
 )
 
 type WfDefRepo struct {
@@ -19,7 +19,7 @@ func NewWfDefRepo(engine *xorm.Engine) *WfDefRepo {
     }
 }
 
-func (d *WfDefRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *WfDefRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -52,7 +52,7 @@ func (d *WfDefRepo) GetPage(m map[string]interface{}) (*base.PageResult, error)
         return nil, err
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/bpm/repository/wf_ins_attach_repo.go

@@ -3,9 +3,9 @@ package repository
 import (
     "fmt"
     "xorm.io/xorm"
-    "xps/pkg/base"
     "xps/pkg/bpm/datamodel"
     "xps/pkg/bpm/viewmodel"
+    "xps/pkg/common"
 )
 
 type WfInsAttachRepo struct {
@@ -18,7 +18,7 @@ func NewWfInsAttachRepo(engine *xorm.Engine) *WfInsAttachRepo {
     }
 }
 
-func (d *WfInsAttachRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *WfInsAttachRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -69,7 +69,7 @@ func (d *WfInsAttachRepo) GetPage(m map[string]interface{}) (*base.PageResult, e
         return nil, err
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/bpm/repository/wf_ins_repo.go

@@ -4,9 +4,9 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
     "xps/pkg/bpm/datamodel"
     "xps/pkg/bpm/viewmodel"
+    "xps/pkg/common"
 )
 
 type WfInsRepo struct {
@@ -19,7 +19,7 @@ func NewWfInsRepo(engine *xorm.Engine) *WfInsRepo {
     }
 }
 
-func (d *WfInsRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *WfInsRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -75,7 +75,7 @@ func (d *WfInsRepo) GetPage(m map[string]interface{}) (*base.PageResult, error)
         return nil, err
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/bpm/service/wf_activity_action_def_service.go

@@ -2,15 +2,15 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
     "xps/pkg/bpm/datamodel"
     "xps/pkg/bpm/repository"
     "xps/pkg/bpm/viewmodel"
+    "xps/pkg/common"
 )
 
 type WfActivityActionDefService interface {
     GetList(m map[string]interface{}) ([]viewmodel.WfActivityActionDefInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(wfDefId, activityDefId, actionId int64) (*viewmodel.WfActivityActionDefInfo, error)
     Update(user *datamodel.WfActivityActionDef) error
     Create(user *datamodel.WfActivityActionDef) error
@@ -31,7 +31,7 @@ func (s *wfActivityActionDefService) GetList(m map[string]interface{}) ([]viewmo
     return s.repo.GetList(m)
 }
 
-func (s *wfActivityActionDefService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *wfActivityActionDefService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/bpm/service/wf_activity_action_ins_service.go

@@ -2,15 +2,15 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
     "xps/pkg/bpm/datamodel"
     "xps/pkg/bpm/repository"
     "xps/pkg/bpm/viewmodel"
+    "xps/pkg/common"
 )
 
 type WfActivityActionInsService interface {
     GetList(m map[string]interface{}) ([]viewmodel.WfActivityActionInsInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(ocId, wfInsId, activityInsId, actionInsId int64) (*viewmodel.WfActivityActionInsInfo, error)
     Update(user *datamodel.WfActivityActionIns) error
     Create(user *datamodel.WfActivityActionIns) error
@@ -31,7 +31,7 @@ func (s *wfActivityActionInsService) GetList(m map[string]interface{}) ([]viewmo
     return s.repo.GetList(m)
 }
 
-func (s *wfActivityActionInsService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *wfActivityActionInsService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/bpm/service/wf_activity_def_service.go

@@ -2,15 +2,15 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
     "xps/pkg/bpm/datamodel"
     "xps/pkg/bpm/repository"
     "xps/pkg/bpm/viewmodel"
+    "xps/pkg/common"
 )
 
 type WfActivityDefService interface {
     GetList(m map[string]interface{}) ([]viewmodel.WfActivityDefInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(wfDefId, activityDefId int64) (*viewmodel.WfActivityDefInfo, error)
     Update(user *datamodel.WfActivityDef) error
     Create(user *datamodel.WfActivityDef) error
@@ -31,7 +31,7 @@ func (s *wfActivityDefService) GetList(m map[string]interface{}) ([]viewmodel.Wf
     return s.repo.GetList(m)
 }
 
-func (s *wfActivityDefService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *wfActivityDefService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/bpm/service/wf_activity_ins_service.go

@@ -2,15 +2,15 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
     "xps/pkg/bpm/datamodel"
     "xps/pkg/bpm/repository"
     "xps/pkg/bpm/viewmodel"
+    "xps/pkg/common"
 )
 
 type WfActivityInsService interface {
     GetList(m map[string]interface{}) ([]viewmodel.WfActivityInsInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(ocId, wfInsId, activityInsId int64) (*viewmodel.WfActivityInsInfo, error)
     Update(user *datamodel.WfActivityIns) error
     Create(user *datamodel.WfActivityIns) error
@@ -31,7 +31,7 @@ func (s *wfActivityInsService) GetList(m map[string]interface{}) ([]viewmodel.Wf
     return s.repo.GetList(m)
 }
 
-func (s *wfActivityInsService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *wfActivityInsService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/bpm/service/wf_def_service.go

@@ -2,15 +2,15 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
     "xps/pkg/bpm/datamodel"
     "xps/pkg/bpm/repository"
     "xps/pkg/bpm/viewmodel"
+    "xps/pkg/common"
 )
 
 type WfDefService interface {
     GetList(m map[string]interface{}) ([]viewmodel.WfDefInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(wfDefId int64) (*viewmodel.WfDefInfo, error)
     Update(user *datamodel.WfDef) error
     Create(user *datamodel.WfDef) error
@@ -31,7 +31,7 @@ func (s *wfDefService) GetList(m map[string]interface{}) ([]viewmodel.WfDefInfo,
     return s.repo.GetList(m)
 }
 
-func (s *wfDefService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *wfDefService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/bpm/service/wf_ins_service.go

@@ -2,15 +2,15 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
     "xps/pkg/bpm/datamodel"
     "xps/pkg/bpm/repository"
     "xps/pkg/bpm/viewmodel"
+    "xps/pkg/common"
 )
 
 type WfInsService interface {
     GetList(m map[string]interface{}) ([]viewmodel.WfInsInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(ocId, wfInsId int64) (*viewmodel.WfInsInfo, error)
     Update(user *datamodel.WfIns) error
     Create(user *datamodel.WfIns) error
@@ -31,7 +31,7 @@ func (s *wfInsService) GetList(m map[string]interface{}) ([]viewmodel.WfInsInfo,
     return s.repo.GetList(m)
 }
 
-func (s *wfInsService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *wfInsService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/base/cur_user_info.go → pkg/common/cur_user_info.go

@@ -1,4 +1,4 @@
-package base
+package common
 
 type CurUserInfo struct {
     UserId       int64

pkg/base/page_result.go → pkg/common/page_result.go

@@ -1,4 +1,4 @@
-package base
+package common
 
 type PageResult struct {
     Total    int64       `json:"total"`

pkg/base/query_params.go → pkg/common/query_params.go

@@ -1,4 +1,4 @@
-package base
+package common
 
 type QueryParam struct {
     LogicalOperator string      `json:"logicalOperator" xorm:"'logical_operator' varchar(15)    comment('Logical Operator') "`

pkg/dataway/database_io.go

@@ -8,7 +8,7 @@ import (
     "xorm.io/xorm"
     "xps/cmd/cache"
     "xps/cmd/constant"
-    "xps/pkg/base"
+    "xps/pkg/common"
 )
 
 type DatabaseIO struct {
@@ -21,7 +21,7 @@ func NewDatabaseIO(engine *xorm.Engine) *DatabaseIO {
     }
 }
 
-func (d *DatabaseIO) BuildQueryParam(params []base.QueryParam) string {
+func (d *DatabaseIO) BuildQueryParam(params []common.QueryParam) string {
     sqlWhere := " WHERE 1 = 1 "
     for _, param := range params {
         paramType := param.Type
@@ -36,7 +36,7 @@ func (d *DatabaseIO) BuildQueryParam(params []base.QueryParam) string {
     return sqlWhere
 }
 
-func (d *DatabaseIO) GetPage(sqlStatement, sqlCount string, params []base.QueryParam, page int, limit int) (*base.PageResult, error) {
+func (d *DatabaseIO) GetPage(sqlStatement, sqlCount string, params []common.QueryParam, page int, limit int) (*common.PageResult, error) {
     sqlWhere := d.BuildQueryParam(params)
     res, err1 := d.engine.Query(sqlCount + sqlWhere)
     if err1 != nil {
@@ -56,7 +56,7 @@ func (d *DatabaseIO) GetPage(sqlStatement, sqlCount string, params []base.QueryP
         return nil, err2
     }
 
-    pageResult := &base.PageResult{
+    pageResult := &common.PageResult{
         Total:    total,
         PageSize: limit,
         Page:     page,
@@ -65,7 +65,7 @@ func (d *DatabaseIO) GetPage(sqlStatement, sqlCount string, params []base.QueryP
     return pageResult, nil
 }
 
-func (d *DatabaseIO) GetList(sqlStatement string, params []base.QueryParam) ([]map[string]interface{}, error) {
+func (d *DatabaseIO) GetList(sqlStatement string, params []common.QueryParam) ([]map[string]interface{}, error) {
     sqlWhere := d.BuildQueryParam(params)
     results, err := d.engine.QueryInterface(sqlStatement + sqlWhere)
     if err != nil {
@@ -74,7 +74,7 @@ func (d *DatabaseIO) GetList(sqlStatement string, params []base.QueryParam) ([]m
     return results, nil
 }
 
-func (d *DatabaseIO) GetById(sqlStatement string, params []base.QueryParam) (map[string]interface{}, error) {
+func (d *DatabaseIO) GetById(sqlStatement string, params []common.QueryParam) (map[string]interface{}, error) {
     sqlWhere := d.BuildQueryParam(params)
     results, err := d.engine.QueryInterface(sqlStatement + sqlWhere)
     if err != nil {

pkg/gateway/api_gateway_controller.go

@@ -7,7 +7,7 @@ import (
     "xps/cmd/cache"
     "xps/cmd/constant"
     "xps/pkg/api/controller"
-    "xps/pkg/base"
+    "xps/pkg/common"
 )
 
 type ApiGatewayController struct {
@@ -48,14 +48,14 @@ func (c *ApiGatewayController) HandleParamRule(ruleId int64) interface{} {
     return result
 }
 
-func (c *ApiGatewayController) buildUrlParams(objectCode, oamCode string) ([]base.QueryParam, error) {
+func (c *ApiGatewayController) buildUrlParams(objectCode, oamCode string) ([]common.QueryParam, error) {
     oamParams, err1 := cache.GetBizObjectOAMParams(objectCode, oamCode)
     if err1 != nil {
         return nil, err1
     }
 
     urlParams := c.Ctx.URLParams()
-    queryParams := make([]base.QueryParam, 0)
+    queryParams := make([]common.QueryParam, 0)
     for _, oamParam := range oamParams {
         paramValueCode := oamParam.ParamValue
         paramType := oamParam.ParamType
@@ -63,7 +63,7 @@ func (c *ApiGatewayController) buildUrlParams(objectCode, oamCode string) ([]bas
         isRuled := oamParam.IsRuled
         if isRuled > 0 {
             paramValue := c.HandleParamRule(oamParam.RuleId)
-            param := base.QueryParam{
+            param := common.QueryParam{
                 LogicalOperator: oamParam.LogicalOperator,
                 Name:            oamParam.ParamTitle,
                 CompareOperator: oamParam.CompareOperator,
@@ -92,7 +92,7 @@ func (c *ApiGatewayController) buildUrlParams(objectCode, oamCode string) ([]bas
                 paramValue = urlVal
             }
 
-            param := base.QueryParam{
+            param := common.QueryParam{
                 LogicalOperator: oamParam.LogicalOperator,
                 Name:            oamParam.ParamTitle,
                 CompareOperator: oamParam.CompareOperator,
@@ -170,7 +170,7 @@ func (c *ApiGatewayController) Post(objectCode, oamCode string) *controller.Json
         return controller.ResultErr(err.Error(), nil)
     }
 
-    userInfo := &base.CurUserInfo{
+    userInfo := &common.CurUserInfo{
         UserId:       c.GetCurUserId(),
         UserName:     c.GetCurUserName(),
         PositionId:   c.GetCurUserPositionId(),
@@ -193,7 +193,7 @@ func (c *ApiGatewayController) Put(objectCode, oamCode string) *controller.JsonR
         return controller.ResultErr(err.Error(), nil)
     }
 
-    userInfo := &base.CurUserInfo{
+    userInfo := &common.CurUserInfo{
         UserId:       c.GetCurUserId(),
         UserName:     c.GetCurUserName(),
         PositionId:   c.GetCurUserPositionId(),
@@ -216,7 +216,7 @@ func (c *ApiGatewayController) Patch(objectCode, oamCode string) *controller.Jso
         return controller.ResultErr(err.Error(), nil)
     }
 
-    userInfo := &base.CurUserInfo{
+    userInfo := &common.CurUserInfo{
         UserId:       c.GetCurUserId(),
         UserName:     c.GetCurUserName(),
         PositionId:   c.GetCurUserPositionId(),
@@ -238,7 +238,7 @@ func (c *ApiGatewayController) Delete(objectCode, oamCode string) *controller.Js
         return controller.ResultErr(err.Error(), nil)
     }
 
-    userInfo := &base.CurUserInfo{
+    userInfo := &common.CurUserInfo{
         UserId:       c.GetCurUserId(),
         UserName:     c.GetCurUserName(),
         PositionId:   c.GetCurUserPositionId(),

pkg/gateway/http_handler.go

@@ -6,22 +6,22 @@ import (
     "xps/cmd/cache"
     "xps/cmd/constant"
     "xps/cmd/datasource"
-    "xps/pkg/base"
     bizViewModel "xps/pkg/biz/viewmodel"
+    "xps/pkg/common"
     "xps/pkg/dataway"
 )
 
 type HttpHandler interface {
-    Get(objectCode, oamCode string, params []base.QueryParam) (map[string]interface{}, error)
-    GetPage(objectCode, oamCode string, params []base.QueryParam, page int, limit int) (*base.PageResult, error)
-    GetList(objectCode, oamCode string, params []base.QueryParam) ([]map[string]interface{}, error)
+    Get(objectCode, oamCode string, params []common.QueryParam) (map[string]interface{}, error)
+    GetPage(objectCode, oamCode string, params []common.QueryParam, page int, limit int) (*common.PageResult, error)
+    GetList(objectCode, oamCode string, params []common.QueryParam) ([]map[string]interface{}, error)
 
     GenerateParams(objectCode, oamCode string) (map[string]interface{}, error)
 
-    Create(objectCode, oamCode string, m map[string]interface{}, user *base.CurUserInfo) error
-    Update(objectCode, oamCode string, m map[string]interface{}, user *base.CurUserInfo) error
-    Patch(objectCode, oamCode string, m map[string]interface{}, user *base.CurUserInfo) error
-    Delete(objectCode, oamCode string, m map[string]interface{}, user *base.CurUserInfo) error
+    Create(objectCode, oamCode string, m map[string]interface{}, user *common.CurUserInfo) error
+    Update(objectCode, oamCode string, m map[string]interface{}, user *common.CurUserInfo) error
+    Patch(objectCode, oamCode string, m map[string]interface{}, user *common.CurUserInfo) error
+    Delete(objectCode, oamCode string, m map[string]interface{}, user *common.CurUserInfo) error
 }
 
 type httpHandler struct {
@@ -59,7 +59,7 @@ func (a *httpHandler) GenerateParams(objectCode, oamCode string) (map[string]int
     return result, nil
 }
 
-func (a *httpHandler) Get(objectCode, oamCode string, params []base.QueryParam) (map[string]interface{}, error) {
+func (a *httpHandler) Get(objectCode, oamCode string, params []common.QueryParam) (map[string]interface{}, error) {
     oam, err1 := cache.GetBizObjectOAM(objectCode, oamCode)
     if err1 != nil {
         return nil, err1
@@ -74,7 +74,7 @@ func (a *httpHandler) Get(objectCode, oamCode string, params []base.QueryParam)
     return a.Mapping2BizObjectAttr(objectCode, data)
 }
 
-func (a *httpHandler) GetList(objectCode, oamCode string, params []base.QueryParam) ([]map[string]interface{}, error) {
+func (a *httpHandler) GetList(objectCode, oamCode string, params []common.QueryParam) ([]map[string]interface{}, error) {
     oam, err1 := cache.GetBizObjectOAM(objectCode, oamCode)
     if err1 != nil {
         return nil, err1
@@ -87,14 +87,14 @@ func (a *httpHandler) GetList(objectCode, oamCode string, params []base.QueryPar
     return a.Mapping2BizObjectList(objectCode, dataList)
 }
 
-func (a *httpHandler) GetPage(objectCode, oamCode string, params []base.QueryParam, page int, limit int) (*base.PageResult, error) {
+func (a *httpHandler) GetPage(objectCode, oamCode string, params []common.QueryParam, page int, limit int) (*common.PageResult, error) {
     oam, err1 := cache.GetBizObjectOAM(objectCode, oamCode)
     if err1 != nil {
         return nil, err1
     }
 
     sqlStatement := oam.SqlStatement
-    sqlCount := oam.SqlCount
+    sqlCount     := oam.SqlCount
     pageData, err2 := a.xBus.GetPage(sqlStatement, sqlCount, params, page, limit)
     if err2 != nil {
         return nil, err2
@@ -102,7 +102,7 @@ func (a *httpHandler) GetPage(objectCode, oamCode string, params []base.QueryPar
     return a.Mapping2BizPageObject(objectCode, pageData)
 }
 
-func (a *httpHandler) Create(objectCode, oamCode string, m map[string]interface{}, user *base.CurUserInfo) error {
+func (a *httpHandler) Create(objectCode, oamCode string, m map[string]interface{}, user *common.CurUserInfo) error {
     err1 := a.HandleOAMRuleList(objectCode, oamCode, m, user)
     if err1 != nil {
         return err1
@@ -128,7 +128,7 @@ func (a *httpHandler) Create(objectCode, oamCode string, m map[string]interface{
     return nil
 }
 
-func (a *httpHandler) Update(objectCode, oamCode string, m map[string]interface{}, user *base.CurUserInfo) error {
+func (a *httpHandler) Update(objectCode, oamCode string, m map[string]interface{}, user *common.CurUserInfo) error {
     err1 := a.HandleOAMRuleList(objectCode, oamCode, m, user)
     if err1 != nil {
         return err1
@@ -155,7 +155,7 @@ func (a *httpHandler) Update(objectCode, oamCode string, m map[string]interface{
     return nil
 }
 
-func (a *httpHandler) Patch(objectCode, oamCode string, m map[string]interface{}, user *base.CurUserInfo) error {
+func (a *httpHandler) Patch(objectCode, oamCode string, m map[string]interface{}, user *common.CurUserInfo) error {
     err1 := a.HandleOAMRuleList(objectCode, oamCode, m, user)
     if err1 != nil {
         return err1
@@ -180,7 +180,7 @@ func (a *httpHandler) Patch(objectCode, oamCode string, m map[string]interface{}
     return nil
 }
 
-func (a *httpHandler) Delete(objectCode, oamCode string, m map[string]interface{}, user *base.CurUserInfo) error {
+func (a *httpHandler) Delete(objectCode, oamCode string, m map[string]interface{}, user *common.CurUserInfo) error {
     err1 := a.HandleOAMRuleList(objectCode, oamCode, m, user)
     if err1 != nil {
         return err1
@@ -206,7 +206,7 @@ func (a *httpHandler) Delete(objectCode, oamCode string, m map[string]interface{
     return nil
 }
 
-func (a *httpHandler) HandleOAMRuleList(objectCode, oamCode string, m map[string]interface{}, user *base.CurUserInfo) error {
+func (a *httpHandler) HandleOAMRuleList(objectCode, oamCode string, m map[string]interface{}, user *common.CurUserInfo) error {
     oamRules, err1 := cache.GetBizObjectOAMRules(objectCode, oamCode)
     if err1 != nil {
         return err1
@@ -221,7 +221,7 @@ func (a *httpHandler) HandleOAMRuleList(objectCode, oamCode string, m map[string
     return nil
 }
 
-func (a *httpHandler) HandleOAMRule(oamRule *bizViewModel.BizObjectOAMRuleInfo, m map[string]interface{}, user *base.CurUserInfo) error {
+func (a *httpHandler) HandleOAMRule(oamRule *bizViewModel.BizObjectOAMRuleInfo, m map[string]interface{}, user *common.CurUserInfo) error {
     if oamRule.RuleId == constant.BIZ_RULE_NEW_ID {
         m[oamRule.TargetAttrCode] = NewID()
     } else if oamRule.RuleId == constant.BIZ_RULE_CUR_DATETIME {
@@ -269,8 +269,8 @@ func (a *httpHandler) Mapping2BizObjectAttr(objectCode string, m map[string]inte
 
     params := make(map[string]interface{}, 0)
     for _, bzAttr := range bizObjectAttrs {
-        bzAttrCode := bzAttr.AttrCode
-        bzMappingCode := bzAttr.MappingCode
+        bzAttrCode      := bzAttr.AttrCode
+        bzMappingCode   := bzAttr.MappingCode
         if bzAttrValue, ok := m[bzMappingCode]; ok {
             params[bzAttrCode] = bzAttrValue
         }
@@ -299,7 +299,7 @@ func (a *httpHandler) Mapping2BizObjectList(objectCode string, dataList []map[st
     return targetDataList, nil
 }
 
-func (a *httpHandler) Mapping2BizPageObject(objectCode string, pageData *base.PageResult) (*base.PageResult, error) {
+func (a *httpHandler) Mapping2BizPageObject(objectCode string, pageData *common.PageResult) (*common.PageResult, error) {
     bizObjectAttrs, err := cache.GetBizObjectAttrs(objectCode)
     if err != nil {
         return nil, err
@@ -323,7 +323,7 @@ func (a *httpHandler) Mapping2BizPageObject(objectCode string, pageData *base.Pa
         targetDataList = append(targetDataList, targetData)
     }
 
-    targetPageData := &base.PageResult{
+    targetPageData := &common.PageResult{
         Total:    pageData.Total,
         PageSize: pageData.PageSize,
         Page:     pageData.Page,

pkg/model/repository/model_object_attr_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/model/datamodel"
     "xps/pkg/model/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewModelObjectAttrRepo(engine *xorm.Engine) *ModelObjectAttrRepo {
     }
 }
 
-func (d *ModelObjectAttrRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *ModelObjectAttrRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -48,7 +48,7 @@ func (d *ModelObjectAttrRepo) GetPage(m map[string]interface{}) (*base.PageResul
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/model/repository/model_object_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/model/datamodel"
     "xps/pkg/model/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewModelObjectRepo(engine *xorm.Engine) *ModelObjectRepo {
     }
 }
 
-func (d *ModelObjectRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *ModelObjectRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -48,7 +48,7 @@ func (d *ModelObjectRepo) GetPage(m map[string]interface{}) (*base.PageResult, e
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/model/repository/model_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/model/datamodel"
     "xps/pkg/model/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewModelRepo(engine *xorm.Engine) *ModelRepo {
     }
 }
 
-func (d *ModelRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *ModelRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -46,7 +46,7 @@ func (d *ModelRepo) GetPage(m map[string]interface{}) (*base.PageResult, error)
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/model/service/model_object_attr_service.go

@@ -1,10 +1,8 @@
 package service
 
 import (
-    "errors"
-    "xps/cmd/cache"
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/model/datamodel"
     "xps/pkg/model/repository"
     "xps/pkg/model/viewmodel"
@@ -12,14 +10,12 @@ import (
 
 type ModelObjectAttrService interface {
     GetList(m map[string]interface{}) ([]viewmodel.ModelObjectAttrInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(modelId, objectId, attrId int64) (*viewmodel.ModelObjectAttrInfo, error)
     GetListById(modelId, objectId int64) ([]viewmodel.ModelObjectAttrInfo, error)
     Create(d *datamodel.ModelObjectAttr) error
     Update(d *datamodel.ModelObjectAttr) error
     Delete(m map[string]interface{}) error
-
-    CacheModelObjectAttrs(modelId, objectId int64) error
 }
 
 type modelObjectAttrService struct {
@@ -36,7 +32,7 @@ func (s *modelObjectAttrService) GetList(m map[string]interface{}) ([]viewmodel.
     return s.repo.GetList(m)
 }
 
-func (s *modelObjectAttrService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *modelObjectAttrService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 
@@ -51,44 +47,13 @@ func (s *modelObjectAttrService) GetListById(modelId, objectId int64) ([]viewmod
 func (s *modelObjectAttrService) Create(attr *datamodel.ModelObjectAttr) error {
     attrId := NewID()
     attr.AttrId = attrId
-    err := s.repo.Create(attr)
-    if err != nil {
-        return err
-    }
-
-    modelId := attr.ModelId
-    objectId := attr.ObjectId
-    return s.CacheModelObjectAttrs(modelId, objectId)
+    return s.repo.Create(attr)
 }
 
 func (s *modelObjectAttrService) Update(attr *datamodel.ModelObjectAttr) error {
-    err := s.repo.Update(attr)
-    if err != nil {
-        return err
-    }
-
-    modelId := attr.ModelId
-    objectId := attr.ObjectId
-    return s.CacheModelObjectAttrs(modelId, objectId)
+    return s.repo.Update(attr)
 }
 
 func (s *modelObjectAttrService) Delete(m map[string]interface{}) error {
     return s.repo.Delete(m)
-}
-
-func (s *modelObjectAttrService) CacheModelObjectAttrs(modelId, objectId int64) error {
-    attrList, err1 := s.repo.GetListById(modelId, objectId)
-    if err1 != nil {
-        return err1
-    }
-
-    if len(attrList) <= 0 {
-        return errors.New("biz Object Attrs Not Exist")
-    }
-    objectCode := attrList[0].ObjectCode
-    err2 := cache.SetModelObjectAttrs(objectCode, attrList)
-    if err2 != nil {
-        return errors.New("Redis缓存Model数据失败")
-    }
-    return nil
-}
+}

pkg/model/service/model_object_oam_service.go

@@ -1,8 +1,6 @@
 package service
 
 import (
-    "errors"
-    "xps/cmd/cache"
     "xps/cmd/datasource"
     "xps/pkg/model/datamodel"
     "xps/pkg/model/repository"
@@ -16,8 +14,6 @@ type ModelObjectOAMService interface {
     Create(d *datamodel.ModelObjectOAM) error
     Update(d *datamodel.ModelObjectOAM) error
     Delete(m map[string]interface{}) error
-
-    CacheModelObjectOAM(modelId, objectId, oamId int64) error
 }
 
 type modelObjectOAMService struct {
@@ -44,43 +40,14 @@ func (s *modelObjectOAMService) GetById(modelId, objectId, oamId int64) (*viewmo
 
 func (s *modelObjectOAMService) Create(o *datamodel.ModelObjectOAM) error {
     oamId := NewID()
-
     o.OamId = oamId
-    err := s.repo.Create(o)
-    if err != nil {
-        return err
-    }
-
-    modelId := o.ModelId
-    objectId := o.ObjectId
-    return s.CacheModelObjectOAM(modelId, objectId, oamId)
+    return s.repo.Create(o)
 }
 
 func (s *modelObjectOAMService) Update(o *datamodel.ModelObjectOAM) error {
-    err := s.repo.Update(o)
-    if err != nil {
-        return err
-    }
-
-    modelId := o.ModelId
-    objectId := o.ObjectId
-    oamId := o.OamId
-    return s.CacheModelObjectOAM(modelId, objectId, oamId)
+    return s.repo.Update(o)
 }
 
 func (s *modelObjectOAMService) Delete(m map[string]interface{}) error {
     return s.repo.Delete(m)
 }
-
-func (s *modelObjectOAMService) CacheModelObjectOAM(modelId, objectId, oamId int64) error {
-    oam, err1 := s.repo.GetById(modelId, objectId, oamId)
-    if err1 != nil {
-        return err1
-    }
-
-    err3 := cache.SetModelObjectOAM(oam.ObjectCode, oam.OamCode, oam)
-    if err3 != nil {
-        return errors.New("Redis缓存Model数据失败")
-    }
-    return nil
-}

pkg/model/service/model_object_service.go

@@ -1,10 +1,8 @@
 package service
 
 import (
-    "errors"
-    "xps/cmd/cache"
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/model/datamodel"
     "xps/pkg/model/repository"
     "xps/pkg/model/viewmodel"
@@ -12,15 +10,13 @@ import (
 
 type ModelObjectService interface {
     GetList(m map[string]interface{}) ([]viewmodel.ModelObjectInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(modelId, objectId int64) (*viewmodel.ModelObjectInfo, error)
     GetListById(modelId int64) ([]viewmodel.ModelObjectInfo, error)
     Create(o *datamodel.ModelObject) error
     Update(o *datamodel.ModelObject) error
     Delete(m map[string]interface{}) error
     Select(modelId, bizId, objectId int64) ([]viewmodel.ModelObjectInfo, error)
-
-    CacheModelObject(modelId, objectId int64) error
 }
 
 type modelObjectService struct {
@@ -47,7 +43,7 @@ func (s *modelObjectService) Select(modelId, targetBizId, targetObjectId int64)
     return s.modelObjectRepo.SelectForBizObjectMapping(modelId, targetBizId, targetObjectId)
 }
 
-func (s *modelObjectService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *modelObjectService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.modelObjectRepo.GetPage(m)
 }
 
@@ -57,47 +53,20 @@ func (s *modelObjectService) GetById(modelId, objectId int64) (*viewmodel.ModelO
 
 func (s *modelObjectService) Create(o *datamodel.ModelObject) error {
     objectId := NewID()
-
     o.ObjectId = objectId
-    err := s.modelObjectRepo.Create(o)
-    if err != nil {
-        return err
-    }
-
-    modelId := o.ModelId
-    return s.CacheModelObject(modelId, objectId)
+    return s.modelObjectRepo.Create(o)
 }
 
 func (s *modelObjectService) Update(o *datamodel.ModelObject) error {
-    err := s.modelObjectRepo.Update(o)
-    if err != nil {
-        return err
-    }
-
-    modelId := o.ModelId
-    objectId := o.ObjectId
-    return s.CacheModelObject(modelId, objectId)
+    return s.modelObjectRepo.Update(o)
 }
 
 func (s *modelObjectService) Delete(m map[string]interface{}) error {
-    modelId := m["modelId"].(int64)
+    modelId  := m["modelId"].(int64)
     objectId := m["objectId"].(int64)
     err := s.modelObjectRepo.Delete(m)
     if err != nil {
         return err
     }
     return s.modelObjectAttrRepo.DeleteByObjectId(modelId, objectId)
-}
-
-func (s *modelObjectService) CacheModelObject(modelId, objectId int64) error {
-    o, err1 := s.modelObjectRepo.GetById(modelId, objectId)
-    if err1 != nil {
-        return err1
-    }
-
-    err2 := cache.SetModelObject(o.ObjectCode, o)
-    if err2 != nil {
-        return errors.New("Redis缓存Biz Object数据失败")
-    }
-    return nil
-}
+}

pkg/model/service/model_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/model/datamodel"
     "xps/pkg/model/repository"
     "xps/pkg/model/viewmodel"
@@ -11,7 +11,7 @@ import (
 type ModelService interface {
     GetList(m map[string]interface{}) ([]viewmodel.ModelInfo, error)
     GetTreeData() ([]viewmodel.ModelTreeInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(modelId int64) (*viewmodel.ModelInfo, error)
     Create(d *datamodel.Model) error
     Update(d *datamodel.Model) error
@@ -24,7 +24,7 @@ type modelService struct {
 }
 
 func NewModelService() ModelService {
-    return &modelService{
+    return &modelService {
         modelRepo:  repository.NewModelRepo(datasource.InstanceMaster()),
         objectRepo: repository.NewModelObjectRepo(datasource.InstanceMaster()),
     }
@@ -49,38 +49,38 @@ func (s *modelService) GetTreeData() ([]viewmodel.ModelTreeInfo, error) {
     for _, model := range modelArr {
 
         modelTreeData := viewmodel.ModelTreeInfo{}
-        modelId := model.ModelId
+        modelId  := model.ModelId
         children := make([]viewmodel.ModelTreeNodeInfo, 0)
         for _, object := range objectArr {
             if object.ModelId == modelId {
                 treeNode := viewmodel.ModelTreeNodeInfo{
                     Label:       object.ObjectTitle,
                     Value:       object.ObjectId,
-                    IsLeaf:      1,
                     ObjectId:    object.ObjectId,
                     ObjectType:  object.ObjectType,
                     ObjectTitle: object.ObjectTitle,
                     ObjectCode:  object.ObjectCode,
                     IsFixed:     object.IsFixed,
+                    IsLeaf:      1,
                     Comment:     object.Comment,
                 }
                 children = append(children, treeNode)
             }
         }
-        modelTreeData.Label = model.ModelTitle
-        modelTreeData.Value = model.ModelId
-        modelTreeData.IsLeaf = 0
-        modelTreeData.ModelId = modelId
+        modelTreeData.Label      = model.ModelTitle
+        modelTreeData.Value      = model.ModelId
+        modelTreeData.IsLeaf     = 0
+        modelTreeData.ModelId    = modelId
         modelTreeData.ModelTitle = model.ModelTitle
-        modelTreeData.ModelDesc = model.ModelDesc
-        modelTreeData.Children = children
+        modelTreeData.ModelDesc  = model.ModelDesc
+        modelTreeData.Children   = children
         modelDataArr = append(modelDataArr, modelTreeData)
     }
 
     return modelDataArr, nil
 }
 
-func (s *modelService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *modelService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.modelRepo.GetPage(m)
 }
 

pkg/repo/datamodel/repo.go

@@ -3,27 +3,27 @@ package datamodel
 import "time"
 
 type Repo struct {
-    RepoId        int64  `json:"repoId"         xorm:"'repo_id'            bigint      pk comment('Repo ID')         "`
-    RepoTypeId    int64  `json:"repoTypeId"     xorm:"'repo_type_id'       bigint      pk comment('Repo Type ID')    "`
-    RepoCatId     int64  `json:"repoCatId"      xorm:"'repo_cat_id'        bigint         comment('Repo Cat ID')     "`
-    RepoTitle     string `json:"repoTitle"      xorm:"'repo_title'         varchar(127)   comment('Repo Title')      "`
-    RepoHost      string `json:"repoHost"       xorm:"'repo_host'          varchar(127)   comment('Repo Host')       "`
-    RepoPort      int64  `json:"repoPort"       xorm:"'repo_port'          bigint         comment('Repo Port')       "`
-    RepoAccount   string `json:"repoAccount"    xorm:"'repo_account'       varchar(127)   comment('Repo Account')    "`
-    RepoPassword  string `json:"repoPassword"   xorm:"'repo_password'      varchar(127)   comment('Repo Password')   "`
-    RepoAccessKey string `json:"repoAccessKey"  xorm:"'repo_access_key'    varchar(127)   comment('Repo Access Key') "`
-    RepoSecretKey string `json:"repoSecretKey"  xorm:"'repo_secret_key'    varchar(127)   comment('Repo Secret Key') "`
-    RepoTarget    string `json:"repoTarget"     xorm:"'repo_target'        varchar(255)   comment('Repo Target')     "`
-    RepoDesc      string `json:"repoDesc"       xorm:"'repo_desc'          varchar(255)   comment('Repo Desc')       "`
-    Status        int64  `json:"status"         xorm:"'status'             bigint         comment('Status')          "`
+    RepoId          int64       `json:"repoId"         xorm:"'repo_id'            bigint      pk comment('Repo ID')         "`
+    RepoTypeId      int64       `json:"repoTypeId"     xorm:"'repo_type_id'       bigint      pk comment('Repo Type ID')    "`
+    RepoCatId       int64       `json:"repoCatId"      xorm:"'repo_cat_id'        bigint         comment('Repo Cat ID')     "`
+    RepoTitle       string      `json:"repoTitle"      xorm:"'repo_title'         varchar(127)   comment('Repo Title')      "`
+    RepoHost        string      `json:"repoHost"       xorm:"'repo_host'          varchar(127)   comment('Repo Host')       "`
+    RepoPort        int64       `json:"repoPort"       xorm:"'repo_port'          bigint         comment('Repo Port')       "`
+    RepoAccount     string      `json:"repoAccount"    xorm:"'repo_account'       varchar(127)   comment('Repo Account')    "`
+    RepoPassword    string      `json:"repoPassword"   xorm:"'repo_password'      varchar(127)   comment('Repo Password')   "`
+    RepoAccessKey   string      `json:"repoAccessKey"  xorm:"'repo_access_key'    varchar(127)   comment('Repo Access Key') "`
+    RepoSecretKey   string      `json:"repoSecretKey"  xorm:"'repo_secret_key'    varchar(127)   comment('Repo Secret Key') "`
+    RepoTarget      string      `json:"repoTarget"     xorm:"'repo_target'        varchar(255)   comment('Repo Target')     "`
+    RepoDesc        string      `json:"repoDesc"       xorm:"'repo_desc'          varchar(255)   comment('Repo Desc')       "`
+    Status          int64       `json:"status"         xorm:"'status'             bigint         comment('Status')          "`
 
-    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'     "`
+    CreatedBy       int64       `json:"createdBy"      xorm:"'created_by'     "`
+    CreatedAt       time.Time   `json:"createdAt"      xorm:"'created_at'     "`
+    UpdatedBy       int64       `json:"updatedBy"      xorm:"'updated_by'     "`
+    UpdatedAt       time.Time   `json:"updatedAt"      xorm:"'updated_at'     "`
+    DeletedFlag     int64       `json:"deletedFlag"    xorm:"'deleted_flag'   "`
+    DeletedBy       int64       `json:"deletedBy"      xorm:"'deleted_by'     "`
+    DeletedAt       time.Time   `json:"deletedAt"      xorm:"'deleted_at'     "`
 }
 
 func (t *Repo) TableName() string {

pkg/repo/datamodel/repo_cat.go

@@ -3,17 +3,17 @@ package datamodel
 import "time"
 
 type RepoCat struct {
-    RepoTypeId   int64     `json:"repoTypeId"        xorm:"'repo_type_id'        bigint      pk comment('主键ID')    "`
-    RepoCatId    int64     `json:"repoCatId"         xorm:"'repo_cat_id'         bigint      pk comment('主键ID')    "`
-    RepoCatTitle string    `json:"repoCatTitle"      xorm:"'repo_cat_title'      varchar(127)   comment('模型名称')  "`
-    RepoCatDesc  string    `json:"repoCatDesc"       xorm:"'repo_cat_desc'       varchar(511)   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'"`
+    RepoTypeId      int64       `json:"repoTypeId"        xorm:"'repo_type_id'        bigint      pk comment('主键ID')    "`
+    RepoCatId       int64       `json:"repoCatId"         xorm:"'repo_cat_id'         bigint      pk comment('主键ID')    "`
+    RepoCatTitle    string      `json:"repoCatTitle"      xorm:"'repo_cat_title'      varchar(127)   comment('模型名称')  "`
+    RepoCatDesc     string      `json:"repoCatDesc"       xorm:"'repo_cat_desc'       varchar(511)   comment('模型名称')  "`
+    CreatedBy       int64       `json:"createdBy"         xorm:"'created_by'"`
+    CreatedAt       time.Time   `json:"createdAt"         xorm:"'created_at'"`
+    UpdatedBy       int64       `json:"updatedBy"         xorm:"'updated_by'"`
+    UpdatedAt       time.Time   `json:"updatedAt"         xorm:"'updated_at'"`
+    DeletedFlag     int64       `json:"deletedFlag"       xorm:"'deleted_flag'"`
+    DeletedBy       int64       `json:"deletedBy"         xorm:"'deleted_by'"`
+    DeletedAt       time.Time   `json:"deletedAt"         xorm:"'deleted_at'"`
 }
 
 func (t *RepoCat) TableName() string {

pkg/repo/datamodel/repo_object.go

@@ -3,16 +3,16 @@ package datamodel
 import "time"
 
 type RepoObject struct {
-    RepoId      int64     `json:"repoId"            xorm:"'repo_id'         bigint      pk comment('主键ID')    "`
-    ModelId     int64     `json:"modelId"           xorm:"'model_id'        bigint      pk comment('主键ID')         "`
-    ObjectId    int64     `json:"objectId"          xorm:"'object_id'       bigint      pk comment('主键ID')         "`
-    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'"`
+    RepoId      int64       `json:"repoId"            xorm:"'repo_id'         bigint      pk comment('主键ID')    "`
+    ModelId     int64       `json:"modelId"           xorm:"'model_id'        bigint      pk comment('主键ID')    "`
+    ObjectId    int64       `json:"objectId"          xorm:"'object_id'       bigint      pk comment('主键ID')    "`
+    CreatedBy   int64       `json:"createdBy"         xorm:"'created_by'"`
+    CreatedAt   time.Time   `json:"createdAt"         xorm:"'created_at'"`
+    UpdatedBy   int64       `json:"updatedBy"         xorm:"'updated_by'"`
+    UpdatedAt   time.Time   `json:"updatedAt"         xorm:"'updated_at'"`
+    DeletedFlag int64       `json:"deletedFlag"       xorm:"'deleted_flag'"`
+    DeletedBy   int64       `json:"deletedBy"         xorm:"'deleted_by'"`
+    DeletedAt   time.Time   `json:"deletedAt"         xorm:"'deleted_at'"`
 }
 
 func (t *RepoObject) TableName() string {

pkg/repo/repository/repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/repo/datamodel"
     "xps/pkg/repo/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewRepo(engine *xorm.Engine) *Repo {
     }
 }
 
-func (d *Repo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *Repo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -50,7 +50,7 @@ func (d *Repo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/repo/repository/repo_cat.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/repo/datamodel"
     "xps/pkg/repo/viewmodel"
 )
@@ -19,13 +19,13 @@ func NewRepoCatRepo(engine *xorm.Engine) *RepoCatRepo {
     }
 }
 
-func (d *RepoCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
-    limit := m["limit"].(int)
-    page := m["page"].(int)
+func (d *RepoCatRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
+    limit   := m["limit"].(int)
+    page    := m["page"].(int)
 
-    sqlSelect := ` SELECT A.*                `
-    sqlFrom := ` FROM   repo_cat   AS A     `
-    sqlWhere := ` WHERE  A.deleted_flag = 0 `
+    sqlSelect   := ` SELECT A.*                `
+    sqlFrom     := ` FROM   repo_cat   AS A     `
+    sqlWhere    := ` WHERE  A.deleted_flag = 0 `
 
     if repoTypeId, ok := m["repoTypeId"]; ok {
         sqlWhere += fmt.Sprintf(" AND A.repo_type_id = %d ", repoTypeId)
@@ -55,18 +55,19 @@ func (d *RepoCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
-    pageResult.Data = datalist
-    pageResult.Total = total
-    pageResult.PageSize = limit
-    pageResult.Page = page
+    pageResult := &common.PageResult{
+        Total:    total,
+        PageSize: limit,
+        Page:     page,
+        Data:     datalist,
+    }
     return pageResult, nil
 }
 
 func (d *RepoCatRepo) GetList(m map[string]interface{}) ([]viewmodel.RepoCatInfo, error) {
-    sqlSelect := ` SELECT A.*                `
-    sqlFrom := ` FROM  repo_cat AS A        `
-    sqlWhere := ` WHERE A.deleted_flag = 0  `
+    sqlSelect   := ` SELECT A.*                 `
+    sqlFrom     := ` FROM  repo_cat AS A        `
+    sqlWhere    := ` WHERE A.deleted_flag = 0   `
 
     if repoTypeId, ok := m["repoTypeId"]; ok {
         sqlWhere += fmt.Sprintf(" AND A.repo_type_id = %d ", repoTypeId)
@@ -80,8 +81,8 @@ func (d *RepoCatRepo) GetList(m map[string]interface{}) ([]viewmodel.RepoCatInfo
         sqlWhere += ` AND   A.repo_cat_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
     }
 
-    sqlOrderBy := " ORDER BY A.repo_type_id, A.repo_cat_id "
-    datalist := make([]viewmodel.RepoCatInfo, 0)
+    sqlOrderBy  := " ORDER BY A.repo_type_id, A.repo_cat_id "
+    datalist    := make([]viewmodel.RepoCatInfo, 0)
     err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
     if err != nil {
         return nil, err
@@ -91,11 +92,11 @@ func (d *RepoCatRepo) GetList(m map[string]interface{}) ([]viewmodel.RepoCatInfo
 }
 
 func (d *RepoCatRepo) GetById(repoTypeId, repoCatId int64) (*viewmodel.RepoCatInfo, error) {
-    sqlSelect := ` SELECT A.*                `
-    sqlFrom := ` FROM    repo_cat AS A     `
-    sqlWhere := ` WHERE A.deleted_flag = 0  `
-    sqlWhere += fmt.Sprintf(" AND A.repo_type_id = %d ", repoTypeId)
-    sqlWhere += fmt.Sprintf(" AND A.repo_cat_id  = %d ", repoCatId)
+    sqlSelect   := ` SELECT A.*                `
+    sqlFrom     := ` FROM    repo_cat AS A     `
+    sqlWhere    := ` WHERE A.deleted_flag = 0  `
+    sqlWhere    += fmt.Sprintf(" AND A.repo_type_id = %d ", repoTypeId)
+    sqlWhere    += fmt.Sprintf(" AND A.repo_cat_id  = %d ", repoCatId)
     data := &viewmodel.RepoCatInfo{}
     has, err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere).Get(data)
     if !has || err != nil {
@@ -106,9 +107,9 @@ func (d *RepoCatRepo) GetById(repoTypeId, repoCatId int64) (*viewmodel.RepoCatIn
 }
 
 func (d *RepoCatRepo) GetListById(repoTypeId int64) ([]viewmodel.RepoCatInfo, error) {
-    sqlSelect := ` SELECT A.*                `
-    sqlFrom := ` FROM  repo_cat AS A        `
-    sqlWhere := ` WHERE A.deleted_flag = 0  `
+    sqlSelect   := ` SELECT A.*                `
+    sqlFrom     := ` FROM  repo_cat AS A        `
+    sqlWhere    := ` WHERE A.deleted_flag = 0  `
     sqlWhere += fmt.Sprintf(" AND A.repo_type_id = %d ", repoTypeId)
     sqlOrderBy := " ORDER BY A.repo_type_id, A.repo_cat_id "
     datalist := make([]viewmodel.RepoCatInfo, 0)

pkg/repo/repository/repo_db.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "strconv"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
 )
 
 type RepoDB struct {
@@ -17,14 +17,13 @@ func NewRepoDB(engine *xorm.Engine) *RepoDB {
     }
 }
 
-func (d *RepoDB) GetDataOfPage(tableCode string) (*base.PageResult, error) {
-    limit := 100
-    page := 1
-    sqlStatement := ` SELECT A.*                `
-    sqlFrom := fmt.Sprintf(" FROM  %s AS A ", tableCode)
-    sqlWhere := ` WHERE  1 = 1 `
-
-    sqlCount := ` SELECT COUNT(*)           `
+func (d *RepoDB) GetDataOfPage(tableCode string) (*common.PageResult, error) {
+    limit   := 100
+    page    := 1
+    sqlStatement    := ` SELECT A.*                 `
+    sqlFrom         := fmt.Sprintf(" FROM  %s AS A ", tableCode)
+    sqlWhere        := ` WHERE  1 = 1               `
+    sqlCount        := ` SELECT COUNT(*)            `
     res, err1 := d.engine.Query(sqlCount + sqlWhere)
     if err1 != nil {
         return nil, err1
@@ -35,15 +34,15 @@ func (d *RepoDB) GetDataOfPage(tableCode string) (*base.PageResult, error) {
         total, _ = strconv.ParseInt(string(v), 10, 64)
     }
 
-    pageStart := (page - 1) * limit
-    sqlLimit := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
+    pageStart   := (page - 1) * limit
+    sqlLimit    := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
 
     datalist, err2 := d.engine.QueryInterface(sqlStatement + sqlFrom + sqlWhere + sqlLimit)
     if err2 != nil {
         return nil, err2
     }
 
-    pageResult := &base.PageResult{
+    pageResult := &common.PageResult{
         Total:    total,
         PageSize: limit,
         Page:     page,
@@ -53,8 +52,8 @@ func (d *RepoDB) GetDataOfPage(tableCode string) (*base.PageResult, error) {
 }
 
 func (d *RepoDB) GetDataOfList(tableCode string) ([]map[string]interface{}, error) {
-    sqlStatement := fmt.Sprintf(" SELECT * FROM %s ", tableCode)
-    sqlWhere := ` WHERE  1 = 1 `
+    sqlStatement    := fmt.Sprintf(" SELECT * FROM %s ", tableCode)
+    sqlWhere        := ` WHERE  1 = 1 `
     results, err := d.engine.QueryInterface(sqlStatement + sqlWhere)
     if err != nil {
         return nil, err

pkg/repo/repository/repo_object.go

@@ -19,16 +19,16 @@ func NewRepoObjectRepo(engine *xorm.Engine) *RepoObjectRepo {
 }
 
 func (d *RepoObjectRepo) GetListById(repoId int64) ([]viewmodel.RepoObjectInfo, error) {
-    sqlSelect := ` SELECT A.*  ,
-                          B.model_title,
-                          C.object_title,
-                          C.object_code,
-                          C.object_type           `
-    sqlFrom := ` FROM  repo_object   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 += fmt.Sprintf(" AND A.repo_id = %d ", repoId)
+    sqlSelect   := `     SELECT     A.*  ,
+                                    B.model_title,
+                                    C.object_title,
+                                    C.object_code,
+                                    C.object_type           `
+    sqlFrom     := `    FROM        repo_object 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    += fmt.Sprintf(" AND A.repo_id = %d ", repoId)
     sqlOrderBy := " ORDER BY A.model_id, A.object_id ASC "
 
     datalist := make([]viewmodel.RepoObjectInfo, 0)

pkg/repo/repository/repo_type.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/repo/datamodel"
     "xps/pkg/repo/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewRepoTypeRepo(engine *xorm.Engine) *RepoTypeRepo {
     }
 }
 
-func (d *RepoTypeRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *RepoTypeRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -46,7 +46,7 @@ func (d *RepoTypeRepo) GetPage(m map[string]interface{}) (*base.PageResult, erro
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/repo/service/repo_cat_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/repo/datamodel"
     "xps/pkg/repo/repository"
     "xps/pkg/repo/viewmodel"
@@ -10,7 +10,7 @@ import (
 
 type RepoCatService interface {
     GetList(m map[string]interface{}) ([]viewmodel.RepoCatInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetListById(repoTypeId int64) ([]viewmodel.RepoCatInfo, error)
     GetById(repoTypeId, repoCatId int64) (*viewmodel.RepoCatInfo, error)
     Create(d *datamodel.RepoCat) error
@@ -32,7 +32,7 @@ func (s *repoCatService) GetList(m map[string]interface{}) ([]viewmodel.RepoCatI
     return s.repo.GetList(m)
 }
 
-func (s *repoCatService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *repoCatService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/repo/service/repo_db_service.go

@@ -2,13 +2,13 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/repo/repository"
 )
 
 type RepoDBService interface {
     GetDataOfList(objectCode string) ([]map[string]interface{}, error)
-    GetDataOfPage(objectCode string) (*base.PageResult, error)
+    GetDataOfPage(objectCode string) (*common.PageResult, error)
 }
 
 type repoDBService struct {
@@ -25,6 +25,6 @@ func (s *repoDBService) GetDataOfList(objectCode string) ([]map[string]interface
     return s.repoDB.GetDataOfList(objectCode)
 }
 
-func (s *repoDBService) GetDataOfPage(objectCode string) (*base.PageResult, error) {
+func (s *repoDBService) GetDataOfPage(objectCode string) (*common.PageResult, error) {
     return s.repoDB.GetDataOfPage(objectCode)
 }

pkg/repo/service/repo_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/repo/datamodel"
     "xps/pkg/repo/repository"
     "xps/pkg/repo/viewmodel"
@@ -10,7 +10,7 @@ import (
 
 type RepoService interface {
     GetList(m map[string]interface{}) ([]viewmodel.RepoInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetListById(repoTypeId int64) ([]viewmodel.RepoInfo, error)
     GetById(repoTypeId, repoId int64) (*viewmodel.RepoInfo, error)
     Create(d *datamodel.Repo) error
@@ -36,7 +36,7 @@ func (s *repoService) GetListById(repoTypeId int64) ([]viewmodel.RepoInfo, error
     return s.repo.GetListById(repoTypeId)
 }
 
-func (s *repoService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *repoService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/repo/service/repo_type_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/repo/datamodel"
     "xps/pkg/repo/repository"
     "xps/pkg/repo/viewmodel"
@@ -10,7 +10,7 @@ import (
 
 type RepoTypeService interface {
     GetList(m map[string]interface{}) ([]viewmodel.RepoTypeInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(repoTypeId int64) (*viewmodel.RepoTypeInfo, error)
     Create(d *datamodel.RepoType) error
     Update(d *datamodel.RepoType) error
@@ -31,7 +31,7 @@ func (s *repoTypeService) GetList(m map[string]interface{}) ([]viewmodel.RepoTyp
     return s.repo.GetList(m)
 }
 
-func (s *repoTypeService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *repoTypeService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/system/repository/art_cat_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewArtCatRepo(engine *xorm.Engine) *ArtCatRepo {
     }
 }
 
-func (d *ArtCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *ArtCatRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -49,7 +49,7 @@ func (d *ArtCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error)
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/system/repository/art_repo.go

@@ -5,7 +5,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -20,7 +20,7 @@ func NewArtRepo(engine *xorm.Engine) *ArtRepo {
     }
 }
 
-func (d *ArtRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *ArtRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit, ok1 := m["limit"].(int)
     page, ok2 := m["page"].(int)
     if !ok1 || !ok2 {
@@ -68,7 +68,7 @@ func (d *ArtRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/system/repository/doc_cat_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewDocCatRepo(engine *xorm.Engine) *DocCatRepo {
     }
 }
 
-func (d *DocCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *DocCatRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -49,7 +49,7 @@ func (d *DocCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error)
         return nil, err2
     }
 
-    pageResult := &base.PageResult{
+    pageResult := &common.PageResult{
         Total:    total,
         PageSize: limit,
         Page:     page,

pkg/system/repository/doc_dir_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewDocDirRepo(engine *xorm.Engine) *DocDirRepo {
     }
 }
 
-func (d *DocDirRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *DocDirRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -61,7 +61,7 @@ func (d *DocDirRepo) GetPage(m map[string]interface{}) (*base.PageResult, error)
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/system/repository/doc_file_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewDocFileRepo(engine *xorm.Engine) *DocFileRepo {
     }
 }
 
-func (d *DocFileRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *DocFileRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -66,7 +66,7 @@ func (d *DocFileRepo) GetPage(m map[string]interface{}) (*base.PageResult, error
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/system/repository/group_cat_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewGroupCatRepo(engine *xorm.Engine) *GroupCatRepo {
     }
 }
 
-func (d *GroupCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *GroupCatRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -49,7 +49,7 @@ func (d *GroupCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, erro
         return nil, err2
     }
 
-    pageResult := &base.PageResult{
+    pageResult := &common.PageResult{
         Total:    total,
         PageSize: limit,
         Page:     page,

pkg/system/repository/msg_cat_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewMsgCatRepo(engine *xorm.Engine) *MsgCatRepo {
     }
 }
 
-func (d *MsgCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *MsgCatRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -49,7 +49,7 @@ func (d *MsgCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error)
         return nil, err2
     }
 
-    pageResult := &base.PageResult{
+    pageResult := &common.PageResult{
         Total:    total,
         PageSize: limit,
         Page:     page,

pkg/system/repository/msg_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewMsgRepo(engine *xorm.Engine) *MsgRepo {
     }
 }
 
-func (d *MsgRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *MsgRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -87,7 +87,7 @@ func (d *MsgRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/system/repository/oc_cat_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewOcCatRepo(engine *xorm.Engine) *OcCatRepo {
     }
 }
 
-func (d *OcCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *OcCatRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -55,7 +55,7 @@ func (d *OcCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error)
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/system/repository/oc_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -48,7 +48,7 @@ func (d *OcRepo) GetById(ocId int64) (*viewmodel.OcInfo, error) {
     }
 }
 
-func (d *OcRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *OcRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -103,7 +103,7 @@ func (d *OcRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/system/repository/oc_type_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewOcTypeRepo(engine *xorm.Engine) *OcTypeRepo {
     }
 }
 
-func (d *OcTypeRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *OcTypeRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
 
@@ -46,7 +46,7 @@ func (d *OcTypeRepo) GetPage(m map[string]interface{}) (*base.PageResult, error)
         return nil, err2
     }
 
-    pageResult := &base.PageResult{
+    pageResult := &common.PageResult{
         Total:    total,
         PageSize: limit,
         Page:     page,

pkg/system/repository/position_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewPositionRepo(engine *xorm.Engine) *PositionRepo {
     }
 }
 
-func (d *PositionRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *PositionRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     ocId := m["ocId"].(int64)
     limit := m["limit"].(int)
     page := m["page"].(int)
@@ -47,7 +47,7 @@ func (d *PositionRepo) GetPage(m map[string]interface{}) (*base.PageResult, erro
         return nil, err
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/system/repository/role_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewRoleRepo(engine *xorm.Engine) *RoleRepo {
     }
 }
 
-func (d *RoleRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *RoleRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     limit := m["limit"].(int)
     page := m["page"].(int)
     sqlSelect := ` SELECT A.role_id ,
@@ -54,7 +54,7 @@ func (d *RoleRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
         return nil, err
     }
 
-    pageResult := &base.PageResult{
+    pageResult := &common.PageResult{
         Total:    total,
         PageSize: limit,
         Page:     page,

pkg/system/repository/task_cat_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -19,13 +19,12 @@ func NewTaskCatRepo(engine *xorm.Engine) *TaskCatRepo {
     }
 }
 
-func (d *TaskCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
-    limit := m["limit"].(int)
-    page := m["page"].(int)
-
-    sqlSelect := ` SELECT A.*                 `
-    sqlFrom := ` FROM   task_cat   AS A     `
-    sqlWhere := ` WHERE  A.deleted_flag = 0  `
+func (d *TaskCatRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
+    limit       := m["limit"].(int)
+    page        := m["page"].(int)
+    sqlSelect   := ` SELECT A.*                 `
+    sqlFrom     := ` FROM   task_cat   AS A     `
+    sqlWhere    := ` WHERE  A.deleted_flag = 0  `
     if ocId, ok := m["ocId"]; ok {
         sqlWhere += fmt.Sprintf(" AND A.oc_id = %d ", ocId)
     }
@@ -38,17 +37,17 @@ func (d *TaskCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error
         return nil, err1
     }
 
-    sqlOrderBy := " ORDER BY A.task_cat_id DESC "
-    pageStart := (page - 1) * limit
-    sqlLimit := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
+    sqlOrderBy  := " ORDER BY A.task_cat_id DESC "
+    pageStart   := (page - 1) * limit
+    sqlLimit    := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
 
-    datalist := make([]datamodel.TaskCat, 0)
+    datalist    := make([]datamodel.TaskCat, 0)
     err2 := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy + sqlLimit).Find(&datalist)
     if err2 != nil {
         return nil, err2
     }
 
-    pageResult := &base.PageResult{
+    pageResult := &common.PageResult{
         Total:    total,
         PageSize: limit,
         Page:     page,
@@ -59,12 +58,11 @@ func (d *TaskCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error
 }
 
 func (d *TaskCatRepo) GetList(m map[string]interface{}) ([]viewmodel.TaskCatInfo, error) {
-    ocId := m["ocId"].(int64)
-
-    sqlSelect := ` SELECT A.* `
-    sqlFrom := ` FROM  task_cat   AS A    `
-    sqlWhere := ` WHERE A.deleted_flag = 0 `
-    sqlWhere += fmt.Sprintf(" AND A.oc_id = %d ", ocId)
+    ocId        := m["ocId"].(int64)
+    sqlSelect   := ` SELECT A.*                 `
+    sqlFrom     := ` FROM  task_cat   AS A      `
+    sqlWhere    := ` WHERE A.deleted_flag = 0   `
+    sqlWhere    += fmt.Sprintf(" AND A.oc_id = %d ", ocId)
     if ocId, ok := m["ocId"]; ok {
         sqlWhere += fmt.Sprintf(" AND A.oc_id = %d ", ocId)
     }
@@ -83,9 +81,11 @@ func (d *TaskCatRepo) GetList(m map[string]interface{}) ([]viewmodel.TaskCatInfo
 }
 
 func (d *TaskCatRepo) GetById(ocId int64, taskCatId int64) (*viewmodel.TaskCatInfo, error) {
-    sqlSelect := ` SELECT A.*               `
-    sqlFrom := ` FROM  task_cat AS A      `
-    sqlWhere := ` WHERE A.deleted_flag = 0 AND A.oc_id =` + fmt.Sprintf("%d", ocId)
+    sqlSelect   := ` SELECT A.*               `
+    sqlFrom     := ` FROM  task_cat AS A      `
+    sqlWhere    := ` WHERE A.deleted_flag = 0 `
+    sqlWhere    += fmt.Sprintf("AND A.oc_id       = %d ", ocId)
+    sqlWhere    += fmt.Sprintf("AND A.task_cat_id = %d ", taskCatId)
     data := &viewmodel.TaskCatInfo{}
     has, err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere).Get(data)
     if !has || err != nil {
@@ -122,6 +122,8 @@ func (d *TaskCatRepo) Delete(m map[string]interface{}) error {
     data.DeletedFlag = 1
     data.DeletedBy = deletedBy
     data.DeletedAt = time.Now()
-    _, err := d.engine.Where("oc_id = ?", ocId).Where("task_cat_id = ?", taskCatId).Update(data)
+    _, err := d.engine.Where("oc_id = ?", ocId).
+        Where("task_cat_id = ?", taskCatId).
+        Update(data)
     return err
 }

pkg/system/repository/task_repo.go

@@ -4,7 +4,7 @@ import (
     "fmt"
     "time"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -19,7 +19,7 @@ func NewTaskRepo(engine *xorm.Engine) *TaskRepo {
     }
 }
 
-func (d *TaskRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *TaskRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     ocId := m["ocId"].(int64)
     limit := m["limit"].(int)
     page := m["page"].(int)
@@ -48,7 +48,7 @@ func (d *TaskRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
         return nil, err2
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/system/repository/user_repo.go

@@ -4,7 +4,7 @@ import "C"
 import (
     "fmt"
     "xorm.io/xorm"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/viewmodel"
 )
@@ -64,7 +64,7 @@ func (d *UserRepo) GetById(ocId, groupId, userId int64) (*viewmodel.UserInfo, er
     }
 }
 
-func (d *UserRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (d *UserRepo) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     ocId := m["ocId"].(int64)
     limit := m["limit"].(int)
     page := m["page"].(int)
@@ -147,7 +147,7 @@ func (d *UserRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
         return nil, err
     }
 
-    pageResult := &base.PageResult{}
+    pageResult := &common.PageResult{}
     pageResult.Data = datalist
     pageResult.Total = total
     pageResult.PageSize = limit

pkg/system/service/art_cat_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     repositories "xps/pkg/system/repository"
     "xps/pkg/system/viewmodel"
@@ -10,7 +10,7 @@ import (
 
 type ArtCatService interface {
     GetList(m map[string]interface{}) ([]viewmodel.ArtCatInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(ocId, artCatId int64) (*viewmodel.ArtCatInfo, error)
     Create(d *datamodel.ArtCat) error
     Update(d *datamodel.ArtCat) error
@@ -31,7 +31,7 @@ func (s *artCatService) GetList(m map[string]interface{}) ([]viewmodel.ArtCatInf
     return s.repo.GetList(m)
 }
 
-func (s *artCatService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *artCatService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/system/service/art_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     repositories "xps/pkg/system/repository"
     "xps/pkg/system/viewmodel"
@@ -10,7 +10,7 @@ import (
 
 type ArtService interface {
     GetList(m map[string]interface{}) ([]viewmodel.ArtInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(ocId, artId int64) (*viewmodel.ArtInfo, error)
     Create(d *datamodel.Art) error
     Update(d *datamodel.Art) error
@@ -31,7 +31,7 @@ func (s *artService) GetList(m map[string]interface{}) ([]viewmodel.ArtInfo, err
     return s.repo.GetList(m)
 }
 
-func (s *artService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *artService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/system/service/doc_cat_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     repositories "xps/pkg/system/repository"
     "xps/pkg/system/viewmodel"
@@ -10,7 +10,7 @@ import (
 
 type DocCatService interface {
     GetList(m map[string]interface{}) ([]viewmodel.DocCatInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(ocId, docCatId int64) (*viewmodel.DocCatInfo, error)
     Create(d *datamodel.DocCat) error
     Update(d *datamodel.DocCat) error
@@ -31,7 +31,7 @@ func (s *docCatService) GetList(m map[string]interface{}) ([]viewmodel.DocCatInf
     return s.repo.GetList(m)
 }
 
-func (s *docCatService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *docCatService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/system/service/doc_dir_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     repositories "xps/pkg/system/repository"
     "xps/pkg/system/viewmodel"
@@ -10,7 +10,7 @@ import (
 
 type DocDirService interface {
     GetList(m map[string]interface{}) ([]viewmodel.DocDirInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(ocId, dirId int64) (*viewmodel.DocDirInfo, error)
     Create(d *datamodel.DocDir) error
     Update(d *datamodel.DocDir) error
@@ -31,7 +31,7 @@ func (s *docDirService) GetList(m map[string]interface{}) ([]viewmodel.DocDirInf
     return s.repo.GetList(m)
 }
 
-func (s *docDirService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *docDirService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/system/service/doc_file_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     repositories "xps/pkg/system/repository"
     "xps/pkg/system/viewmodel"
@@ -10,7 +10,7 @@ import (
 
 type DocFileService interface {
     GetList(m map[string]interface{}) ([]viewmodel.DocFileInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(ocId, fileId int64) (*viewmodel.DocFileInfo, error)
     Create(d *datamodel.DocFile) error
     Update(d *datamodel.DocFile) error
@@ -31,7 +31,7 @@ func (s *docFileService) GetList(m map[string]interface{}) ([]viewmodel.DocFileI
     return s.repo.GetList(m)
 }
 
-func (s *docFileService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *docFileService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/system/service/group_cat_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     repositories "xps/pkg/system/repository"
     "xps/pkg/system/viewmodel"
@@ -10,7 +10,7 @@ import (
 
 type GroupCatService interface {
     GetList(m map[string]interface{}) ([]viewmodel.GroupCatInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(ocId int64, groupCatId int64) (*viewmodel.GroupCatInfo, error)
     Create(d *datamodel.GroupCat) error
     Update(d *datamodel.GroupCat) error
@@ -31,7 +31,7 @@ func (s *groupCatService) GetList(m map[string]interface{}) ([]viewmodel.GroupCa
     return s.repo.GetList(m)
 }
 
-func (s *groupCatService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *groupCatService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/system/service/group_service.go

@@ -21,7 +21,7 @@ type groupService struct {
     groupRepo               *repositories.GroupRepo
     groupMemberRepo         *repositories.GroupMemberRepo
     groupMemberPositionRepo *repositories.GroupMemberPositionRepo
-    //groupMemberPositionGrantRepo *base.GroupMemberPositionGrantRepo
+    //groupMemberPositionGrantRepo *common.GroupMemberPositionGrantRepo
 }
 
 func NewGroupService() GroupService {
@@ -29,7 +29,7 @@ func NewGroupService() GroupService {
         groupRepo:               repositories.NewGroupRepo(datasource.InstanceMaster()),
         groupMemberRepo:         repositories.NewGroupMemberRepo(datasource.InstanceMaster()),
         groupMemberPositionRepo: repositories.NewGroupMemberPositionRepo(datasource.InstanceMaster()),
-        //groupMemberPositionGrantRepo : base.NewGroupMemberPositionGrantRepo(datasource.InstanceMaster()),
+        //groupMemberPositionGrantRepo : common.NewGroupMemberPositionGrantRepo(datasource.InstanceMaster()),
     }
 }
 

pkg/system/service/msg_cat_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     repositories "xps/pkg/system/repository"
     "xps/pkg/system/viewmodel"
@@ -10,7 +10,7 @@ import (
 
 type MsgCatService interface {
     GetList(m map[string]interface{}) ([]viewmodel.MsgCatInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(ocId int64, msgCatId int64) (*viewmodel.MsgCatInfo, error)
     Create(d *datamodel.MsgCat) error
     Update(d *datamodel.MsgCat) error
@@ -31,7 +31,7 @@ func (s *msgCatService) GetList(m map[string]interface{}) ([]viewmodel.MsgCatInf
     return s.repo.GetList(m)
 }
 
-func (s *msgCatService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *msgCatService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/system/service/msg_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     repositories "xps/pkg/system/repository"
     "xps/pkg/system/viewmodel"
@@ -10,7 +10,7 @@ import (
 
 type MsgService interface {
     GetList(m map[string]interface{}) ([]viewmodel.MsgInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(ocId, msgId int64) (*viewmodel.MsgInfo, error)
     Create(d *datamodel.Msg) error
     Update(d *datamodel.Msg) error
@@ -31,7 +31,7 @@ func (s *msgService) GetList(m map[string]interface{}) ([]viewmodel.MsgInfo, err
     return s.modelRepo.GetList(m)
 }
 
-func (s *msgService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *msgService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.modelRepo.GetPage(m)
 }
 

pkg/system/service/oc_cat_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     repositories "xps/pkg/system/repository"
     "xps/pkg/system/viewmodel"
@@ -10,7 +10,7 @@ import (
 
 type OcCatService interface {
     GetList(m map[string]interface{}) ([]viewmodel.OcCatInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(ocTypeId, ocCatId int64) (*viewmodel.OcCatInfo, error)
     GetListById(ocTypeId int64) ([]viewmodel.OcCatInfo, error)
     Create(d *datamodel.OcCat) error
@@ -32,7 +32,7 @@ func (s *ocCatService) GetList(m map[string]interface{}) ([]viewmodel.OcCatInfo,
     return s.repo.GetList(m)
 }
 
-func (s *ocCatService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *ocCatService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }
 

pkg/system/service/oc_service.go

@@ -4,7 +4,7 @@ import (
     "time"
     "xps/cmd/constant"
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/repository"
     "xps/pkg/system/viewmodel"
@@ -12,7 +12,7 @@ import (
 
 type OcService interface {
     GetList(m map[string]interface{}) ([]viewmodel.OcInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(ocId int64) (*viewmodel.OcInfo, error)
     Create(d *datamodel.Oc) error
     Update(d *datamodel.Oc) error
@@ -48,7 +48,7 @@ func (s *ocService) GetList(m map[string]interface{}) ([]viewmodel.OcInfo, error
     return s.ocRepo.GetList(m)
 }
 
-func (s *ocService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *ocService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.ocRepo.GetPage(m)
 }
 

pkg/system/service/oc_type_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
     "xps/cmd/datasource"
-    "xps/pkg/base"
+    "xps/pkg/common"
     "xps/pkg/system/datamodel"
     "xps/pkg/system/repository"
     "xps/pkg/system/viewmodel"
@@ -10,7 +10,7 @@ import (
 
 type OcTypeService interface {
     GetList(m map[string]interface{}) ([]viewmodel.OcTypeInfo, error)
-    GetPage(m map[string]interface{}) (*base.PageResult, error)
+    GetPage(m map[string]interface{}) (*common.PageResult, error)
     GetById(ocTypeId int64) (*viewmodel.OcTypeInfo, error)
     Create(d *datamodel.OcType) error
     Update(d *datamodel.OcType) error
@@ -31,7 +31,7 @@ func (s *ocTypeService) GetList(m map[string]interface{}) ([]viewmodel.OcTypeInf
     return s.repo.GetList(m)
 }
 
-func (s *ocTypeService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
+func (s *ocTypeService) GetPage(m map[string]interface{}) (*common.PageResult, error) {
     return s.repo.GetPage(m)
 }