Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

model/gmodel/fs_resource_logic.go

@@ -8,6 +8,10 @@ import (
 )
 
 // TODO: 使用model的属性做你想做的
+type RelaFsResource struct {
+	FsResource
+	MetaDataMap map[string]interface{} `json:"meta_data_map" gorm:"-"`
+}
 
 func (p *FsResourceModel) FindOneById(ctx context.Context, resourceId string) (resp *FsResource, err error) {
 	err = p.db.Table(p.name).WithContext(ctx).Where("resource_id =?", resourceId).Take(&resp).Error

model/gmodel/fs_user_material_logic.go

@@ -11,6 +11,13 @@ import (
 
 // TODO: 使用model的属性做你想做的
 
+type RelaFsUserMaterial struct {
+	FsUserMaterial
+	// 关联字段填充
+	ResourceInfo *RelaFsResource        `json:"resource_info" gorm:"foreignkey:resource_id;references:resource_id"`
+	MetaDataMap  map[string]interface{} `json:"metadata_map" gorm:"-"`
+}
+
 func (p *FsUserMaterialModel) CreateOrUpdate(ctx context.Context, req *FsUserMaterial) (resp *FsUserMaterial, err error) {
 	rowBuilder := p.db.Table(p.name).WithContext(ctx)
 	if req.Id > 0 {
@@ -46,6 +53,31 @@ func (m *FsUserMaterialModel) FindAll(ctx context.Context, rowBuilder *gorm.DB,
 	}
 }
 
+func (m *FsUserMaterialModel) FindList(ctx context.Context, rowBuilder *gorm.DB, filterMap map[string]string, orderBy string) ([]*RelaFsUserMaterial, error) {
+	var resp []*RelaFsUserMaterial
+	// 过滤
+	if filterMap != nil {
+		rowBuilder = rowBuilder.Scopes(handlers.FilterData(filterMap))
+	}
+
+	// 排序
+	if orderBy != "" {
+		var fieldsMap = make(map[string]struct{})
+		s := reflect.TypeOf(&FsUserMaterial{}).Elem() //通过反射获取type定义
+		for i := 0; i < s.NumField(); i++ {
+			fieldsMap[s.Field(i).Tag.Get("json")] = struct{}{}
+		}
+		rowBuilder = rowBuilder.Scopes(handlers.OrderCheck(orderBy, fieldsMap))
+	}
+
+	result := rowBuilder.WithContext(ctx).Find(&resp)
+	if result.Error != nil {
+		return nil, result.Error
+	} else {
+		return resp, nil
+	}
+}
+
 func (m *FsUserMaterialModel) RowSelectBuilder(selectData []string) *gorm.DB {
 	var rowBuilder = m.db.Table(m.name)