Merge branch 'ysx-quote-20200628' into dev

conf/redis_config.ini

@@ -13,17 +13,9 @@ max_active = 100
 idle_timeout = 20
 idle_timeout = 20
 
 
 
 
-[api_redis_read]
+[api_redis]
 host = 192.168.1.235:6379
 host = 192.168.1.235:6379
 password = icDb29mLy2s
 password = icDb29mLy2s
 max_idle = 50
 max_idle = 50
 max_active = 100
 max_active = 100
-idle_timeout = 20
-
+idle_timeout = 20
\ No newline at end of file
-
-[api_redis_write]
-host = 192.168.1.235:6379
-password = icDb29mLy2s
-max_idle = 50
-max_active = 100
-idle_timeout = 20

conf/search.ini

@@ -13,7 +13,7 @@
 12 = alliedelec
 12 = alliedelec
 13 = avnet
 13 = avnet
 14 = mouser
 14 = mouser
-16 = liexin_lianying1
+#16 = liexin_lianying1
 17 = zhuanmai
 17 = zhuanmai
 18 = liexin_ti
 18 = liexin_ti
 19 = peigenesis
 19 = peigenesis
@@ -34,6 +34,35 @@
 19 = peigenesis
 19 = peigenesis
 20 = powell
 20 = powell
 21 = rs
 21 = rs
+
+[SEARCH_SUPPLIER]
+1 = future
+#2 = powerandsignal
+3 = rochester
+4 = tme
+5 = verical
+6 = element14
+7 = digikey
+8 = chip1stop
+9 = aipco
+10 = arrow
+#11 = bisco
+12 = alliedelec
+13 = avnet
+14 = mouser
+#15 = company
+#16 = liexin_lianying1
+17 = zhuanmai
+#18 = liexin_ti
+19 = peigenesis
+20 = powell
+21 = rs
+#22 = liexin_sell
+
+#100 = ziying
+#101 = liexin_jingdiao
+1676 = buerklin
+
 #相似物料供应商
 #相似物料供应商
 [ALIKE_SUPPLIER]
 [ALIKE_SUPPLIER]
 1 = ti
 1 = ti

controller/other_controller.go

+package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"regexp"
+	"search_server/pkg/common"
+	"search_server/requests"
+	"search_server/service"
+	"strings"
+)
+
+//查询联营型号是否有库存
+func CheckHasStock(c *gin.Context) {
+	noRule, _ := c.GetPostForm("no_rule")
+	if noRule != "1122" {
+		flag := common.CheckSignApi()
+		if flag > 0 {
+			common.Output(flag, "验证不通过:", nil)
+			return
+		}
+	}
+
+	goodsName, _ := c.GetPostForm("goods_name")
+	if goodsName == "" {
+		common.Output(1001, "型号不存在", nil)
+		return
+	}
+	replace, _ := regexp.Compile("[^A-Za-z0-9]+")
+	goodsName = replace.ReplaceAllString(goodsName, "")
+	goodsName = strings.ToUpper(goodsName)
+	otherService := service.OtherService{}
+	hasStock, err := otherService.CheckHasStock(goodsName)
+	if err != nil {
+		common.Output(1, "查询失败,系统报错"+err.Error(), nil)
+		return
+	}
+	common.Output(0, "查询成功:"+goodsName, hasStock)
+	return
+}
+
+//精确搜索型号名称
+func ExactGoods(c *gin.Context) {
+	var r requests.ExactGoodsRequest
+	c.ShouldBind(&r)
+	if r.GoodsName == "" {
+		common.Output(1, "查询型号名称不得为空", nil)
+		return
+	}
+	//查询条件
+	otherService := service.OtherService{}
+	otherService.ExactGoods(r.SupplierId, r.GoodsName)
+}

pkg/common/function.go

@@ -161,7 +161,8 @@ func CopyMapString(distmap map[string]string) map[string]string {
 }
 }
 
 
 //反爬虫加密验证
 //反爬虫加密验证
-func CheckSignApi(params map[string]string) (resNo int) {
+func CheckSignApi() (resNo int) {
+	params := make(map[string]string)
 	ctx := middleware.Context
 	ctx := middleware.Context
 	if ctx == nil {
 	if ctx == nil {
 		return
 		return

pkg/config/redis.go

@@ -25,5 +25,11 @@ func BuildRedisConfgs() (RedisDatabaseMap map[string]RedisDatabase) {
 			MaxIdle: Get("default_redis_read.max_idle").String(),
 			MaxIdle: Get("default_redis_read.max_idle").String(),
 			MaxActive: Get("default_redis_read.max_active").String(),
 			MaxActive: Get("default_redis_read.max_active").String(),
 		},
 		},
+		"api_redis": {
+			Host: Get("api_redis.host").String(),
+			Password: Get("api_redis.password").String(),
+			MaxIdle: Get("api_redis.max_idle").String(),
+			MaxActive: Get("api_redis.max_active").String(),
+		},
 	}
 	}
 }
 }

requests/other_request.go

+package requests
+
+type ExactGoodsRequest struct {
+	SupplierId string `json:"supplier_id"`
+	GoodsName  string `json:"goods_name"`
+}

routes/router.go

@@ -33,6 +33,10 @@ func InitRouter() *gin.Engine {
 	r.GET("/search/get_data", controller.GetDataIndex)
 	r.GET("/search/get_data", controller.GetDataIndex)
 	r.POST("/search/get_data", controller.GetDataIndex)
 	r.POST("/search/get_data", controller.GetDataIndex)
 
 
+	//Other控制器相关
+	r.POST("/search/other/hasStock", controller.CheckHasStock)
+	r.POST("/search/other/exactGoods", controller.ExactGoods)
+
 	r.GET("/test", func(c *gin.Context) {
 	r.GET("/test", func(c *gin.Context) {
 		common.Output(1000, "testest", nil)
 		common.Output(1000, "testest", nil)
 	})
 	})

service/goods_service.go

@@ -40,8 +40,17 @@ func GetGoodsInfoByApi(goodsIdsStr string) (goodsList []model.ApiGoods, err erro
 
 
 //isMap:是否以字典形式返回值,默认是数组
 //isMap:是否以字典形式返回值,默认是数组
 func CurlGoodsInfo(goodsIdsStr string, params req.Param) (goodsList []model.ApiGoods, goodsListMap map[string]model.ApiGoods, err error) {
 func CurlGoodsInfo(goodsIdsStr string, params req.Param) (goodsList []model.ApiGoods, goodsListMap map[string]model.ApiGoods, err error) {
+	goodsIdList := strings.Split(goodsIdsStr, ",")
+	if len(goodsIdList) == 0 {
+		return
+	}
 	//req.Debug = true
 	//req.Debug = true
-	goodsServerUrl := config.Get("goods.api_url").String()
+	var goodsServerUrl string
+	if len(goodsIdList[0]) > 7 {
+		goodsServerUrl = config.Get("goods.api_url").String()
+	}else{
+		goodsServerUrl = config.Get("goods.sz_api_url").String()
+	}
 	resp, err := req.Post(goodsServerUrl+"/synchronization", params)
 	resp, err := req.Post(goodsServerUrl+"/synchronization", params)
 	if err != nil {
 	if err != nil {
 		return
 		return
@@ -50,7 +59,6 @@ func CurlGoodsInfo(goodsIdsStr string, params req.Param) (goodsList []model.ApiG
 	//先判断返回的data是不是字典,不是字典代表可能是返回字符串了
 	//先判断返回的data是不是字典,不是字典代表可能是返回字符串了
 	if gjson.Get(resp.String(), "data").IsObject() {
 	if gjson.Get(resp.String(), "data").IsObject() {
 		//排序操作
 		//排序操作
-		goodsIdList := strings.Split(goodsIdsStr, ",")
 		for _, goodsId := range goodsIdList {
 		for _, goodsId := range goodsIdList {
 			for _, data := range gjson.Get(resp.String(), "data").Map() {
 			for _, data := range gjson.Get(resp.String(), "data").Map() {
 				if goodsId == data.Get("goods_id").String() {
 				if goodsId == data.Get("goods_id").String() {
@@ -193,7 +201,7 @@ func CurlGoodsInfo(goodsIdsStr string, params req.Param) (goodsList []model.ApiG
 func CheckIsNewCustomer(userId int) (isNewCustomer, isMember bool) {
 func CheckIsNewCustomer(userId int) (isNewCustomer, isMember bool) {
 	//判断新客价
 	//判断新客价
 	if userId != 0 {
 	if userId != 0 {
-		redisConn := gredis.Conn("search_r")
+		redisConn := gredis.Conn("api_redis")
 		defer redisConn.Close()
 		defer redisConn.Close()
 		userInfoStr, err := redis.String(redisConn.Do("HGET", "api_user", userId))
 		userInfoStr, err := redis.String(redisConn.Do("HGET", "api_user", userId))
 		if err != nil {
 		if err != nil {

service/other_service.go

+package service
+
+import (
+	"fmt"
+	"github.com/syyongx/php2go"
+	"github.com/tidwall/gjson"
+	"regexp"
+	"search_server/pkg/common"
+	"search_server/pkg/config"
+	"search_server/pkg/es"
+	"search_server/service/query"
+	"strings"
+)
+
+type OtherService struct {
+}
+
+func (os *OtherService) CheckHasStock(goodsName string) (hasStock int, err error) {
+	//获取所有供应商名称
+	supplierAllSlice := config.GetSectionValues("SUPPLIER_ALL")
+	index := strings.Join(supplierAllSlice, ",")
+	queryString := query.GetCheckStockQuery(goodsName)
+	esResult, err := es.CurlES(index, queryString)
+	if err != nil {
+		return
+	}
+	fmt.Println(queryString)
+	//获取是否有结果,有结果就是有库存
+	total := gjson.Get(esResult, "hits.total").Int()
+	if total > 0 {
+		hasStock = 1
+	}
+	return
+}
+
+func (os *OtherService) ExactGoods(supplierId, goodsName string) {
+	//获取索引
+	index := getExactGoodsIndex(supplierId)
+	r1, _ := regexp.Compile(`/[\x{4e00}-\x{9fff}]+/u`)
+	//去除中文和特殊字符串
+	removeCnGoodsName := r1.ReplaceAllString(goodsName, "")
+	r2, _ := regexp.Compile(`/[^A-Za-z0-9]+/`)
+	goodsName = r2.ReplaceAllString(removeCnGoodsName, "")
+	//查询条件
+	queryString := query.GetExactGoodsQuery(goodsName)
+	esResult, err := es.CurlES(index, queryString)
+	if err != nil {
+		return
+	}
+	//最终结果接受者
+	var result interface{}
+	//所有供应商
+	if supplierId == "-1" {
+		var goodsList []interface{}
+		for _, jsonItem := range gjson.Get(esResult, "hits.hits").Array() {
+			goods := make(map[string]string)
+			goods["_index"] = jsonItem.Get("_index").String()
+			goods["goods_id"] = jsonItem.Get("_source.goods_id").String()
+			goods["old_goods_id"] = jsonItem.Get("_source.old_goods_id").String()
+			goodsList = append(goodsList, goods)
+		}
+		result = goodsList
+	} else {
+		//获取所有的商品id
+		ids := gjson.Get(esResult, "hits.hits.#._id").Array()
+		var goodsIds []string
+		for _, id := range ids {
+			goodsIds = append(goodsIds, id.String())
+		}
+		result = goodsIds
+	}
+	common.Output(0, "", result)
+	return
+}
+
+//获取这个方法对应的索引
+func getExactGoodsIndex(supplierId string) (index string) {
+	supplierAllSlice := config.GetSectionValues("SEARCH_SUPPLIER")
+	supplierAllMap := config.Cfg.Section("SEARCH_SUPPLIER").KeysHash()
+	searchSupplierIds := config.Cfg.Section("SEARCH_SUPPLIER").KeyStrings()
+	if supplierId == "-1" {
+		index = strings.Join(supplierAllSlice, ",") + "," + config.Get("ZIYING_CONFIG.Index").String()
+	} else {
+		if php2go.InArray(supplierId, searchSupplierIds) {
+			index = supplierAllMap[supplierId]
+		} else {
+			//不存在就去搜索自营的
+			index = config.Get("ZIYING_CONFIG.Index").String()
+		}
+	}
+	return
+}

service/query/other_query.go

+package query
+
+import (
+	"gopkg.in/olivere/elastic.v5"
+)
+
+//获取查询语句
+func GetCheckStockQuery(goodsName string) (queryString string) {
+	query := elastic.NewBoolQuery()
+	query.Filter(elastic.NewRangeQuery("stock").Gt(0))
+	query.Filter(elastic.NewTermQuery("auto_goods_name.raw", goodsName))
+	source := elastic.NewSearchSource()
+	source.FetchSourceContext(elastic.NewFetchSourceContext(true).Include("goods_name", "stock"))
+	source.Size(1)
+	source.Query(query)
+	searchRequest := elastic.NewSearchRequest().Source(source)
+	queryString, _ = searchRequest.Body()
+	return
+}
+
+//精确匹配商品的查询语句
+func GetExactGoodsQuery(goodsName string) (queryString string) {
+	query := elastic.NewBoolQuery()
+	query.Must(elastic.NewTermQuery("auto_goods_name.raw", goodsName))
+	source := elastic.NewSearchSource()
+	source.From(0)
+	source.Size(200)
+	source.Query(query)
+	searchRequest := elastic.NewSearchRequest().Source(source).Preference("_primary_first")
+	queryString, _ = searchRequest.Body()
+	return
+}

service/query/quote_query.go

@@ -191,7 +191,7 @@ func GetGoodsBySupplierIdQuery(r requests.GetGoodsBySupplierRequest) (string, er
 	//判断关键词是否为空
 	//判断关键词是否为空
 	if r.Keyword != "" {
 	if r.Keyword != "" {
 		r1, _ := regexp.Compile(`/[\x{4e00}-\x{9fff}]+/u`)
 		r1, _ := regexp.Compile(`/[\x{4e00}-\x{9fff}]+/u`)
-		//去除中文?
+		//去除中文
 		removeCnKeyword := r1.ReplaceAllString(r.Keyword, "")
 		removeCnKeyword := r1.ReplaceAllString(r.Keyword, "")
 		r2, _ := regexp.Compile(`/[^A-Za-z0-9]+/`)
 		r2, _ := regexp.Compile(`/[^A-Za-z0-9]+/`)
 		r.Keyword = r2.ReplaceAllString(removeCnKeyword, "")
 		r.Keyword = r2.ReplaceAllString(removeCnKeyword, "")