xg

CMPlatform/history/task.go

@@ -370,8 +370,8 @@ func processedData_A(c *Customer, data *tempData) {
 	//先获取用到的所有字段值
 	fieldText := map[string]interface{}{}
 	for field, _ := range sr.Fields {
-		text := GetFieldData(tmp, field)
-		text = ProcessData(text) //处理文本(字母转大写，删除一些符号)
+		text := util.GetFieldData(tmp, field)
+		text = util.ProcessData(text) //处理文本(字母转大写，删除一些符号)
 		fieldText[field] = text
 	}
 	//清理词清理
@@ -543,8 +543,8 @@ func TagRuleFuc(appid string, pushModel, tag int, rules []*TagRule, sr *SearchRu
 			//先获取用到的所有字段值
 			for field, _ := range tr.Fields {
 				if fieldText[field] == nil { //补充fieldText
-					text := GetFieldData(tmp, field)
-					text = ProcessData(text) //处理文本(字母转大写，删除一些符号)
+					text := util.GetFieldData(tmp, field)
+					text = util.ProcessData(text) //处理文本(字母转大写，删除一些符号)
 					fieldText[field] = text
 				}
 			}

CMPlatform/history/util_history.go

@@ -24,8 +24,6 @@ import (
 var LetterCase = regexp.MustCompile("[A-Za-z]")
 var LetterCase2 = regexp.MustCompile("[A-Za-z0-9]")
 
-// var FilteReg = regexp.MustCompile("[()（）{}]*")
-var FilteReg = regexp.MustCompile("[{}]*")
 var Gmails []*mail.GmailAuth
 
 // 匹配方式map
@@ -351,28 +349,6 @@ func GetIdRange() (bson.M, bool) {
 
 }
 
-func GetFieldData(tmp map[string]interface{}, field string) string {
-	if strings.Contains(field, "procurementlist.") {
-		text := ""
-		field = strings.ReplaceAll(field, "procurementlist.", "")
-		for _, pm := range tmp["procurementlist"].([]interface{}) {
-			pm1 := pm.(map[string]interface{})
-			text += common.ObjToString(pm1[field])
-		}
-		return text
-	} else {
-		return common.ObjToString(tmp[field])
-	}
-}
-
-// 处理文本
-func ProcessData(text string) string {
-	defer common.Catch()
-	text = strings.ToUpper(text)               //文本中的英文全转为大写
-	text = FilteReg.ReplaceAllString(text, "") //去除一些特殊符号
-	return text
-}
-
 // 校验字母
 func CheckLetter(text string, reg *regexp.Regexp, indexArr [][]int) (flag bool) {
 	defer common.Catch()

CMPlatform/util/util.go

@@ -11,8 +11,10 @@ import (
 	"log"
 	"net/http"
 	"reflect"
+	"regexp"
 	"runtime"
 	"strconv"
+	"strings"
 )
 
 // 数据类型转换
@@ -168,3 +170,27 @@ func DelBy(index string, query interface{}, e *elastic.EsV7) bool {
 	}
 	return b
 }
+
+var FilteReg = regexp.MustCompile("[{}]*")
+
+func GetFieldData(tmp map[string]interface{}, field string) string {
+	if strings.Contains(field, "procurementlist.") {
+		text := ""
+		field = strings.ReplaceAll(field, "procurementlist.", "")
+		for _, pm := range tmp["procurementlist"].([]interface{}) {
+			pm1 := pm.(map[string]interface{})
+			text += common.ObjToString(pm1[field])
+		}
+		return text
+	} else {
+		return common.ObjToString(tmp[field])
+	}
+}
+
+// 处理文本
+func ProcessData(text string) string {
+	defer common.Catch()
+	text = strings.ToUpper(text)               //文本中的英文全转为大写
+	text = FilteReg.ReplaceAllString(text, "") //去除一些特殊符号
+	return text
+}

CMPlatform/util/utiltag.go

@@ -5,7 +5,6 @@ import (
 	"app.yhyue.com/moapp/jybase/encrypt"
 	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/log"
-	"cmplatform/history"
 	"cmplatform/models"
 	sql "cmplatform/util/sqlmodel"
 	"context"
@@ -248,8 +247,8 @@ func searchData(index, esquery, sdataid string, i_maxnum int64, tags map[string]
 						}
 					}
 					for _, filed := range fileds {
-						filed1 := history.GetFieldData(item, filed)
-						filed1 = history.ProcessData(filed1)
+						filed1 := GetFieldData(item, filed)
+						filed1 = ProcessData(filed1)
 						ddds := d.Analy(filed1)
 						analyKeys = append(analyKeys, ddds...)
 					}