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

app/api/website/controller/manage/company.go

@@ -0,0 +1,94 @@
+package manage
+
+import (
+	"SciencesServer/app/api/website/model"
+	"SciencesServer/app/basic/controller"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/session"
+	config2 "SciencesServer/config"
+	"errors"
+)
+
+type Company struct {
+	*session.Enterprise
+}
+
+type CompanyHandle func(session *session.Enterprise) *Company
+
+type (
+	// CompanyBasicInfo 公司基本信息
+	CompanyBasicInfo struct {
+		ID       string                   `json:"id"`
+		Kind     model2.ManageCompanyKind `json:"kind"`
+		Name     string                   `json:"name"`
+		Image    string                   `json:"image"`
+		Product  string                   `json:"product"`
+		Url      string                   `json:"url"`
+		Keywords []string                 `json:"keywords"`
+	}
+	// CompanyInstanceInfo 公司信息
+	CompanyInstanceInfo struct {
+		CompanyBasicInfo
+		Industrys  []string `json:"industrys"`
+		Directions []string `json:"directions"`
+		Introduce  string   `json:"introduce"`
+	}
+	// CompanyProductInfo 公司产品信息
+	CompanyProductInfo struct {
+		*model.ManageCompanyProduct
+		ID        string   `json:"id"`
+		Industrys []string `json:"industrys"`
+		Keywords  []string `json:"keywords"`
+	}
+)
+
+// Instance 公司企业信息
+func (c *Company) Instance(id uint64) (*CompanyInstanceInfo, error) {
+	mManageCompany := model.NewManageCompany()
+	mManageCompany.ID = id
+
+	if isExist, err := model2.First(mManageCompany.ManageCompany); err != nil {
+		return nil, err
+	} else if !isExist {
+		return nil, errors.New("操作错误，公司信息不存在或已被删除")
+	}
+	return &CompanyInstanceInfo{
+		CompanyBasicInfo: CompanyBasicInfo{
+			ID: mManageCompany.GetEncodeID(), Kind: mManageCompany.Kind, Name: mManageCompany.Name,
+			Image:    mManageCompany.Image.Analysis(config2.SettingInfo.Domain),
+			Url:      mManageCompany.Url,
+			Keywords: mManageCompany.GetKeywordAttribute(),
+		},
+		Industrys:  mManageCompany.GetIndustryAttribute(),
+		Directions: mManageCompany.GetDirectionAttribute(),
+		Introduce:  mManageCompany.Introduce,
+	}, nil
+}
+
+// Product 产品信息
+func (c *Company) Product(id uint64, page, pageSize int) (*controller.ReturnPages, error) {
+	mManageCompany := model.NewManageCompany()
+	var count int64
+	out, err := mManageCompany.Product(id, c.UID, page, pageSize, &count)
+
+	if err != nil {
+		return nil, err
+	}
+	list := make([]*CompanyProductInfo, 0)
+
+	for _, v := range out {
+		list = append(list, &CompanyProductInfo{
+			ManageCompanyProduct: v,
+			ID:                   v.GetEncodeID(),
+			Industrys:            v.GetIndustryAttribute(),
+			Keywords:             v.GetKeywordAttribute(),
+		})
+	}
+	return &controller.ReturnPages{Data: list, Count: count}, nil
+}
+
+func NewCompany() CompanyHandle {
+	return func(session *session.Enterprise) *Company {
+		return &Company{session}
+	}
+}

app/api/website/controller/manage/search.go

@@ -5,6 +5,7 @@ import (
 	"SciencesServer/app/basic/config"
 	model2 "SciencesServer/app/common/model"
 	"SciencesServer/app/service"
+	config2 "SciencesServer/config"
 	"errors"
 )
 
@@ -27,6 +28,7 @@ var searchIdentityHandle = map[int]func(ids []uint64) (interface{}, error){
 	config.TenantUserIdentityForAgent:      company,
 }
 
+// company 公司信息
 func company(ids []uint64) (interface{}, error) {
 	mManageCompany := model.NewManageCompany()
 	out := make([]*model2.ManageCompany, 0)
@@ -39,7 +41,17 @@ func company(ids []uint64) (interface{}, error) {
 	}); err != nil {
 		return nil, err
 	}
-	return out, nil
+	list := make([]*CompanyBasicInfo, 0)
+
+	for _, v := range out {
+		list = append(list, &CompanyBasicInfo{
+			ID: v.GetEncodeID(), Kind: v.Kind, Name: v.Name,
+			Image:    v.Image.Analysis(config2.SettingInfo.Domain),
+			Url:      v.Url,
+			Keywords: v.GetKeywordAttribute(),
+		})
+	}
+	return list, nil
 }
 
 func expert(ids []uint64) (interface{}, error) {
@@ -87,20 +99,24 @@ func laboratory(ids []uint64) (interface{}, error) {
 	return out, nil
 }
 
-func (c *Search) Launch(identity int, params string) (interface{}, error) {
-	manage := service.NewManage()
-
-	_params := map[string]interface{}{
-		"title": params, "keyword": params, "research": params,
-	}
-	data, err := manage.Search(1, 1, _params)
+func (c *Search) Launch(identity int, param, industry string, page, pageSize int) (interface{}, error) {
+	manage := service.NewESManage(
+		service.WithManageIdentity(identity),
+		service.WithManageTitle(param),
+		service.WithManageIndustry(industry),
+		service.WithManageKeyword(param),
+		service.WithManageResearch(param),
+	)
+	out, err := manage.Search(page, pageSize)
 
 	if err != nil {
 		return nil, err
+	} else if out == nil {
+		return nil, nil
 	}
 	ids := make([]uint64, 0)
 
-	for _, v := range data.([]*service.Manage) {
+	for _, v := range out.([]*service.ESManage) {
 		if v.Identity != identity {
 			continue
 		}