init

datamodels/model_object.go

@@ -2,7 +2,7 @@ package datamodels
 
 import "time"
 
-type Object struct {
+type ModelObject struct {
 	ModelId     int64     `json:"modelId"         xorm:"'model_id'        bigint      pk comment('主键ID')         "`
 	ObjectId    int64     `json:"objectId"        xorm:"'object_id'       bigint      pk comment('主键ID')         "`
 	ObjectType  int64     `json:"objectType"      xorm:"'object_type'     bigint         comment('Type')           "`
@@ -19,6 +19,6 @@ type Object struct {
 	DeletedAt   time.Time `json:"deletedAt"       xorm:"'deleted_at'"`
 }
 
-func (t *Object) TableName() string {
+func (t *ModelObject) TableName() string {
 	return "ds_object"
 }

datamodels/model_object_attr.go

@@ -2,7 +2,7 @@ package datamodels
 
 import "time"
 
-type ObjectAttr struct {
+type ModelObjectAttr struct {
 	ModelId      int64     `json:"modelId"         xorm:"'model_id'         bigint      pk comment('主键ID')         "`
 	ObjectId     int64     `json:"objectId"        xorm:"'object_id'        bigint      pk comment('主键ID')         "`
 	AttrId       int64     `json:"attrId"          xorm:"'attr_id'          bigint      pk comment('主键ID')         "`
@@ -25,6 +25,6 @@ type ObjectAttr struct {
 	DeletedAt    time.Time `json:"deletedAt"       xorm:"'deleted_at'"`
 }
 
-func (t *ObjectAttr) TableName() string {
+func (t *ModelObjectAttr) TableName() string {
 	return "ds_object_attr"
 }

datamodels/model_object_oam.go

@@ -2,7 +2,7 @@ package datamodels
 
 import "time"
 
-type ObjectOAM struct {
+type ModelObjectOAM struct {
     ModelId      int64     `json:"modelId"         xorm:"'model_id'        bigint      pk comment('Model ID')       "`
     ObjectId     int64     `json:"objectId"        xorm:"'object_id'       bigint      pk comment('Object ID')      "`
     OamId        int64     `json:"oamId"           xorm:"'oam_id'          bigint      pk comment('OAM ID')         "`
@@ -25,6 +25,6 @@ type ObjectOAM struct {
     DeletedAt    time.Time `json:"deletedAt"       xorm:"'deleted_at'"`
 }
 
-func (t *ObjectOAM) TableName() string {
+func (t *ModelObjectOAM) TableName() string {
     return "ds_object_oam"
 }

datamodels/task.go

@@ -3,28 +3,29 @@ package datamodels
 import "time"
 
 type Task struct {
-    OcId                	int64       `json:"-"                     xorm:"'oc_id'                    bigint       comment('OC ID')       " `
-    TaskId              	int64       `json:"taskId"                xorm:"'task_id'                  bigint    pk comment('主键ID')       " `
-    TaskCode            	string      `json:"taskCode"              xorm:"'task_code'                varchar(127) comment('TASK编码')     " `
-    TaskTitle           	string      `json:"taskTitle"             xorm:"'task_title'               varchar(127) comment('TASK类型名称')  " `
-    TaskDesc                string      `json:"taskDesc"              xorm:"'task_desc'                varchar(127) comment('描述')         " `
-    TaskCatId           	int64       `json:"taskCatId"             xorm:"'task_cat_id'              bigint       comment('类别ID')       " `
-    TaskExpectedStartTime   string      `json:"taskExpectedStartTime" xorm:"'task_expected_starttime'  datetime     comment('TASK类型名称')  " `
-    TaskExpectedEndTime     string      `json:"taskExpectedEndTime"   xorm:"'task_expected_endtime'    datetime     comment('TASK类型名称')  " `
-    TaskActualStartTime     string      `json:"taskActualStartTime"   xorm:"'task_actual_starttime'    datetime     comment('实际开始时间')  " `
-    TaskActualEndTime       string      `json:"taskActualEndTime"     xorm:"'task_actual_endtime'      datetime     comment('实际结束时间')  " `
-    TaskPriority           	int64       `json:"taskPriority"          xorm:"'task_priority'            bigint       comment('优先级')       " `
-    TaskUrgency           	int64       `json:"taskUrgency"           xorm:"'task_urgency'             bigint       comment('紧急程序')     " `
-    Status           	    int64       `json:"status"                xorm:"'status'                   bigint       comment('状态')        " `
-    TaskLevel               int64       `json:"taskLevel"             xorm:"'task_level'               bigint       comment('任务级别')     " `
-    TaskParentId            int64       `json:"taskParentId"          xorm:"'task_parent_id'           bigint       comment('父任务')       " `
-    TaskOrigin              int64       `json:"taskOrigin"            xorm:"'task_origin'              bigint       comment('任务来源')     " `
+    OcId                int64       `json:"ocId"                  xorm:"'oc_id'                bigint       comment('OC ID')       " `
+    TaskId              int64       `json:"taskId"                xorm:"'task_id'              bigint    pk comment('主键ID')       " `
+    TaskCode            string      `json:"taskCode"              xorm:"'task_code'            varchar(127) comment('TASK编码')     " `
+    TaskTitle           string      `json:"taskTitle"             xorm:"'task_title'           varchar(127) comment('TASK类型名称')  " `
+    TaskDesc            string      `json:"taskDesc"              xorm:"'task_desc'            varchar(127) comment('描述')         " `
+    TaskCatId           int64       `json:"taskCatId"             xorm:"'task_cat_id'          bigint       comment('类别ID')       " `
+    TaskTypeId          int64       `json:"taskTypeId"            xorm:"'task_type_id'         bigint       comment('类别ID')       " `
+    ExpectedStartTime   string      `json:"expectedStartTime"     xorm:"'expected_start_time'  datetime     comment('TASK类型名称')  " `
+    ExpectedEndTime     string      `json:"expectedEndTime"       xorm:"'expected_end_time'    datetime     comment('TASK类型名称')  " `
+    ActualStartTime     string      `json:"actualStartTime"       xorm:"'actual_start_time'    datetime     comment('实际开始时间')  " `
+    ActualEndTime       string      `json:"actualEndTime"         xorm:"'actual_end_time'      datetime     comment('实际结束时间')  " `
+    TaskPriority        int64       `json:"taskPriority"          xorm:"'task_priority'        bigint       comment('优先级')       " `
+    TaskUrgency         int64       `json:"taskUrgency"           xorm:"'task_urgency'         bigint       comment('紧急程序')     " `
+    Status           	int64       `json:"status"                xorm:"'status'               bigint       comment('状态')        " `
+    TaskLevel           int64       `json:"taskLevel"             xorm:"'task_level'           bigint       comment('任务级别')     " `
+    ParentId            int64       `json:"parentId"              xorm:"'parent_id'            bigint       comment('父任务')       " `
+    TaskOrigin          int64       `json:"taskOrigin"            xorm:"'task_origin'          bigint       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'  " `
+    CreatedBy           int64       `json:"createdBy"             xorm:"'created_by'  " `
+    CreatedAt           time.Time   `json:"createdAt"             xorm:"'created_at'  " `
+    UpdatedBy           int64       `json:"updatedBy"             xorm:"'updated_by'  " `
+    UpdatedAt           time.Time   `json:"updatedAt"             xorm:"'updated_at'  " `
+    DeletedFlag         int64       `json:"deletedFlag"           xorm:"'deleted_flag'" `
+    DeletedBy           int64       `json:"deletedBy"             xorm:"'deleted_by'  " `
+    DeletedAt           time.Time   `json:"deletedAt"             xorm:"'deleted_at'  " `
 }

datamodels/wf_def.go

@@ -1 +1,20 @@
 package datamodels
+
+import "time"
+
+type WfDef struct {
+    WfDefId      int64     `json:"wfDefId"         xorm:"'wf_def_id'     bigint    pk comment('主键ID')       " `
+    WfDefTitle   string    `json:"wfDefTitle"      xorm:"'wf_def_title'  varchar(127) comment('TASK类型名称')  " `
+    WfDefDesc    string    `json:"wfDefDesc"       xorm:"'wf_def_desc'   varchar(127) 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 (m *WfDef) TableName() string {
+    return "wf_def"
+}

datamodels/wf_ins.go

@@ -1 +1,26 @@
 package datamodels
+
+import "time"
+
+type WfIns struct {
+    OcId         int64     `json:"ocId"            xorm:"'oc_id'         bigint    pk comment('OC Id')       " `
+    WfDefId      int64     `json:"wfDefId"         xorm:"'wf_def_id'     bigint    pk comment('主键ID')       " `
+    WfInsId      int64     `json:"wfInsId"         xorm:"'wf_ins_id'     bigint    pk comment('主键ID')       " `
+    WfInsTitle   string    `json:"wfInsTitle"      xorm:"'wf_ins_title'  varchar(127) comment('描述')         " `
+    BeginTime    time.Time `json:"beginTime"       xorm:"'begin_time'    datetime     comment('描述')         " `
+    FinishTime   time.Time `json:"finishTime"      xorm:"'finish_time'   datetime     comment('描述')         " `
+    Status       int64     `json:"status"          xorm:"'status'        bigint       comment('Status')      " `
+    CurGroupId   int64     `json:"curGroupId"      xorm:"'cur_group_id'  bigint       comment('CurGroupId')  " `
+    
+    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 (m *WfIns) TableName() string {
+    return "wf_ins"
+}

repositories/biz_object_attr_repo.go

@@ -0,0 +1,164 @@
+package repositories
+
+import (
+"fmt"
+"time"
+"xorm.io/xorm"
+"xps/datamodels"
+"xps/viewmodels"
+)
+
+type BizObjectAttrRepo struct {
+    engine *xorm.Engine
+}
+
+func NewBizObjectAttrRepo(engine *xorm.Engine) *BizObjectAttrRepo {
+    return &BizObjectAttrRepo{
+        engine: engine,
+    }
+}
+
+func (d *BizObjectAttrRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+    limit     := m["limit"].(int)
+    page      := m["page"].(int)
+    
+    sqlSelect := ` SELECT A.*                   `
+    sqlFrom   := ` FROM   biz_object_attr   AS A `
+    sqlWhere  := ` WHERE A.deleted_flag = 0     `
+    if keywords, ok := m["keywords"]; ok {
+        sqlWhere += ` AND A.attr_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
+    }
+    
+    sqlCount  := ` SELECT COUNT(*)              `
+    total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(viewmodels.BizObjectAttrInfo))
+    if err1 != nil {
+        return nil, err1
+    }
+    sqlOrderBy := " ORDER BY A.sort_no "
+    
+    pageStart  := (page - 1) * limit
+    sqlLimit   := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
+    
+    datalist := make([]viewmodels.BizObjectAttrInfo, 0)
+    err2 := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy + sqlLimit).Find(&datalist)
+    if err2 != nil {
+        return nil, err2
+    }
+    
+    pageResult := &viewmodels.PageResult{}
+    pageResult.Data     = datalist
+    pageResult.Total    = total
+    pageResult.PageSize = limit
+    pageResult.Page     = page
+    return pageResult, nil
+}
+
+func (d *BizObjectAttrRepo) GetList(m map[string]interface{}) ([]viewmodels.BizObjectAttrInfo, error) {
+    sqlSelect  := ` SELECT A.*                 `
+    sqlFrom    := ` FROM   biz_object_attr AS A  `
+    sqlWhere   := ` WHERE  A.deleted_flag = 0   `
+    if keywords, ok := m["keywords"]; ok {
+        sqlWhere += ` AND A.attr_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
+    }
+    sqlOrderBy := " ORDER BY A.sort_no "
+    
+    datalist   := make([]viewmodels.BizObjectAttrInfo, 0)
+    err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
+    if err != nil {
+        return nil, err
+    } else {
+        return datalist, nil
+    }
+}
+
+func (d *BizObjectAttrRepo) GetAll() ([]viewmodels.BizObjectAttrInfo, error) {
+    sqlSelect  := ` SELECT A.*                  `
+    sqlFrom    := ` FROM   biz_object_attr AS A  `
+    sqlWhere   := ` WHERE  A.deleted_flag = 0   `
+    sqlOrderBy := ` ORDER BY A.sort_no          `
+    
+    datalist   := make([]viewmodels.BizObjectAttrInfo, 0)
+    err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
+    if err != nil {
+        return nil, err
+    } else {
+        return datalist, nil
+    }
+}
+
+func (d *BizObjectAttrRepo) GetListById(bizId, objectId int64) ([]viewmodels.BizObjectAttrInfo, error) {
+    sqlSelect  := ` SELECT A.*                 `
+    sqlFrom    := ` FROM  biz_object_attr AS A  `
+    sqlWhere   := ` WHERE A.deleted_flag = 0   `
+    sqlWhere   += fmt.Sprintf(" AND A.biz_id  = %d", bizId)
+    sqlWhere   += fmt.Sprintf(" AND A.object_id = %d", objectId)
+    sqlOrderBy := " ORDER BY A.sort_no "
+    
+    datalist   := make([]viewmodels.BizObjectAttrInfo, 0)
+    err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
+    if err != nil {
+        return nil, err
+    } else {
+        return datalist, nil
+    }
+}
+
+func (d *BizObjectAttrRepo) GetById(bizId, objectId, attrId int64) (*viewmodels.BizObjectAttrInfo, error) {
+    data    := &viewmodels.BizObjectAttrInfo{}
+    ok, err := d.engine.
+        Where("biz_id = ?", bizId).
+        Where("object_id = ?", objectId).
+        Where("attr_id = ?", attrId).
+        Get(data)
+    if !ok && err == nil {
+        return nil, err
+    } else {
+        return data, nil
+    }
+}
+
+func (d *BizObjectAttrRepo) Create(data *datamodels.BizObjectAttr) error {
+    data.CreatedAt = time.Now()
+    _, err := d.engine.Insert(data)
+    return err
+}
+
+func (d *BizObjectAttrRepo) Update(data *datamodels.BizObjectAttr) error {
+    bizId     := data.BizId
+    objectId  := data.ObjectId
+    attrId    := data.AttrId
+    data.UpdatedAt = time.Now()
+    _, err := d.engine.
+        Where("biz_id = ?", bizId).
+        Where("object_id = ?", objectId).
+        Where("attr_id = ?", attrId).
+        Update(data)
+    return err
+}
+
+func (d *BizObjectAttrRepo) Delete(m map[string]interface{}) error {
+    bizId   := m["bizId"].(int64)
+    objectId  := m["objectId"].(int64)
+    attrId    := m["attrId"].(int64)
+    deletedBy := m["deletedBy"].(int64)
+    
+    data := &datamodels.BizObjectAttr{}
+    data.DeletedFlag = 1
+    data.DeletedBy   = deletedBy
+    data.DeletedAt   = time.Now()
+    _, err := d.engine.
+        Where("biz_id = ?", bizId).
+        Where("object_id = ?", objectId).
+        Where("attr_id = ?", attrId).
+        Delete(data)
+    return err
+}
+
+func (d *BizObjectAttrRepo) DeleteByObjectId(bizId, objectId int64) error {
+    data := &datamodels.BizObjectAttr{}
+    _, err := d.engine.
+        Where("biz_id = ?", bizId).
+        Where("object_id = ?", objectId).
+        Delete(data)
+    return err
+}

repositories/biz_object_repo.go

@@ -0,0 +1,147 @@
+package repositories
+
+
+import (
+    "fmt"
+    "time"
+    "xorm.io/xorm"
+    "xps/datamodels"
+    "xps/viewmodels"
+)
+
+type BizObjectRepo struct {
+    engine *xorm.Engine
+}
+
+func NewBizObjectRepo(engine *xorm.Engine) *BizObjectRepo {
+    return &BizObjectRepo{
+        engine: engine,
+    }
+}
+
+func (d *BizObjectRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+    limit := m["limit"].(int)
+    page  := m["page"].(int)
+    
+    sqlSelect := ` SELECT A.*,
+                          B.biz_title      `
+    sqlFrom   := ` FROM   biz_object   AS A
+                   LEFT JOIN biz AS B ON (A.biz_id = B.biz_id)  `
+    sqlWhere  := ` WHERE A.deleted_flag = 0  `
+    if keywords, ok := m["keywords"]; ok {
+        sqlWhere += ` AND A.object_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
+    }
+    
+    sqlCount := ` SELECT COUNT(*) `
+    total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(viewmodels.BizObjectInfo))
+    if err1 != nil {
+        return nil, err1
+    }
+    sqlOrderBy := " ORDER BY A.biz_id, A.object_id "
+    
+    pageStart  := (page - 1) * limit
+    sqlLimit   := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
+    
+    datalist := make([]viewmodels.BizObjectInfo, 0)
+    err2 := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy + sqlLimit).Find(&datalist)
+    if err2 != nil {
+        return nil, err2
+    }
+    
+    pageResult := &viewmodels.PageResult{}
+    pageResult.Data     = datalist
+    pageResult.Total    = total
+    pageResult.PageSize = limit
+    pageResult.Page     = page
+    return pageResult, nil
+}
+
+func (d *BizObjectRepo) GetList(m map[string]interface{}) ([]viewmodels.BizObjectInfo, error) {
+    bizId   := m["bizId"].(int64)
+    
+    sqlSelect := ` SELECT    A.*,
+                             B.biz_title      `
+    sqlFrom   := ` FROM      biz_object   AS A
+                   LEFT JOIN biz AS B ON (A.biz_id = B.biz_id)  `
+    sqlWhere  := ` WHERE A.deleted_flag = 0 AND A.biz_id =` + fmt.Sprintf("%d", bizId)
+    if keywords, ok := m["keywords"]; ok {
+        sqlWhere += ` AND A.object_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
+    }
+    sqlOrderBy := " ORDER BY A.biz_id, A.object_id "
+    
+    datalist := make([]viewmodels.BizObjectInfo, 0)
+    err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
+    if err != nil {
+        return nil, err
+    } else {
+        return datalist, nil
+    }
+}
+
+func (d *BizObjectRepo) GetAll() ([]viewmodels.BizObjectInfo, error) {
+    sqlSelect  := ` SELECT    A.*,
+                              B.biz_title      `
+    sqlFrom    := ` FROM      biz_object  AS A
+                    LEFT JOIN biz   AS B ON (A.biz_id = B.biz_id)  `
+    sqlWhere   := ` WHERE A.deleted_flag = 0 `
+    sqlOrderBy := " ORDER BY A.biz_id, A.object_id "
+    
+    datalist := make([]viewmodels.BizObjectInfo, 0)
+    err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
+    if err != nil {
+        return nil, err
+    } else {
+        return datalist, nil
+    }
+}
+
+func (d *BizObjectRepo) GetById(bizId, objectId int64) (*viewmodels.BizObjectInfo, error) {
+    sqlSelect := ` SELECT    A.*,
+                             B.biz_title      `
+    sqlFrom   := ` FROM      biz_object   AS A
+                   LEFT JOIN biz AS B ON (A.biz_id = B.biz_id)  `
+    sqlWhere  := ` WHERE A.deleted_flag = 0 AND A.biz_id =` + fmt.Sprintf("%d", bizId)
+    sqlWhere  += fmt.Sprintf(" AND A.object_id = %d", objectId)
+    
+    data := &viewmodels.BizObjectInfo{}
+    has, err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere).Get(data)
+    if !has || err != nil {
+        return nil, err
+    } else {
+        return data, nil
+    }
+}
+
+func (d *BizObjectRepo) Create(data *datamodels.BizObject) error {
+    data.CreatedAt = time.Now()
+    _, err := d.engine.Insert(data)
+    return err
+}
+
+func (d *BizObjectRepo) Update(data *datamodels.BizObject) error {
+    bizId    := data.BizId
+    objectId := data.ObjectId
+    
+    data.UpdatedAt = time.Now()
+    _, err := d.engine.
+        Where("biz_id = ?", bizId).
+        Where("object_id = ?", objectId).
+        Update(data)
+    return err
+}
+
+func (d *BizObjectRepo) Delete(m map[string]interface{}) error {
+    bizId   := m["bizId"].(int64)
+    objectId  := m["objectId"].(int64)
+    deletedBy := m["deletedBy"].(int64)
+    
+    data := &datamodels.BizObject{}
+    data.DeletedFlag = 1
+    data.DeletedBy = deletedBy
+    data.DeletedAt = time.Now()
+    _, err := d.engine.
+        Where("biz_id = ?", bizId).
+        Where("object_id = ?", objectId).
+        Update(data)
+    return err
+}

repositories/biz_repo.go

@@ -0,0 +1,107 @@
+package repositories
+
+import (
+    "fmt"
+    "time"
+    "xorm.io/xorm"
+    "xps/datamodels"
+    "xps/viewmodels"
+)
+
+type BizRepo struct {
+    engine *xorm.Engine
+}
+
+func NewBizRepo(engine *xorm.Engine) *BizRepo {
+    return &BizRepo{
+        engine: engine,
+    }
+}
+
+func (d *BizRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+    limit     := m["limit"].(int)
+    page      := m["page"].(int)
+    
+    sqlSelect := ` SELECT A.*                `
+    sqlFrom   := ` FROM   biz   AS A    `
+    sqlWhere  := ` WHERE  A.deleted_flag = 0 `
+    if keywords, ok := m["keywords"]; ok {
+        sqlWhere += ` AND A.biz_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
+    }
+    
+    sqlCount  := ` SELECT COUNT(*)           `
+    total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(datamodels.Biz))
+    if err1 != nil {
+        return nil, err1
+    }
+    
+    sqlOrderBy := " ORDER BY biz_id ASC "
+    pageStart  := (page - 1) * limit
+    sqlLimit   := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
+    
+    datalist   := make([]datamodels.Biz, 0)
+    err2 := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy + sqlLimit).Find(&datalist)
+    if err2 != nil {
+        return nil, err2
+    }
+    
+    pageResult := &viewmodels.PageResult{}
+    pageResult.Data     = datalist
+    pageResult.Total    = total
+    pageResult.PageSize = limit
+    pageResult.Page     = page
+    return pageResult, nil
+}
+
+func (d *BizRepo) GetList(m map[string]interface{}) ([]viewmodels.BizInfo, error) {
+    sqlSelect := ` SELECT A.*               `
+    sqlFrom   := ` FROM  ds_biz   AS A    `
+    sqlWhere  := ` WHERE A.deleted_flag = 0 `
+    if keywords, ok := m["keywords"]; ok {
+        sqlWhere += ` AND A.biz_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
+    }
+    
+    sqlOrderBy := " ORDER BY biz_id ASC "
+    datalist   := make([]viewmodels.BizInfo, 0)
+    err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
+    if err != nil {
+        return nil, err
+    }
+    return datalist, nil
+}
+
+func (d *BizRepo) GetById(bizId int64) (*viewmodels.BizInfo, error) {
+    data := &viewmodels.BizInfo{}
+    ok, err := d.engine.Where("biz_id = ?", bizId).Get(data)
+    if !ok && err == nil {
+        return nil, err
+    } else {
+        return data, nil
+    }
+}
+
+func (d *BizRepo) Create(data *datamodels.Biz) error {
+    data.CreatedAt = time.Now()
+    _, err := d.engine.Insert(data)
+    return err
+}
+
+func (d *BizRepo) Update(data *datamodels.Biz) error {
+    bizId := data.BizId
+    
+    data.UpdatedAt = time.Now()
+    _, err := d.engine.Where("biz_id = ?", bizId).Update(data)
+    return err
+}
+
+func (d *BizRepo) Delete(m map[string]interface{}) error {
+    bizId     := m["bizId"].(int64)
+    deletedBy := m["deletedBy"].(int64)
+    
+    data := &datamodels.Biz{}
+    data.DeletedFlag = 1
+    data.DeletedBy   = deletedBy
+    data.DeletedAt   = time.Now()
+    _, err := d.engine.Where("biz_id = ?", bizId).Update(data)
+    return err
+}

repositories/model_object_attr_repo.go

@@ -30,7 +30,7 @@ func (d *ModelObjectAttrRepo) GetPage(m map[string]interface{}) (*viewmodels.Pag
 	}
 
 	sqlCount  := ` SELECT COUNT(*)              `
-	total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(datamodels.ObjectAttr))
+	total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(viewmodels.ModelObjectAttrInfo))
 	if err1 != nil {
 		return nil, err1
 	}
@@ -39,7 +39,7 @@ func (d *ModelObjectAttrRepo) GetPage(m map[string]interface{}) (*viewmodels.Pag
 	pageStart  := (page - 1) * limit
 	sqlLimit   := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
 
-	datalist := make([]datamodels.ObjectAttr, 0)
+	datalist := make([]viewmodels.ModelObjectAttrInfo, 0)
 	err2 := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy + sqlLimit).Find(&datalist)
 	if err2 != nil {
 		return nil, err2
@@ -117,13 +117,13 @@ func (d *ModelObjectAttrRepo) GetById(modelId, objectId, attrId int64) (*viewmod
 	}
 }
 
-func (d *ModelObjectAttrRepo) Create(data *datamodels.ObjectAttr) error {
+func (d *ModelObjectAttrRepo) Create(data *datamodels.ModelObjectAttr) error {
 	data.CreatedAt = time.Now()
 	_, err := d.engine.Insert(data)
 	return err
 }
 
-func (d *ModelObjectAttrRepo) Update(data *datamodels.ObjectAttr) error {
+func (d *ModelObjectAttrRepo) Update(data *datamodels.ModelObjectAttr) error {
 	modelId   := data.ModelId
 	objectId  := data.ObjectId
 	attrId    := data.AttrId
@@ -142,7 +142,7 @@ func (d *ModelObjectAttrRepo) Delete(m map[string]interface{}) error {
 	attrId    := m["attrId"].(int64)
 	deletedBy := m["deletedBy"].(int64)
 
-	data := &datamodels.ObjectAttr{}
+	data := &datamodels.ModelObjectAttr{}
 	data.DeletedFlag = 1
 	data.DeletedBy   = deletedBy
 	data.DeletedAt   = time.Now()
@@ -155,7 +155,7 @@ func (d *ModelObjectAttrRepo) Delete(m map[string]interface{}) error {
 }
 
 func (d *ModelObjectAttrRepo) DeleteByObjectId(modelId, objectId int64) error {
-	data := &datamodels.ObjectAttr{}
+	data := &datamodels.ModelObjectAttr{}
 	_, err := d.engine.
 		Where("model_id = ?", modelId).
 		Where("object_id = ?", objectId).

repositories/model_object_oam_repo.go

@@ -50,13 +50,13 @@ func (d *ModelObjectOAMRepo) GetById(modelId, objectId, oamId int64) (*viewmodel
     }
 }
 
-func (d *ModelObjectOAMRepo) Create(data *datamodels.ObjectOAM) error {
+func (d *ModelObjectOAMRepo) Create(data *datamodels.ModelObjectOAM) error {
     data.CreatedAt = time.Now()
     _, err := d.engine.Insert(data)
     return err
 }
 
-func (d *ModelObjectOAMRepo) Update(data *datamodels.ObjectOAM) error {
+func (d *ModelObjectOAMRepo) Update(data *datamodels.ModelObjectOAM) error {
     modelId   := data.ModelId
     objectId  := data.ObjectId
     oamId     := data.OamId
@@ -76,7 +76,7 @@ func (d *ModelObjectOAMRepo) Delete(m map[string]interface{}) error {
     oamId     := m["oamId"].(int64)
     deletedBy := m["deletedBy"].(int64)
     
-    data := &datamodels.ObjectOAM{}
+    data := &datamodels.ModelObjectOAM{}
     data.DeletedFlag = 1
     data.DeletedBy   = deletedBy
     data.DeletedAt   = time.Now()
@@ -89,7 +89,7 @@ func (d *ModelObjectOAMRepo) Delete(m map[string]interface{}) error {
 }
 
 func (d *ModelObjectOAMRepo) DeleteByObjectId(modelId, objectId, oamId int64) error {
-    data := &datamodels.ObjectOAM{}
+    data := &datamodels.ModelObjectOAM{}
     _, err := d.engine.
         Where("model_id = ?", modelId).
         Where("object_id = ?", objectId).

repositories/model_object_repo.go

@@ -32,7 +32,7 @@ func (d *ModelObjectRepo) GetPage(m map[string]interface{}) (*viewmodels.PageRes
 	}
 
 	sqlCount := ` SELECT COUNT(*) `
-	total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(datamodels.Object))
+	total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(viewmodels.ModelObjectInfo))
 	if err1 != nil {
 		return nil, err1
 	}
@@ -41,7 +41,7 @@ func (d *ModelObjectRepo) GetPage(m map[string]interface{}) (*viewmodels.PageRes
 	pageStart  := (page - 1) * limit
 	sqlLimit   := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
 
-	datalist := make([]datamodels.Object, 0)
+	datalist := make([]viewmodels.ModelObjectInfo, 0)
 	err2 := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy + sqlLimit).Find(&datalist)
 	if err2 != nil {
 		return nil, err2
@@ -111,14 +111,14 @@ func (d *ModelObjectRepo) GetById(modelId, objectId int64) (*viewmodels.ModelObj
 	}
 }
 
-func (d *ModelObjectRepo) Create(data *datamodels.Object) error {
+func (d *ModelObjectRepo) Create(data *datamodels.ModelObject) error {
 	data.CreatedAt = time.Now()
 	_, err := d.engine.Insert(data)
 	return err
 }
 
-func (d *ModelObjectRepo) Update(data *datamodels.Object) error {
-	modelId := data.ObjectId
+func (d *ModelObjectRepo) Update(data *datamodels.ModelObject) error {
+	modelId  := data.ModelId
 	objectId := data.ObjectId
 
 	data.UpdatedAt = time.Now()
@@ -134,10 +134,10 @@ func (d *ModelObjectRepo) Delete(m map[string]interface{}) error {
 	objectId  := m["objectId"].(int64)
 	deletedBy := m["deletedBy"].(int64)
 
-	data := &datamodels.Object{}
+	data := &datamodels.ModelObject{}
 	data.DeletedFlag = 1
-	data.DeletedBy = deletedBy
-	data.DeletedAt = time.Now()
+	data.DeletedBy   = deletedBy
+	data.DeletedAt   = time.Now()
 	_, err := d.engine.
 		Where("model_id = ?", modelId).
 		Where("object_id = ?", objectId).

service/biz_object_attr_service.go

@@ -0,0 +1 @@
+package service

service/biz_object_service.go

@@ -0,0 +1 @@
+package service

service/biz_service.go

@@ -0,0 +1 @@
+package service

service/model_object_attr_service.go

@@ -11,8 +11,8 @@ type ModelObjectAttrService interface {
 	GetList(m map[string]interface{}) ([]viewmodels.ModelObjectAttrInfo, error)
 	GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
 	GetById(modelId, objectId, attrId int64) (*viewmodels.ModelObjectAttrInfo, error)
-	Create(d *datamodels.ObjectAttr) error
-	Update(d *datamodels.ObjectAttr) error
+	Create(d *datamodels.ModelObjectAttr) error
+	Update(d *datamodels.ModelObjectAttr) error
 	Delete(m map[string]interface{}) error
 }
 
@@ -38,12 +38,12 @@ func (s *modelObjectAttrService) GetById(modelId, objectId, attrId int64) (*view
 	return s.repo.GetById(modelId, objectId, attrId)
 }
 
-func (s *modelObjectAttrService) Create(ObjectAttr *datamodels.ObjectAttr) error {
+func (s *modelObjectAttrService) Create(ObjectAttr *datamodels.ModelObjectAttr) error {
 	ObjectAttr.AttrId = NewID()
 	return s.repo.Create(ObjectAttr)
 }
 
-func (s *modelObjectAttrService) Update(ObjectAttr *datamodels.ObjectAttr) error {
+func (s *modelObjectAttrService) Update(ObjectAttr *datamodels.ModelObjectAttr) error {
 	return s.repo.Update(ObjectAttr)
 }
 

service/model_object_oam_service.go

@@ -10,8 +10,8 @@ import (
 type ModelObjectOAMService interface {
     GetList(m map[string]interface{}) ([]viewmodels.ModelObjectOAMInfo, error)
     GetById(modelId, objectId, attrId int64) (*viewmodels.ModelObjectOAMInfo, error)
-    Create(d *datamodels.ObjectOAM) error
-    Update(d *datamodels.ObjectOAM) error
+    Create(d *datamodels.ModelObjectOAM) error
+    Update(d *datamodels.ModelObjectOAM) error
     Delete(m map[string]interface{}) error
 }
 
@@ -33,12 +33,12 @@ func (s *modelObjectOAMService) GetById(modelId, objectId, attrId int64) (*viewm
     return s.repo.GetById(modelId, objectId, attrId)
 }
 
-func (s *modelObjectOAMService) Create(ObjectOAM *datamodels.ObjectOAM) error {
+func (s *modelObjectOAMService) Create(ObjectOAM *datamodels.ModelObjectOAM) error {
     ObjectOAM.OamId = NewID()
     return s.repo.Create(ObjectOAM)
 }
 
-func (s *modelObjectOAMService) Update(ObjectOAM *datamodels.ObjectOAM) error {
+func (s *modelObjectOAMService) Update(ObjectOAM *datamodels.ModelObjectOAM) error {
     return s.repo.Update(ObjectOAM)
 }
 

service/model_object_service.go

@@ -14,8 +14,8 @@ type ModelObjectService interface {
 	GetList(m map[string]interface{}) ([]viewmodels.ModelObjectInfo, error)
 	GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
 	GetById(modelId, objectId int64) (*viewmodels.ModelObjectInfo, error)
-	Create(d *datamodels.Object) error
-	Update(d *datamodels.Object) error
+	Create(d *datamodels.ModelObject) error
+	Update(d *datamodels.ModelObject) error
 	Delete(m map[string]interface{}) error
 	GetObjectDataById(modelId, objectId int64) (*viewmodels.ModelObjectDataInfo, error)
 	CreateObjectData(d *viewmodels.ModelObjectData) error
@@ -46,12 +46,12 @@ func (s *modelObjectService) GetById(modelId, objectId int64) (*viewmodels.Model
 	return s.modelObjectRepo.GetById(modelId, objectId)
 }
 
-func (s *modelObjectService) Create(Object *datamodels.Object) error {
+func (s *modelObjectService) Create(Object *datamodels.ModelObject) error {
 	Object.ObjectId = NewID()
 	return s.modelObjectRepo.Create(Object)
 }
 
-func (s *modelObjectService) Update(Object *datamodels.Object) error {
+func (s *modelObjectService) Update(Object *datamodels.ModelObject) error {
 	return s.modelObjectRepo.Update(Object)
 }
 
@@ -94,7 +94,7 @@ func (s *modelObjectService) CreateObjectData(o *viewmodels.ModelObjectData) err
 	modelId   := o.ModelId
 	objectId  := NewID()
 	createdBy := o.CreatedBy
-	object := &datamodels.Object{
+	object := &datamodels.ModelObject{
 		ModelId:     modelId,
 		ObjectId:    objectId,
 		ObjectType:  o.ObjectType,
@@ -115,7 +115,7 @@ func (s *modelObjectService) CreateObjectData(o *viewmodels.ModelObjectData) err
 	attrsCache := make([]viewmodels.ModelObjectAttrInfo, 0)
 	for _, a := range o.Attrs {
 		newId := NewID()
-		objectAttr := &datamodels.ObjectAttr{
+		objectAttr := &datamodels.ModelObjectAttr{
 			ModelId:      modelId,
 			ObjectId:     objectId,
 			AttrId:       newId,
@@ -180,7 +180,7 @@ func (s *modelObjectService) UpdateObjectData(o *viewmodels.ModelObjectData) err
 	modelId   := o.ModelId
 	objectId  := o.ObjectId
 	updatedBy := o.UpdatedBy
-	object := &datamodels.Object{
+	object := &datamodels.ModelObject{
 		ModelId:     modelId,
 		ObjectId:    objectId,
 		ObjectType:  o.ObjectType,
@@ -205,7 +205,7 @@ func (s *modelObjectService) UpdateObjectData(o *viewmodels.ModelObjectData) err
 	attrsCache := make([]viewmodels.ModelObjectAttrInfo, 0)
 	for _, a := range o.Attrs {
 		newId := NewID()
-		objectAttr := &datamodels.ObjectAttr{
+		objectAttr := &datamodels.ModelObjectAttr{
 			ModelId:      modelId,
 			ObjectId:     objectId,
 			AttrId:       newId,

viewmodels/biz_info.go

@@ -0,0 +1,12 @@
+package viewmodels
+
+type BizInfo struct {
+    BizId       int64     `json:"bizId"           xorm:"'biz_id'        bigint     pk comment('Biz ID')        "`
+    BizTitle    string    `json:"bizTitle"        xorm:"'biz_title'     varchar(50)   comment('Biz Title')     "`
+    BizDesc     string    `json:"bizDesc"         xorm:"'biz_desc'      varchar(50)   comment('Biz Desc')      "`
+    IsFixed     int64     `json:"isFixed"         xorm:"'is_fixed'      bigint        comment('Is Fixed')      "`
+}
+
+func (t *BizInfo) TableName() string {
+    return "biz"
+}

viewmodels/biz_object_attr_info.go

@@ -0,0 +1,22 @@
+package viewmodels
+
+
+type BizObjectAttrInfo struct {
+    BizId           int64     `json:"bizId"           xorm:"'biz_id'            bigint      pk comment('Biz ID')         "`
+    ObjectId        int64     `json:"objectId"        xorm:"'object_id'         bigint      pk comment('Object ID')      "`
+    AttrId          int64     `json:"attrId"          xorm:"'attr_id'           bigint      pk comment('Attr ID')        "`
+    AttrTitle       string    `json:"attrTitle"       xorm:"'attr_title'        varchar(127)   comment('AttrTitle')      "`
+    AttrCode        string    `json:"attrCode"        xorm:"'attr_code'         varchar(127)   comment('AttrCode')       "`
+    AttrType        int64     `json:"attrType"        xorm:"'attr_type'         bigint         comment('Type')           "`
+    AttrLength      int64     `json:"attrLength"      xorm:"'attr_length'       bigint         comment('attrLength')     "`
+    AttrDecimals    int64     `json:"attrDecimals"    xorm:"'attr_decimals'     bigint         comment('attrDecimals')   "`
+    Comment         string    `json:"comment"         xorm:"'comment'           varchar(255)   comment('描述')           "`
+    AttrMappingCode string    `json:"attrMappingCode" xorm:"'attr_mapping_code' varchar(127)   comment('AttrMappingCode')"`
+    IsNotNull       int64     `json:"isNotNull"       xorm:"'is_not_null'       int            comment('是否可修改')      "`
+    SortNo          int64     `json:"sortNo"          xorm:"'sort_no'           int            comment('是否可修改')      "`
+    RuleId          int64     `json:"ruleId"          xorm:"'rule_id'           int            comment('Rule ID')        "`
+}
+
+func (t *BizObjectAttrInfo) TableName() string {
+    return "ds_object_attr"
+}

viewmodels/biz_object_info.go

@@ -0,0 +1,15 @@
+package viewmodels
+
+type BizObjectInfo struct {
+    BizId       int64     `json:"bizId"           xorm:"'biz_id'          bigint      pk comment('Biz ID')         "`
+    ObjectId    int64     `json:"objectId"        xorm:"'object_id'       bigint      pk comment('Object ID')      "`
+    ObjectType  int64     `json:"objectType"      xorm:"'object_type'     bigint         comment('Object Type')    "`
+    ObjectTitle string    `json:"objectTitle"     xorm:"'object_title'    varchar(127)   comment('Object Title')   "`
+    ObjectCode  string    `json:"objectCode"      xorm:"'object_code'     varchar(127)   comment('Object Code')    "`
+    Comment     string    `json:"comment"         xorm:"'comment'         varchar(255)   comment('Comment')        "`
+    IsFixed     int64     `json:"isFixed"         xorm:"'is_fixed'        int            comment('Is Fixed')       "`
+}
+
+func (t *BizObjectInfo) TableName() string {
+    return "biz_object"
+}

viewmodels/biz_rule_info.go

@@ -0,0 +1,14 @@
+package viewmodels
+
+type BizRuleInfo struct {
+    RuleId      int64     `json:"ruleId"          xorm:"'rule_id'         bigint      pk comment('Rule ID')        "`
+    RuleType    int64     `json:"ruleType"        xorm:"'rule_type'       bigint         comment('Type')           "`
+    RuleTitle   string    `json:"ruleTitle"       xorm:"'rule_title'      varchar(127)   comment('模型名称')        "`
+    RuleCode    string    `json:"ruleCode"        xorm:"'rule_code'       varchar(127)   comment('模型名称')        "`
+    Comment     string    `json:"comment"         xorm:"'comment'         varchar(255)   comment('描述')            "`
+    IsFixed     int64     `json:"isFixed"         xorm:"'is_fixed'        int            comment('是否可修改')       "`
+}
+
+func (t *BizRuleInfo) TableName() string {
+    return "biz_rule"
+}

web/controllers/model_object_attr_controller.go

@@ -52,7 +52,7 @@ func (c *ObjectAttrController) GetById(modelId, objectId, attrId int64) *JsonRes
 func (c *ObjectAttrController) Create() *JsonResult {
 	userId := c.GetCurUserId()
 	
-	attr   := datamodels.ObjectAttr{}
+	attr   := datamodels.ModelObjectAttr{}
 	if err := c.Ctx.ReadJSON(&attr); err != nil {
 		return ResultErr("读取数据失败", nil)
 	}
@@ -68,7 +68,7 @@ func (c *ObjectAttrController) Create() *JsonResult {
 func (c *ObjectAttrController) Update() *JsonResult {
 	userId := c.GetCurUserId()
 	
-	attr   := datamodels.ObjectAttr{}
+	attr   := datamodels.ModelObjectAttr{}
 	if err := c.Ctx.ReadJSON(&attr); err != nil {
 		return ResultErr("读取数据失败", nil)
 	}

web/controllers/model_object_oam_controller.go

@@ -41,7 +41,7 @@ func (c *ObjectOAMController) GetById(modelId, objectId, oamId int64) *JsonResul
 func (c *ObjectOAMController) Create() *JsonResult {
     userId := c.GetCurUserId()
     
-    attr   := datamodels.ObjectOAM{}
+    attr   := datamodels.ModelObjectOAM{}
     if err := c.Ctx.ReadJSON(&attr); err != nil {
         return ResultErr("读取数据失败", nil)
     }
@@ -57,7 +57,7 @@ func (c *ObjectOAMController) Create() *JsonResult {
 func (c *ObjectOAMController) Update() *JsonResult {
     userId := c.GetCurUserId()
     
-    attr   := datamodels.ObjectOAM{}
+    attr   := datamodels.ModelObjectOAM{}
     if err := c.Ctx.ReadJSON(&attr); err != nil {
         return ResultErr("读取数据失败", nil)
     }