feat：优化信息，完善es查询，完善网站首页公司信息查询

app/api/website/controller/technology/patent.go

@@ -4,6 +4,7 @@ import (
 	"SciencesServer/app/api/website/model"
 	"SciencesServer/app/basic/controller"
 	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
 	"errors"
 	"fmt"
 )
@@ -28,27 +29,38 @@ type (
 // Instance 查询信息
 func (c *Patent) Instance(title, industry string, page, pageSize int) (*controller.ReturnPages, error) {
 	// TODO：缺少会员判断标准
-	mSysPatent := model.NewSysPatent()
+	// ES标准判定
+	s := service.NewESPatent(
+		service.WithPatentTitle(title),
+		service.WithPatentIndustry(industry),
+	)
+	out, err := s.Search(page, pageSize)
 
-	where := make([]*model2.ModelWhere, 0)
+	list := make([]*PatentInfo, 0)
 
-	if title != "" {
-		where = append(where, model2.NewWhereLike("p.title", title))
-	}
-	if industry != "" {
-		where = append(where, model2.NewWhereCondition("c.industry_detail", "LIKE",
-			"%"+fmt.Sprintf(`"%v`, industry)+"%"))
-	}
 	var count int64
 
-	out, err := mSysPatent.Patent(page, pageSize, &count, where...)
+	fmt.Println(out)
 
 	if err != nil {
 		return nil, err
+	} else if out == nil {
+		return &controller.ReturnPages{Data: list, Count: count}, nil
 	}
-	list := make([]*PatentInfo, 0)
+	mSysPatent := model.NewSysPatent()
 
-	for _, v := range out {
+	ids := make([]uint64, 0)
+
+	for _, v := range out.([]interface{}) {
+		val := v.(*service.ESPatent)
+		ids = append(ids, val.ID)
+	}
+	ret := make([]*model.SysPatentInfo, 0)
+
+	if ret, err = mSysPatent.Patent(page, pageSize, &count, model2.NewWhereIn("p.id", ids)); err != nil {
+		return nil, err
+	}
+	for _, v := range ret {
 		list = append(list, &PatentInfo{
 			ID:            v.GetEncodeID(),
 			SysPatentInfo: v,