xiugai

CMPlatform/client/customerRule.go

@@ -1,23 +1,24 @@
 package client
 
 import (
+	"cmplatform/util"
+	"encoding/json"
+	"fmt"
+	"io"
+	"os"
+	"regexp"
+	"strings"
+	"time"
+
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	"app.yhyue.com/moapp/jybase/log"
 	"app.yhyue.com/moapp/jybase/mongodb"
-	"cmplatform/util"
-	"encoding/json"
-	"fmt"
 	"github.com/antonmedv/expr"
 	"github.com/lauyoume/gopinyin"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.uber.org/zap"
-	"io"
-	"os"
-	"regexp"
-	"strings"
-	"time"
 )
 
 type CustomerRule struct {
@@ -50,7 +51,7 @@ func (c *CustomerRule) CuserRuleCreate() {
 		delete(data, "id")
 		delete(data, "ids")
 		if common.IntAll(data["i_esquerytype"]) == 1 { //自动生成es
-			esStr := util.Utiltags(data)
+			esStr := util.Utiltags(data, id)
 			data["s_esquery"] = esStr
 			data["s_esquery_search"] = filter(esStr)
 		}

CMPlatform/client/ownTag.go

@@ -1,17 +1,18 @@
 package client
 
 import (
+	"cmplatform/util"
+	"encoding/json"
+	"fmt"
+	"io"
+
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	"app.yhyue.com/moapp/jybase/mongodb"
-	"cmplatform/util"
-	"encoding/json"
-	"fmt"
 	"github.com/lauyoume/gopinyin"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
-	"io"
 
 	"log"
 	"strconv"
@@ -413,7 +414,7 @@ func (c *OwnTag) HistoryRuleCreate() {
 		delete(data, "id")
 		delete(data, "ids")
 		if common.IntAll(data["i_esquerytype"]) == 1 { //自动生成es
-			data["s_esquery"] = util.Utiltags(data)
+			data["s_esquery"] = util.Utiltags(data, id)
 		}
 		i_createtime := time.Now().Unix()
 		data["i_updatetime"] = i_createtime
@@ -691,7 +692,7 @@ func (c *OwnTag) HistoryRuleEdit() {
 		data["o_rules"] = o_rules
 		data["_id"] = mongodb.StringTOBsonId(rid)
 		if common.IntAll(data["i_esquerytype"]) == 1 { //自动生成es
-			data["s_esquery"] = util.Utiltags(data)
+			data["s_esquery"] = util.Utiltags(data, rid)
 		}
 		datas, ok := util.Mgo.FindOne("historylog", map[string]interface{}{"_id": mongodb.StringTOBsonId(hid)})
 		if ok && datas != nil && *datas != nil {

CMPlatform/history/historytask.go

@@ -309,7 +309,7 @@ func (c *HistoryData) HistoryRuleEdit() {
 		data["o_rules"] = o_rules
 		data["_id"] = mongodb.StringTOBsonId(rid)
 		if common.IntAll(data["i_esquerytype"]) == 1 { //自动生成es
-			esStr := util.Utiltags(data)
+			esStr := util.Utiltags(data, rid)
 			data["s_esquery"] = esStr
 			data["s_esquery_search"] = filter(esStr)
 		}

CMPlatform/service/customer_service.go

@@ -1,17 +1,9 @@
 package service
 
 import (
-	"app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/encrypt"
-	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
-	"app.yhyue.com/moapp/jybase/log"
-	"app.yhyue.com/moapp/jybase/mongodb"
 	"cmplatform/util"
 	"encoding/json"
 	"fmt"
-	"github.com/lauyoume/gopinyin"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.uber.org/zap"
 	"io"
 	"net/http"
 	"net/rpc"
@@ -19,6 +11,15 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/encrypt"
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
+	"app.yhyue.com/moapp/jybase/log"
+	"app.yhyue.com/moapp/jybase/mongodb"
+	"github.com/lauyoume/gopinyin"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.uber.org/zap"
 )
 
 type Customer struct {
@@ -625,7 +626,7 @@ func (c *Customer) CuserRuleCreate() {
 		delete(data, "id")
 		delete(data, "ids")
 		if common.IntAll(data["i_esquerytype"]) == 1 { //自动生成es
-			esStr := util.Utiltags(data)
+			esStr := util.Utiltags(data, id)
 			data["s_esquery"] = esStr
 			data["s_esquery_search"] = filter(esStr)
 		}
@@ -1355,7 +1356,7 @@ func (c *Customer) HistoryRuleCreate() {
 		delete(data, "id")
 		delete(data, "ids")
 		if common.IntAll(data["i_esquerytype"]) == 1 { //自动生成es
-			data["s_esquery"] = util.Utiltags(data)
+			data["s_esquery"] = util.Utiltags(data, id)
 		}
 		i_createtime := time.Now().Unix()
 		data["i_createtime"] = i_createtime

CMPlatform/service/second_push.go

@@ -1,24 +1,25 @@
 package service
 
 import (
+	"cmplatform/history"
+	"cmplatform/util"
+	"encoding/json"
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	"app.yhyue.com/moapp/jybase/log"
 	"app.yhyue.com/moapp/jybase/mail"
 	"app.yhyue.com/moapp/jybase/mongodb"
-	"cmplatform/history"
-	"cmplatform/util"
-	"encoding/json"
-	"fmt"
 	"github.com/tealeg/xlsx"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.uber.org/zap"
-	"os"
-	"strconv"
-	"strings"
-	"time"
 )
 
 var (
@@ -402,7 +403,7 @@ func (s *SecondPush) HistoryRuleEdit() {
 		data["o_rules"] = o_rules
 		data["_id"] = mongodb.StringTOBsonId(rid)
 		if common.IntAll(data["i_esquerytype"]) == 1 { //自动生成es
-			data["s_esquery"] = util.Utiltags(data)
+			data["s_esquery"] = util.Utiltags(data, rid)
 		}
 		datas, ok := util.Mgo.FindOne("second_push", map[string]interface{}{"_id": mongodb.StringTOBsonId(hid)})
 		if ok && datas != nil && *datas != nil {

CMPlatform/util/utiltag.go

@@ -619,7 +619,7 @@ func GetTimeInterval(startTime, entTime time.Time, n int) []map[string]interface
 	//log.Println(timeList)
 	return timeList
 }
-func Utiltags(tag map[string]interface{}) string {
+func Utiltags(tag map[string]interface{}, id string) string {
 	defer common.Catch()
 	tmpbyte, _ := json.Marshal(tag)
 	tab := models.Tag{}
@@ -661,8 +661,8 @@ func Utiltags(tag map[string]interface{}) string {
 			ffBoolObject.Must = append(ffBoolObject.Must, sql.ToptypeSubtypeMust{&toptypeSubtype})
 		}
 	}
-	if common.ObjToString(tag["s_userid"]) == "6576d2e803e7b697bf93acfb" {
-		siteArr := []string{"全军武器装备采购信息网", "军队采购网", "中国核工业集团公司电子商务平台", "航天电子采购平台", "中国电子科技集团有限公司电子采购平台", "阳光七采兵纷招采电子招标投标交易平台", "中国兵器电子招标投标交易平台", "中国融通电子商务平台"}
+	if id == "67e64794756e2b3b3b6d5062" {
+		siteArr := []string{"全军武器装备采购信息网", "军队采购网"}
 		ffBoolObject.Must = append(ffBoolObject.Must, sql.SiteMust{Site: &sql.Site{Site: siteArr}})
 	} else {
 		if tab.Site != "" {