添加rule tag

convenient/domain/query_rule/definition/register.go

@@ -3,6 +3,7 @@ package definition
 import (
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
 	"git.sxidc.com/go-framework/baize/framework/core/tag/rule"
+	"git.sxidc.com/go-tools/utils/strutils"
 	"github.com/pkg/errors"
 	"sync"
 )
@@ -25,11 +26,16 @@ func RegisterByDomainEntity(items ...RegisterByEntityItem) error {
 
 		definitions := make([]Entity, 0)
 		for _, field := range fields {
+			fieldCNName := item.FieldMap[field.FieldName]
+			if strutils.IsStringNotEmpty(field.FieldCNName) {
+				fieldCNName = field.FieldCNName
+			}
+
 			definitions = append(definitions, Entity{
 				FieldType:   field.Type,
 				FieldName:   field.FieldName,
 				ColumnName:  field.ColumnName,
-				FieldCNName: item.FieldMap[field.FieldName],
+				FieldCNName: fieldCNName,
 				Operators:   operatorOfTypeMap[field.Type],
 			})
 		}

convenient/domain/query_rule/query_rule.go

@@ -1,7 +1,6 @@
 package query_rule
 
 import (
-	"encoding/json"
 	"git.sxidc.com/go-framework/baize/convenient/domain/query_rule/definition"
 	"git.sxidc.com/go-framework/baize/convenient/domain/query_rule/rule"
 	"git.sxidc.com/go-framework/baize/framework/binding"
@@ -16,6 +15,7 @@ import (
 	"git.sxidc.com/go-framework/baize/framework/core/infrastructure/database/clause"
 	"git.sxidc.com/go-framework/baize/framework/core/infrastructure/database/sql"
 	"git.sxidc.com/go-tools/utils/strutils"
+	"github.com/goccy/go-json"
 	"github.com/pkg/errors"
 )
 
@@ -41,20 +41,19 @@ func Bind(app *application.App, simple *Simple) {
 }
 
 type AdvanceQueryParams interface {
-	GetRuleConditions() (string, []any)
+	GetRule() string
 	GetPageNo() int
 	GetPageSize() int
 }
 
 type BaseAdvanceQueryParams struct {
-	RuleClause     string `json:"ruleClause" assign:"-"`
-	RuleClauseArgs []any  `json:"ruleClauseArgs" assign:"-"`
-	PageNo         int    `json:"pageNo" assign:"-"`
-	PageSize       int    `json:"pageSize" assign:"-"`
+	Rule     string `json:"rule" assign:"-"`
+	PageNo   int    `json:"pageNo" assign:"-"`
+	PageSize int    `json:"pageSize" assign:"-"`
 }
 
-func (queryParams *BaseAdvanceQueryParams) GetRuleConditions() (string, []any) {
-	return queryParams.RuleClause, queryParams.RuleClauseArgs
+func (queryParams *BaseAdvanceQueryParams) GetRule() string {
+	return queryParams.Rule
 }
 
 func (queryParams *BaseAdvanceQueryParams) GetPageNo() int {
@@ -69,38 +68,19 @@ type FormAdditionalSelectClausesFunc func(queryParams AdvanceQueryParams) ([]str
 type FormAdditionalFromFunc func(queryParams AdvanceQueryParams) ([]clause.Clause, error)
 type FormAdditionalConditionsFunc func(queryParams AdvanceQueryParams) (clause.Clause, error)
 type FormOtherClausesFunc func(queryParams AdvanceQueryParams) ([]clause.Clause, error)
-type PostQueryFunc[O any] func(queryParams AdvanceQueryParams, results []sql.Result, i *infrastructure.Infrastructure) ([]O, int64, error)
 
-type AddUseQueryRuleQueryRouteParams[O any] struct {
+type AddUseQueryRuleQueryRouteParams struct {
 	DBSchema                        string
 	QueryParams                     AdvanceQueryParams
 	FormAdditionalSelectClausesFunc FormAdditionalSelectClausesFunc
 	FormAdditionalFromFunc          FormAdditionalFromFunc
 	FormAdditionalConditionsFunc    FormAdditionalConditionsFunc
 	FormOtherClausesFunc            FormOtherClausesFunc
-	PostQueryFunc                   PostQueryFunc[O]
 	Object                          domain.Object
 	QueryMiddlewares                []binding.Middleware
 }
 
-func (params *AddUseQueryRuleQueryRouteParams[O]) check() error {
-	if params.DBSchema == "" {
-		return errors.New("没有传递DBSchema")
-	}
-
-	if params.Object == nil {
-		return errors.New("没有传递Object")
-	}
-
-	return nil
-}
-
-func AddUseQueryRuleQueryRoute[O any](binder *binding.Binder, addParams *AddUseQueryRuleQueryRouteParams[O]) error {
-	err := addParams.check()
-	if err != nil {
-		return err
-	}
-
+func AddUseQueryRuleQueryRoute[O any](binder *binding.Binder, addParams *AddUseQueryRuleQueryRouteParams) {
 	domainPath := domain.RelativeDomainPath(addParams.Object)
 
 	var queryParams AdvanceQueryParams
@@ -178,9 +158,7 @@ func AddUseQueryRuleQueryRoute[O any](binder *binding.Binder, addParams *AddUseQ
 				additionalConditions = conditions
 			}
 
-			ruleClause, ruleClauseArgs := advanceQueryParams.GetRuleConditions()
-
-			if strutils.IsStringEmpty(ruleClause) {
+			if strutils.IsStringEmpty(advanceQueryParams.GetRule()) {
 				if additionalConditions != nil {
 					selectOtherClauses = append(selectOtherClauses, clause.NewWhere(additionalConditions), limitClause)
 					countOtherClauses = append(countOtherClauses, clause.NewWhere(additionalConditions))
@@ -188,8 +166,16 @@ func AddUseQueryRuleQueryRoute[O any](binder *binding.Binder, addParams *AddUseQ
 					selectOtherClauses = append(selectOtherClauses, limitClause)
 				}
 			} else {
-				var conditionClause clause.Clause
-				conditionClause = clause.NewConditions().AddCondition(ruleClause, ruleClauseArgs...).And()
+				queryRule := new(rule.Rule)
+				err := json.Unmarshal([]byte(advanceQueryParams.GetRule()), queryRule)
+				if err != nil {
+					return errResponse, err
+				}
+
+				conditionClause, err := rule.FormConditionClauseByRule(e.DomainCamelName(), *queryRule, nil)
+				if err != nil {
+					return errResponse, err
+				}
 
 				if additionalConditions != nil {
 					conditionClause = clause.NewConditionJoin(conditionClause, additionalConditions).And()
@@ -233,18 +219,6 @@ func AddUseQueryRuleQueryRoute[O any](binder *binding.Binder, addParams *AddUseQ
 			}
 
 			infos := make([]O, 0)
-			totalCount := countResults[0].ColumnValueInt64("total")
-
-			if addParams.PostQueryFunc != nil {
-				innerInfos, innerTotalCount, err := addParams.PostQueryFunc(queryParams, results, i)
-				if err != nil {
-					return errResponse, err
-				}
-
-				infos = innerInfos
-				totalCount = innerTotalCount
-			}
-
 			err = sql.ParseSqlResult(results, &infos)
 			if err != nil {
 				return errResponse, err
@@ -252,76 +226,9 @@ func AddUseQueryRuleQueryRoute[O any](binder *binding.Binder, addParams *AddUseQ
 
 			return response.InfosData[O]{
 				Infos:      infos,
-				TotalCount: totalCount,
+				TotalCount: countResults[0].ColumnValueInt64("total"),
 				PageNo:     advanceQueryParams.GetPageNo(),
 			}, nil
 		},
 	}, addParams.QueryMiddlewares...)
-
-	return nil
-}
-
-type QueryRuleParseJsonBody struct {
-	Rule string `json:"rule" assign:"-"`
-}
-
-type AddUseQueryRuleParseRouteParams struct {
-	Object domain.Object
-}
-
-func (params *AddUseQueryRuleParseRouteParams) check() error {
-	if params.Object == nil {
-		return errors.New("没有传递Object")
-	}
-
-	return nil
-}
-
-func AddUseQueryRuleParseRoute(binder *binding.Binder, addParams *AddUseQueryRuleParseRouteParams) error {
-	err := addParams.check()
-	if err != nil {
-		return err
-	}
-
-	domainPath := domain.RelativeDomainPath(addParams.Object)
-
-	binding.PostBind(binder, &binding.SimpleBindItem[map[string]any]{
-		Path:             domainPath + "/queryRule/parse",
-		SendResponseFunc: response.SendMapResponse,
-		RequestParams:    &QueryRuleParseJsonBody{},
-		ServiceFunc: func(c *api.Context, params request.Params, objects []domain.Object, i *infrastructure.Infrastructure) (map[string]any, error) {
-			errResponse := map[string]any{
-				"ruleClause":     "",
-				"ruleClauseArgs": make([]any, 0),
-			}
-
-			jsonBody, err := request.ToConcrete[*QueryRuleParseJsonBody](params)
-			if err != nil {
-				return errResponse, err
-			}
-
-			r := new(rule.Rule)
-			err = json.Unmarshal([]byte(jsonBody.Rule), r)
-			if err != nil {
-				return errResponse, err
-			}
-
-			ruleConditionClause, err := rule.FormConditionClauseByRule(addParams.Object.DomainCamelName(), *r, nil)
-			if err != nil {
-				return errResponse, err
-			}
-
-			ruleConditionClauseStr, err := ruleConditionClause.Clause()
-			if err != nil {
-				return errResponse, err
-			}
-
-			return map[string]any{
-				"ruleClause":     ruleConditionClauseStr,
-				"ruleClauseArgs": ruleConditionClause.Args(),
-			}, nil
-		},
-	})
-
-	return nil
 }

framework/core/tag/rule/tag.go

@@ -28,14 +28,16 @@ const (
 )
 
 const (
-	tagKey        = "rule"
-	tagPartColumn = "column"
-	tagPartType   = "type"
+	tagKey             = "rule"
+	tagPartColumn      = "column"
+	tagPartType        = "type"
+	tagPartFieldCNName = "fieldCNName"
 )
 
 type Tag struct {
-	ColumnName string
-	Type       string
+	ColumnName  string
+	Type        string
+	FieldCNName string
 }
 
 func parseTag(entityElemValue reflect.Value, onParsedFieldTagFunc OnParsedFieldTagFunc) error {
@@ -140,6 +142,12 @@ func parseFieldTag(field reflect.StructField, tagStr string) (*Tag, error) {
 				}
 
 				tag.Type = tagPartKeyValue[1]
+			case tagPartFieldCNName:
+				if strutils.IsStringEmpty(tagPartKeyValue[1]) {
+					return nil, errors.New("fieldCNName没有赋值字段名称")
+				}
+
+				tag.FieldCNName = tagPartKeyValue[1]
 			default:
 				err := errors.New(tagKey + "不支持的tag: " + tagPartKeyValue[0])
 				logger.GetInstance().Error(err)

framework/core/tag/rule/usage.go

@@ -5,9 +5,10 @@ import (
 )
 
 type Field struct {
-	FieldName  string
-	ColumnName string
-	Type       string
+	FieldName   string
+	FieldCNName string
+	ColumnName  string
+	Type        string
 }
 
 func DefaultUsage(e any) ([]Field, error) {
@@ -24,9 +25,10 @@ func DefaultUsage(e any) ([]Field, error) {
 func defaultCallback(fields *[]Field) OnParsedFieldTagFunc {
 	return func(fieldName string, entityFieldElemValue reflect.Value, tag *Tag) error {
 		field := Field{
-			FieldName:  fieldName,
-			ColumnName: tag.ColumnName,
-			Type:       tag.Type,
+			FieldName:   fieldName,
+			FieldCNName: tag.FieldCNName,
+			ColumnName:  tag.ColumnName,
+			Type:        tag.Type,
 		}
 
 		*fields = append(*fields, field)