Merge pull request #2842 from breezelxp/v3.2.x

新增主机查询页面支持多字符字段模型查询功能

Former-commit-id: ed21665

Author: breezeli

src/common/definitions.go

@@ -122,14 +122,10 @@ const (
 	BKInnerObjIDApache = "bk_apache"
 )
 
-// Revision
 const (
-	RevisionEnterprise = "enterprise"
-	RevisionCommunity  = "community"
-	RevisionOpensource = "opensource"
-)
+	// used only for host search
+	BKDBMULTIPLELike = "$multilike"
 
-const (
 	// BKDBIN the db operator
 	BKDBIN = "$in"
 

src/common/paraparse/host.go

@@ -14,8 +14,10 @@ package params
 
 import (
 	"configcenter/src/common"
+	"configcenter/src/common/mapstr"
 	"configcenter/src/common/metadata"
 	"configcenter/src/common/util"
+	"fmt"
 )
 
 //type Flag string
@@ -69,6 +71,21 @@ func ParseHostParams(input []metadata.ConditionItem, output map[string]interface
 			regex := make(map[string]interface{})
 			regex[common.BKDBLIKE] = i.Value
 			output[i.Field] = regex
+		case common.BKDBMULTIPLELike:
+			multi, ok := i.Value.([]interface{})
+			if !ok {
+				return fmt.Errorf("operator %s only support for string array", common.BKDBMULTIPLELike)
+			}
+			fields := make([]interface{}, 0)
+			for _, m := range multi {
+				mstr, ok := m.(string)
+				if !ok {
+					return fmt.Errorf("operator %s only support for string array", common.BKDBMULTIPLELike)
+				}
+				fields = append(fields, mapstr.MapStr{i.Field: mapstr.MapStr{common.BKDBLIKE: mstr}})
+			}
+			output[common.BKDBOR] = fields
+
 		default:
 			queryCondItem, ok := output[i.Field].(map[string]interface{})
 			if !ok {

src/scene_server/host_server/logics/hostsearch.go

@@ -681,8 +681,15 @@ func (sh *searchHost) searchByHostConds() error {
 	}
 
 	condition := make(map[string]interface{})
-	hostParse.ParseHostParams(sh.conds.hostCond.Condition, condition)
-	hostParse.ParseHostIPParams(sh.hostSearchParam.Ip, condition)
+	err = hostParse.ParseHostParams(sh.conds.hostCond.Condition, condition)
+	if err != nil {
+		return err
+	}
+
+	err = hostParse.ParseHostIPParams(sh.hostSearchParam.Ip, condition)
+	if err != nil {
+		return err
+	}
 
 	query := &metadata.QueryInput{
 		Condition: condition,