Merge branch 'bzq/knowledge_Bi' of eta_gn_server/eta_api into master

controllers/bi_dashboard.go

@@ -100,16 +100,21 @@ func (this *BIDaShboardController) AddDashboard() {
 		return
 	}
 	detailList := make([]*bi_dashboard.BiDashboardDetail, 0)
+	var isAddResource bool
 	for i, v := range req.List {
 		item := &bi_dashboard.BiDashboardDetail{
 			BiDashboardId: int(id),
 			Type:          v.Type,
 			UniqueCode:    v.UniqueCode,
+			Conf:          v.Conf,
 			Sort:          i + 1,
 			CreateTime:    time.Now(),
 			ModifyTime:    time.Now(),
 		}
 		detailList = append(detailList, item)
+		if v.Type == 3 {
+			isAddResource = true
+		}
 	}
 	err = bi_dashboard.AddBiDashboardDetailMulti(detailList)
 	if err != nil {
@@ -117,11 +122,22 @@ func (this *BIDaShboardController) AddDashboard() {
 		br.ErrMsg = "新增详情失败,Err:" + err.Error()
 		return
 	}
+	if isAddResource {
+		msg, err := services.SaveBiDashboardKnowledgeResource(item.BiDashboardId, this.SysUser.AdminId)
+		if err != nil {
+			if msg == "" {
+				msg = "新增知识资源失败"
+			}
+			br.Msg = msg
+			br.ErrMsg = "新增知识资源失败,Err:" + err.Error()
+			return
+		}
+
+	}
 
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "新增成功"
-	//br.Data =
 }
 
 // EditPpt
@@ -179,15 +195,20 @@ func (this *BIDaShboardController) EditDashboard() {
 	}
 
 	detailList := make([]*bi_dashboard.BiDashboardDetail, 0)
+	isEditResource := false
 	for _, v := range req.List {
 		item := &bi_dashboard.BiDashboardDetail{
 			BiDashboardId: req.BiDashboardId,
 			Type:          v.Type,
 			UniqueCode:    v.UniqueCode,
+			Conf:          v.Conf,
 			Sort:          v.Sort,
 			CreateTime:    time.Now(),
 			ModifyTime:    time.Now(),
 		}
+		if v.Type == 3 {
+			isEditResource = true
+		}
 		detailList = append(detailList, item)
 	}
 	err = bi_dashboard.AddBiDashboardDetailMulti(detailList)
@@ -196,6 +217,18 @@ func (this *BIDaShboardController) EditDashboard() {
 		br.ErrMsg = "新增详情失败,Err:" + err.Error()
 		return
 	}
+	if isEditResource {
+		// 添加知识资源引用
+		msg, err := services.SaveBiDashboardKnowledgeResource(item.BiDashboardId, this.SysUser.AdminId)
+		if err != nil {
+			if msg == "" {
+				msg = "编辑知识资源失败"
+			}
+			br.Msg = msg
+			br.ErrMsg = "编辑知识资源失败,Err:" + err.Error()
+			return
+		}
+	}
 
 	br.Ret = 200
 	br.Success = true

controllers/knowledge/resource.go

@@ -9,9 +9,6 @@ import (
 	knowledgeServ "eta_gn/eta_api/services/knowledge"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/h2non/filetype"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
 	"html"
 	"io/ioutil"
 	"os"
@@ -19,6 +16,10 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/h2non/filetype"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"github.com/tealeg/xlsx"
 )
 
 // 分类
@@ -35,13 +36,14 @@ type ResourceController struct {
 // @Param   StartDate   query   string  true       "开始时间"
 // @Param   EndDate   query   string  true       "结束时间"
 // @Param   Frequency   query   string  true       "频度"
-// @Param   ClassifyIdFirst   query   int  true       "一级分类id"
-// @Param   ClassifyIdSecond   query   int  true       "二级分类id"
-// @Param   ClassifyIdThird   query   int  true       "三级分类id"
+// @Param   ClassifyIds   query   int  true       "分类id, 多选, 英文逗号分隔"
 // @Param   State   query   int  true       "状态"
 // @Param   KeyWord   query   string  true       "搜索关键词"
 // @Param   PublishSort   query   string  true       "desc:降序，asc 升序（预留）"
 // @Param   FilterReportType   query   string  true       "筛选事件类型，1：公共研报，2：共享研报，3：我的研报"
+// @Param   IncludeFile   query   string  true       "是否包含文件, no:不包含"
+// @Param   SourceFrom   query   string  true       "来源, 用英文逗号分隔"
+// @Param   IsShowMe   query   string  true       "只看我, false:全部, true:只看我"
 // @Success 200 {object} knowledge.KnowledgeResourceListResp
 // @router /resource/list [get]
 func (this *ResourceController) List() {
@@ -64,6 +66,10 @@ func (this *ResourceController) List() {
 
 	sourceFrom := this.GetString("SourceFrom")
 
+	includeFile := this.GetString("IncludeFile")
+
+	IsShowMe, _ := this.GetBool("IsShowMe")
+
 	var startSize int
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
@@ -79,6 +85,15 @@ func (this *ResourceController) List() {
 	condition += ` AND resource_type = ? `
 	pars = append(pars, resourceType)
 
+	if includeFile == "no" {
+		condition += ` AND is_file = ? `
+		pars = append(pars, 0)
+	}
+	if IsShowMe {
+		condition += ` AND admin_id = ? `
+		pars = append(pars, this.SysUser.AdminId)
+	}
+
 	if keyWord != "" {
 		//按照空格划分为关键词数组
 		keyWordArr := strings.Split(keyWord, " ")
@@ -263,6 +278,241 @@ func (this *ResourceController) List() {
 	br.Data = resp
 }
 
+// Search
+// @Title 获取事件列表接口
+// @Description 获取事件列表
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
+// @Param   TimeType     query string true  "筛选的时间类别：publish_time(发布时间)，modify_time（更新时间）；approve_time（审批时间）"
+// @Param   StartDate   query   string  true       "开始时间"
+// @Param   EndDate   query   string  true       "结束时间"
+// @Param   Frequency   query   string  true       "频度"
+// @Param   ClassifyIds   query   int  true       "分类id, 多选, 英文逗号分隔"
+// @Param   SysUserIds   query   int  true       "用户id, 多选, 英文逗号分隔"
+// @Param   State   query   int  true       "状态"
+// @Param   KeyWord   query   string  true       "搜索关键词"
+// @Param   PublishSort   query   string  true       "desc:降序，asc 升序（预留）"
+// @Param   FilterReportType   query   string  true       "筛选事件类型，1：公共研报，2：共享研报，3：我的研报"
+// @Param   IncludeFile   query   string  true       "是否包含文件, no:不包含"
+// @Param   SourceFrom   query   string  true       "来源, 用英文逗号分隔"
+// @Param   IsShowMe   query   string  true       "只看我, false:全部, true:只看我"
+// @Success 200 {object} knowledge.KnowledgeResourceListResp
+// @router /resource/search_by_es [get]
+func (this *ResourceController) Search() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+
+	classifyIds := this.GetString("ClassifyIds")
+	// 添加人
+	addUserIds := this.GetString("SysUserIds")
+	// 标签
+	tagIds := this.GetString("TagIds")
+
+	keyWord := this.GetString("Keyword")
+	resourceType, _ := this.GetInt("ResourceType")
+
+	sourceFrom := this.GetString("SourceFrom")
+
+	includeFile := this.GetString("IncludeFile")
+
+	IsShowMe, _ := this.GetBool("IsShowMe")
+
+	var startSize int
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+
+	startSize = utils.StartIndex(currentIndex, pageSize)
+
+	isIncludeFile := true
+	if includeFile == "no" {
+		isIncludeFile = false
+	}
+	var searchUserIds []int
+	if addUserIds != "" {
+		// 转成数组，并把类型转成int
+		addUserIdsArr := strings.Split(addUserIds, ",")
+		for _, v := range addUserIdsArr {
+			addUserId, _ := strconv.Atoi(v)
+			searchUserIds = append(searchUserIds, addUserId)
+		}
+	}
+	var myId int
+	if IsShowMe {
+		myId = this.SysUser.AdminId
+	}
+
+	var sourceFromArr []string
+	if sourceFrom != "" {
+		sourceFromArr = strings.Split(sourceFrom, ",")
+	}
+	var classifyIdsInt []int
+	if classifyIds != "" {
+		//转成数组，并把类型转成int
+		classifyIdsArr := strings.Split(classifyIds, ",")
+		for _, v := range classifyIdsArr {
+			classifyId, _ := strconv.Atoi(v)
+			classifyIdsInt = append(classifyIdsInt, classifyId)
+		}
+	}
+	var tagIdsInt []int
+	if tagIds != "" {
+		//转成数组，并把类型转成int
+		tagIdsArr := strings.Split(tagIds, ",")
+		for _, v := range tagIdsArr {
+			tagId, _ := strconv.Atoi(v)
+			tagIdsInt = append(tagIdsInt, tagId)
+		}
+	}
+	listTmp, total, err := knowledgeServ.SearchKnowledgeResourceByEs(
+		resourceType,
+		keyWord,
+		searchUserIds,
+		myId,
+		classifyIdsInt,
+		sourceFromArr,
+		tagIdsInt,
+		isIncludeFile,
+		startSize,
+		pageSize,
+	)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+
+	var list []*knowledge.KnowledgeResourceList
+	// 整理分类ID
+	classifyFullNameMap := make(map[int]string)
+	classifyIdsArr := make([]int, 0)
+	for _, v := range listTmp {
+		classifyIdsArr = append(classifyIdsArr, v.ClassifyId)
+	}
+	// 获取分类列表
+	classifyList, err := knowledge.GetFullClassifyListByIdList(classifyIdsArr, resourceType)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	for _, v := range classifyList {
+		name := v.ClassifyName
+		if v.ParentName != "" {
+			name = v.ParentName + "/" + name
+		}
+		if v.RootName != "" {
+			name = v.RootName + "/" + name
+		}
+		classifyFullNameMap[v.ClassifyId] = name
+	}
+
+	// 整理标签ID
+	tagNameMap := make(map[int]string)
+	tagIdsArr := make([]int, 0)
+	for _, v := range listTmp {
+		tagIdsArr = append(tagIdsArr, v.TagId)
+	}
+	// 获取标签列表
+	tagObj := new(knowledge.KnowledgeTag)
+	tagList, err := tagObj.GetListByIdList(tagIdsArr, resourceType)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+	}
+	for _, v := range tagList {
+		tagNameMap[v.TagId] = v.TagName
+	}
+
+	for _, v := range listTmp {
+		var startTime, endTime string
+		if v.StartTime != nil && !v.StartTime.IsZero() {
+			startTime = v.StartTime.In(time.Local).Format(utils.FormatDateTime)
+			if resourceType == knowledge.KnowledgeResourceTypeOpinion || resourceType == knowledge.KnowledgeResourceTypeKnow {
+				startTime = v.StartTime.In(time.Local).Format(utils.FormatDate)
+			}
+		}
+		if v.EndTime != nil && !v.EndTime.IsZero() {
+			endTime = v.EndTime.In(time.Local).Format(utils.FormatDateTime)
+			if resourceType == knowledge.KnowledgeResourceTypeOpinion || resourceType == knowledge.KnowledgeResourceTypeKnow {
+				endTime = v.EndTime.In(time.Local).Format(utils.FormatDate)
+			}
+		}
+		modifyTime := v.ModifyTime.In(time.Local).Format(utils.FormatDateTime)
+		createTime := v.CreateTime.In(time.Local).Format(utils.FormatDateTime)
+		tmp := &knowledge.KnowledgeResourceList{
+			KnowledgeResourceId: v.KnowledgeResourceId,
+			ResourceType:        v.ResourceType,
+			ClassifyId:          v.ClassifyId,
+			Title:               v.Title,
+			Content:             v.Content,
+			CreateTime:          createTime,
+			ModifyTime:          modifyTime,
+			State:               v.State,
+			ResourceCode:        v.ResourceCode,
+			AdminId:             v.AdminId,
+			AdminRealName:       v.AdminRealName,
+			SourceFrom:          v.SourceFrom,
+			TagId:               v.TagId,
+			StartTime:           startTime,
+			EndTime:             endTime,
+		}
+
+		classifyName, ok := classifyFullNameMap[tmp.ClassifyId]
+		if ok {
+			tmp.ClassifyFullName = classifyName
+		}
+		tagName, ok := tagNameMap[v.TagId]
+		if ok {
+			tmp.TagName = tagName
+		}
+		list = append(list, tmp)
+	}
+
+	// list := make([]*knowledge.KnowledgeResourceList, 0, len(knowledges))
+	// for _, v := range knowledges {
+	// 	item := new(knowledge.KnowledgeResourceList)
+	// 	item.KnowledgeResourceId = v.KnowledgeResourceId
+	// 	item.ResourceType = v.ResourceType
+	// 	item.ClassifyId = v.ClassifyId
+	// 	item.Title = v.Title
+	// 	item.CreateTime = v.CreateTime.Format(utils.FormatDateTime)
+	// 	item.ModifyTime = v.ModifyTime.Format(utils.FormatDateTime)
+	// 	item.State = v.State
+	// 	item.Content = v.Content
+	// 	item.ResourceCode = v.ResourceCode
+	// 	item.AdminId = v.AdminId
+	// 	item.AdminRealName = v.AdminRealName
+	// 	item.SourceFrom = v.SourceFrom
+	// 	item.TagId = v.TagId
+	// 	if v.StartTime != nil {
+	// 		item.StartTime = v.StartTime.Format(utils.FormatDateTime)
+	// 	}
+	// 	if v.EndTime != nil {
+	// 		item.EndTime = v.EndTime.Format(utils.FormatDateTime)
+	// 	}
+	// 	list = append(list, item)
+	// }
+
+	page := paging.GetPaging(currentIndex, pageSize, int(total))
+	resp := new(knowledge.KnowledgeResourceListResp)
+	resp.Paging = page
+	resp.List = list
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}
+
 // Add
 // @Title 新增事件接口
 // @Description 新增事件（区分事件类型）
@@ -800,6 +1050,13 @@ func (this *ResourceController) Delete() {
 		br.ErrMsg = "删除事件失败, Err: " + err.Error()
 		return
 	}
+	go func() {
+		item.IsDelete = 1
+		er := knowledgeServ.EsAddOrEditKnowledgeResource(item)
+		if er != nil {
+			utils.FileLog.Info("知识资源id:" + strconv.Itoa(req.KnowledgeResourceId) + ",删除事件同步es失败, Err: " + er.Error())
+		}
+	}()
 
 	br.Ret = 200
 	br.Success = true
@@ -1185,3 +1442,86 @@ func (this *ResourceController) TemplateDownload() {
 	br.Success = true
 	br.Msg = "下载成功"
 }
+
+// BiDashboardTmpResourceList
+// @Title 获取bi看报中的知识资源列表
+// @Description 获取bi看报中的知识资源列表
+// @Success 200 {object} models.EdbdataClassifyResp
+// @Param   biDashboardDetailId   query   int  true       "看板详情ID"
+// @router /resource/bi_dashboard/list [get]
+func (this *ResourceController) BiDashboardCacheResourceList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	biDashboardDetailId, _ := this.GetInt("BiDashboardDetailId")
+
+	resp, msg, err := knowledgeServ.GetKnowledgeResourceTmpList(biDashboardDetailId, this.SysUser.AdminId)
+	if err != nil {
+		if msg == "" {
+			msg = "获取数据失败"
+		}
+		br.Msg = msg
+		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}
+
+// BiDashboardResourceSave
+// @Title 将知识资源库添加到bi看板
+// @Description 将知识资源库添加到bi看板
+// @Param	request	body knowledge.DeleteReq true "type json string"
+// @Success 200 {object} models.EdbdataClassifyResp
+// @router /resource/bi_dashboard/save [post]
+func (this *ResourceController) BiDashboardResourceSave() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	var req knowledge.BiDashboardResourceAddReq
+	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
+		br.Msg = "参数解析失败"
+		br.ErrMsg = "参数解析失败，Err:" + e.Error()
+		return
+	}
+
+	if len(req.KnowledgeResourceList) == 0 {
+		// 则删除缓存中的数据
+		err := utils.Rc.Delete(utils.CACHE_KEY_BI_DASHBOARD_PREPARE_RESOURCE + strconv.Itoa(this.SysUser.AdminId))
+		if err != nil {
+			br.Msg = "添加失败"
+			br.ErrMsg = "删除缓存失败，Err:" + err.Error()
+			return
+		}
+		br.Msg = "添加成功"
+		br.Ret = 200
+		br.Success = true
+		return
+	}
+	cacheData, err := json.Marshal(req)
+	if err != nil {
+		br.Msg = "添加失败"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	err = utils.Rc.Put(utils.CACHE_KEY_BI_DASHBOARD_PREPARE_RESOURCE+strconv.Itoa(this.SysUser.AdminId), cacheData, time.Hour*24)
+	if err != nil {
+		br.Msg = "添加失败"
+		br.ErrMsg = "添加失败，Err:" + err.Error()
+		return
+	}
+
+	br.Msg = "添加成功"
+	br.Ret = 200
+	br.Success = true
+
+}

go.mod

@@ -5,12 +5,9 @@ go 1.21.7
 require (
 	baliance.com/gooxml v1.0.1
 	github.com/PuerkitoBio/goquery v1.9.1
-	github.com/SebastiaanKlippert/go-wkhtmltopdf v1.9.2
-	github.com/alibabacloud-go/alimt-20181012/v2 v2.2.0
 	github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.6
 	github.com/alibabacloud-go/dm-20151123/v2 v2.0.9
 	github.com/alibabacloud-go/tea v1.2.2
-	github.com/alibabacloud-go/tea-utils/v2 v2.0.5
 	github.com/aliyun/alibaba-cloud-sdk-go v1.62.695
 	github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
 	github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
@@ -56,11 +53,8 @@ require (
 	github.com/alibabacloud-go/debug v1.0.0 // indirect
 	github.com/alibabacloud-go/endpoint-util v1.1.0 // indirect
 	github.com/alibabacloud-go/openapi-util v0.1.0 // indirect
-	github.com/alibabacloud-go/openplatform-20191219/v2 v2.0.1 // indirect
-	github.com/alibabacloud-go/tea-fileform v1.1.1 // indirect
-	github.com/alibabacloud-go/tea-oss-sdk v1.1.3 // indirect
-	github.com/alibabacloud-go/tea-oss-utils v1.1.0 // indirect
 	github.com/alibabacloud-go/tea-utils v1.3.6 // indirect
+	github.com/alibabacloud-go/tea-utils/v2 v2.0.5 // indirect
 	github.com/alibabacloud-go/tea-xml v1.1.3 // indirect
 	github.com/aliyun/credentials-go v1.3.1 // indirect
 	github.com/andybalholm/cascadia v1.3.2 // indirect

go.sum

@@ -22,8 +22,6 @@ github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8L
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/PuerkitoBio/goquery v1.9.1 h1:mTL6XjbJTZdpfL+Gwl5U2h1l9yEkJjhmlTeV9VPW7UI=
 github.com/PuerkitoBio/goquery v1.9.1/go.mod h1:cW1n6TmIMDoORQU5IU/P1T3tGFunOeXEpGP2WHRwkbY=
-github.com/SebastiaanKlippert/go-wkhtmltopdf v1.9.2 h1:enQwehstpeaAnsyse1Aqb6r0sU5UJbiNvIqVmPo+KWI=
-github.com/SebastiaanKlippert/go-wkhtmltopdf v1.9.2/go.mod h1:SQq4xfIdvf6WYKSDxAJc+xOJdolt+/bc1jnQKMtPMvQ=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
@@ -33,10 +31,6 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4 h1:iC9YFYKDGEy3n/FtqJnOkZsene9olVspKmkX5A2YBEo=
 github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4/go.mod h1:sCavSAvdzOjul4cEqeVtvlSaSScfNsTQ+46HwlTL1hc=
-github.com/alibabacloud-go/alimt-20181012/v2 v2.2.0 h1:9AwDOjOZvhycl60jlXuMBSSl52rpWlcAuwxJOAQM4Bo=
-github.com/alibabacloud-go/alimt-20181012/v2 v2.2.0/go.mod h1:4gZhZ+BvRg/k14Z8SZnmu86zNqjslSpcC1wFl0jabl4=
-github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.0/go.mod h1:5JHVmnHvGzR2wNdgaW1zDLQG8kOC4Uec8ubkMogW7OQ=
-github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.2/go.mod h1:5JHVmnHvGzR2wNdgaW1zDLQG8kOC4Uec8ubkMogW7OQ=
 github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.6 h1:y1K+zKhpWcxso8zqI03CcYuwgyZPFwQdwAQOXAeuOVM=
 github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.6/go.mod h1:CzQnh+94WDnJOnKZH5YRyouL+OOcdBnXY5VWAf0McgI=
 github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68/go.mod h1:6pb/Qy8c+lqua8cFpEy7g39NRRqOWc3rOwAy8m5Y2BY=
@@ -46,36 +40,20 @@ github.com/alibabacloud-go/dm-20151123/v2 v2.0.9 h1:3OPVk25YWcJ48whyVCFOf168dafh
 github.com/alibabacloud-go/dm-20151123/v2 v2.0.9/go.mod h1:AhCnEI1csfLmYL5fS5TbrxPR2xZZHRQ9MmkF04Iyez8=
 github.com/alibabacloud-go/endpoint-util v1.1.0 h1:r/4D3VSw888XGaeNpP994zDUaxdgTSHBbVfZlzf6b5Q=
 github.com/alibabacloud-go/endpoint-util v1.1.0/go.mod h1:O5FuCALmCKs2Ff7JFJMudHs0I5EBgecXXxZRyswlEjE=
-github.com/alibabacloud-go/openapi-util v0.0.11/go.mod h1:sQuElr4ywwFRlCCberQwKRFhRzIyG4QTP/P4y1CJ6Ws=
 github.com/alibabacloud-go/openapi-util v0.1.0 h1:0z75cIULkDrdEhkLWgi9tnLe+KhAFE/r5Pb3312/eAY=
 github.com/alibabacloud-go/openapi-util v0.1.0/go.mod h1:sQuElr4ywwFRlCCberQwKRFhRzIyG4QTP/P4y1CJ6Ws=
-github.com/alibabacloud-go/openplatform-20191219/v2 v2.0.1 h1:L0TIjr9Qh/SLVc1yPhFkcB9+9SbCNK/jPq4ZKB5zmnc=
-github.com/alibabacloud-go/openplatform-20191219/v2 v2.0.1/go.mod h1:EKxBRDLcMzwl4VLF/1WJwlByZZECJawPXUvinKMsTTs=
 github.com/alibabacloud-go/tea v1.1.0/go.mod h1:IkGyUSX4Ba1V+k4pCtJUc6jDpZLFph9QMy2VUPTwukg=
 github.com/alibabacloud-go/tea v1.1.7/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4=
 github.com/alibabacloud-go/tea v1.1.8/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4=
-github.com/alibabacloud-go/tea v1.1.10/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4=
-github.com/alibabacloud-go/tea v1.1.12/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4=
 github.com/alibabacloud-go/tea v1.1.17/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A=
-github.com/alibabacloud-go/tea v1.1.19/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A=
 github.com/alibabacloud-go/tea v1.2.1/go.mod h1:qbzof29bM/IFhLMtJPrgTGK3eauV5J2wSyEUo4OEmnA=
 github.com/alibabacloud-go/tea v1.2.2 h1:aTsR6Rl3ANWPfqeQugPglfurloyBJY85eFy7Gc1+8oU=
 github.com/alibabacloud-go/tea v1.2.2/go.mod h1:CF3vOzEMAG+bR4WOql8gc2G9H3EkH3ZLAQdpmpXMgwk=
-github.com/alibabacloud-go/tea-fileform v1.1.1 h1:1YG6erAP3joQ0XdCXYIotuD7zyOM6qCR49xkp5FZDeU=
-github.com/alibabacloud-go/tea-fileform v1.1.1/go.mod h1:ZeCV91o4ISmxidd686f0ebdS5EDHWU+vW+TkjLhrsFE=
-github.com/alibabacloud-go/tea-oss-sdk v1.1.3 h1:EhAHI6edMeqgkZEqP7r4nc9iMWAUBKGxJHoBsOSKTtU=
-github.com/alibabacloud-go/tea-oss-sdk v1.1.3/go.mod h1:yUnodpR3Bf2rudLE7V/Gft5txjJF30Pk+hH77K/Eab0=
-github.com/alibabacloud-go/tea-oss-utils v1.1.0 h1:y65crjjcZ2Pbb6UZtC2deuIZHDVTS3IaDWE7M9nVLRc=
-github.com/alibabacloud-go/tea-oss-utils v1.1.0/go.mod h1:PFCF12e9yEKyBUIn7X1IrF/pNjvxgkHy0CgxX4+xRuY=
 github.com/alibabacloud-go/tea-utils v1.3.1/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQdSngxrpF8rKUDJjPE=
 github.com/alibabacloud-go/tea-utils v1.3.6 h1:bVjrxHztM8hAs6nOfLWCgxQfAtKb9RgFFMV6J3rdvB4=
 github.com/alibabacloud-go/tea-utils v1.3.6/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQdSngxrpF8rKUDJjPE=
-github.com/alibabacloud-go/tea-utils/v2 v2.0.0/go.mod h1:U5MTY10WwlquGPS34DOeomUGBB0gXbLueiq5Trwu0C4=
-github.com/alibabacloud-go/tea-utils/v2 v2.0.4/go.mod h1:sj1PbjPodAVTqGTA3olprfeeqqmwD0A5OQz94o9EuXQ=
 github.com/alibabacloud-go/tea-utils/v2 v2.0.5 h1:EUakYEUAwr6L3wLT0vejIw2rc0IA1RSXDwLnIb3f2vU=
 github.com/alibabacloud-go/tea-utils/v2 v2.0.5/go.mod h1:dL6vbUT35E4F4bFTHL845eUloqaerYBYPsdWR2/jhe4=
-github.com/alibabacloud-go/tea-xml v1.1.1/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8=
-github.com/alibabacloud-go/tea-xml v1.1.2/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8=
 github.com/alibabacloud-go/tea-xml v1.1.3 h1:7LYnm+JbOq2B+T/B0fHC4Ies4/FofC4zHzYtqw7dgt0=
 github.com/alibabacloud-go/tea-xml v1.1.3/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8=
 github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
@@ -802,7 +780,6 @@ golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U=
 golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

models/bi_dashboard/bi_dashboard.go

@@ -82,6 +82,7 @@ type AddDashboardListReq struct {
 	Type       int
 	UniqueCode string
 	Sort       int
+	Conf       string
 }
 
 type EditDashboardReq struct {

models/bi_dashboard/bi_dashboard_detail.go

@@ -8,7 +8,8 @@ import (
 type BiDashboardDetail struct {
 	BiDashboardDetailId int       `gorm:"primaryKey;autoIncrement;column:bi_dashboard_detail_id" ` // bi看板id
 	BiDashboardId       int       `gorm:"column:bi_dashboard_id" `                                 // 看板id
-	Type                int       `gorm:"column:type" `                                            // 1图表 2表格
+	Type                int       `gorm:"column:type" `                                            // 1图表 2表格 3知识资源库
+	Conf                string    `gorm:"column:conf" `                                            // 配置信息
 	UniqueCode          string    `gorm:"column:unique_code;size:32;not null" `                    // 报告唯一编码
 	Sort                int       `gorm:"column:sort" `                                            // 排序字段
 	CreateTime          time.Time `gorm:"column:create_time" `                                     // 创建时间
@@ -20,12 +21,23 @@ func (m *BiDashboardDetail) TableName() string {
 	return "bi_dashboard_detail"
 }
 
+func (m *BiDashboardDetail) Insert() (err error) {
+	return global.DEFAULT_DmSQL.Create(m).Error
+}
+
 func GetBiDashboardDetailById(id int) (list []*BiDashboardDetail, err error) {
 	err = global.DEFAULT_DmSQL.Table("bi_dashboard_detail").Where("bi_dashboard_id IN ?", id).Find(&list).Error
 
 	return
 }
 
+// GetBiDashboardDetailIdByBidashboardIdAndType 获取看板详情id
+func GetBiDashboardDetailIdByBidashboardIdAndType(bid int, t int) (ids []int, err error) {
+	sql := "SELECT bi_dashboard_detail_id FROM bi_dashboard_detail WHERE bi_dashboard_id = ? AND type = ?"
+	err = global.DEFAULT_DmSQL.Raw(sql, bid, t).Scan(&ids).Error
+	return
+}
+
 // multiAdd
 func AddBiDashboardDetailMulti(items []*BiDashboardDetail) (err error) {
 	return global.DEFAULT_DmSQL.CreateInBatches(items, 100).Error

models/knowledge/knowledge_resource.go

@@ -4,8 +4,9 @@ import (
 	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 const (
@@ -37,6 +38,7 @@ type KnowledgeResource struct {
 	EndTime             *time.Time `gorm:"column:end_time"`
 	IsFile              int        `gorm:"column:is_file;default:0;NOT NULL"`
 	FileUrl             string     `gorm:"column:file_url"`
+	IsDelete            int        `gorm:"column:is_delete;default:0;NOT NULL"`
 }
 
 func (m *KnowledgeResource) TableName() string {
@@ -63,6 +65,7 @@ type KnowledgeResourceList struct {
 	TagId               int    `gorm:"column:tag_id;default:0;NOT NULL"`
 	StartTime           string `gorm:"column:start_time"`
 	EndTime             string `gorm:"column:end_time"`
+	Content             string `gorm:"-"`
 	ClassifyFullName    string
 	TagName             string
 }
@@ -72,8 +75,15 @@ type KnowledgeResourceListResp struct {
 	Paging *paging.PagingItem `description:"分页数据"`
 }
 
+func GetBatchKnowledgeResource(batchSize int, id int) (items []*KnowledgeResource, err error) {
+	sql := `SELECT * FROM knowledge_resource WHERE knowledge_resource_id>=? AND is_delete=0 ORDER BY knowledge_resource_id ASC LIMIT ?`
+	pars := []interface{}{id, batchSize}
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
+	return
+}
+
 func GetKnowledgeResourcePageList(condition string, pars []interface{}, startSize, pageSize int) (items []*KnowledgeResource, err error) {
-	sql := `SELECT * FROM knowledge_resource WHERE 1=1  `
+	sql := `SELECT * FROM knowledge_resource WHERE 1=1  AND is_delete=0 `
 	if condition != "" {
 		sql += condition
 	}
@@ -95,7 +105,7 @@ func GetKnowledgeResourceIdList(condition string, pars []interface{}) (items []i
 }
 
 func GetKnowledgeResourceListCount(condition string, pars []interface{}) (count int, err error) {
-	sql := `SELECT COUNT(1) AS count  FROM knowledge_resource WHERE 1=1 `
+	sql := `SELECT COUNT(1) AS count  FROM knowledge_resource WHERE 1=1 AND is_delete=0 `
 	if condition != "" {
 		sql += condition
 	}
@@ -103,9 +113,30 @@ func GetKnowledgeResourceListCount(condition string, pars []interface{}) (count
 	return
 }
 
+func GetKnowledgeResourcePageByIds(ids []int, startSize, pageSize int) (items []*KnowledgeResource, err error) {
+	if len(ids) == 0 {
+		return
+	}
+	sql := `SELECT * FROM knowledge_resource WHERE knowledge_resource_id in (?) ORDER BY modify_time DESC LIMIT ?,?`
+
+	err = global.DmSQL["rddp"].Raw(sql, ids, startSize, pageSize).Find(&items).Error
+	return
+}
+
+func GetKnowledgeResourceByIds(ids []int) (items []*KnowledgeResource, err error) {
+	if len(ids) == 0 {
+		return
+	}
+	sql := `SELECT * FROM knowledge_resource WHERE knowledge_resource_id in (?) ORDER BY start_time DESC`
+
+	err = global.DmSQL["rddp"].Raw(sql, ids).Find(&items).Error
+	return
+}
+
+// Delete逻辑删除
 func (m *KnowledgeResource) Delete(knowledgeResourceIds int) (err error) {
 
-	sql := ` DELETE FROM knowledge_resource WHERE knowledge_resource_id =? `
+	sql := ` UPDATE knowledge_resource SET is_delete = 1 WHERE knowledge_resource_id =? `
 	err = global.DmSQL["rddp"].Exec(sql, knowledgeResourceIds).Error
 	return
 }
@@ -277,3 +308,17 @@ func (m *KnowledgeResource) UpdateClassifyIdByIds(ids []int, classifyId int, res
 	err = global.DmSQL["rddp"].Exec(sql, pars...).Error
 	return
 }
+
+type BiDashboardResourceAddReq struct {
+	BiDashboardDetailId   int                        `description:"Bi看板详情"`
+	KnowledgeResourceList []KnowledgeResourceMapItem `description:"知识资源id"`
+}
+type BiDashboardResourceAddResp struct {
+	BiDashboardDetailId   int                      `description:"Bi看板详情"`
+	KnowledgeResourceList []*KnowledgeResourceList `description:"知识资源列表"`
+}
+
+type KnowledgeResourceMapItem struct {
+	KnowledgeResourceId int
+	ResourceType        int
+}

models/knowledge/knowledge_resource_bi_dashboard_detail.go

@@ -0,0 +1,51 @@
+package knowledge
+
+import (
+	"eta_gn/eta_api/global"
+	"eta_gn/eta_api/utils"
+	"time"
+)
+
+type KnowledgeResourceBiDashboardDetail struct {
+	Id                    int       `gorm:"column:id;primary_key"`
+	BiDashboardDetailId   int       `gorm:"column:bi_dashboard_detail_id;comment:关联的BI仪表盘详情ID"`
+	KnowledgeResourceId   int       `gorm:"column:knowledge_resource_id;comment:关联的知识库资源ID"`
+	KnowledgeResourceType int       `gorm:"column:knowledge_resource_type;comment:知识库资源类型:0事件库，1政策库，2观点库，3知识库"`
+	CreateTime            time.Time `gorm:"column:create_time;comment:创建时间"`
+}
+
+func (KnowledgeResourceBiDashboardDetail) TableName() string {
+	return "knowledge_resource_bi_dashboard_detail"
+}
+
+func (k *KnowledgeResourceBiDashboardDetail) BatchAdd(items []*KnowledgeResourceBiDashboardDetail) (err error) {
+	if len(items) == 0 {
+		return
+	}
+	tx := global.DmSQL["rddp"].Begin()
+	defer func() {
+		if err != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+
+	sql := `DELETE FROM knowledge_resource_bi_dashboard_detail WHERE bi_dashboard_detail_id =? `
+	err = tx.Exec(sql, items[0].BiDashboardDetailId).Error
+	if err != nil {
+		return
+	}
+	err = global.DmSQL["rddp"].CreateInBatches(items, utils.MultiAddNum).Error
+	return
+}
+
+func GetKnowledgeResourceIdsByCondition(condition string, pars []interface{}) (resourceIds []int, err error) {
+	sql := "SELECT knowledge_resource_id FROM knowledge_resource_bi_dashboard_detail WHERE 1=1 "
+	if condition != "" {
+		sql += condition
+	}
+
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&resourceIds).Error
+	return
+}

routers/commentsRouter.go

@@ -5020,6 +5020,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"],
+        beego.ControllerComments{
+            Method: "BiDashboardCacheResourceList",
+            Router: `/resource/bi_dashboard/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"],
+        beego.ControllerComments{
+            Method: "BiDashboardResourceSave",
+            Router: `/resource/bi_dashboard/save`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"],
         beego.ControllerComments{
             Method: "Delete",
@@ -5092,6 +5110,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"],
+        beego.ControllerComments{
+            Method: "Search",
+            Router: `/resource/search_by_es`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"],
         beego.ControllerComments{
             Method: "GetSourceFrom",

services/bi_dashboard.go

@@ -3,13 +3,59 @@ package services
 import (
 	"encoding/json"
 	"eta_gn/eta_api/models/bi_dashboard"
+	"eta_gn/eta_api/models/knowledge"
 	"eta_gn/eta_api/utils"
 	"fmt"
+	"strconv"
 	"time"
-)
 
+	"github.com/go-redis/redis/v8"
+)
 
+func SaveBiDashboardKnowledgeResource(dashboardId, adminId int) (msg string, err error) {
+	ids, err := bi_dashboard.GetBiDashboardDetailIdByBidashboardIdAndType(dashboardId, 3)
+	if err != nil {
+		return
+	}
+	if len(ids) == 0 {
+		return
+	}
 
+	data, er := utils.Rc.RedisBytes(utils.CACHE_KEY_BI_DASHBOARD_PREPARE_RESOURCE + strconv.Itoa(adminId))
+	req := new(knowledge.BiDashboardResourceAddReq)
+	if er != nil {
+		if er == redis.Nil {
+			msg = "暂无知识库"
+			err = nil
+			return
+		}
+		msg = "知识资源库添加失败"
+		return
+	}
+	if err = json.Unmarshal(data, &req); err != nil {
+		msg = "知识资源库添加失败"
+	}
+	defer func() {
+		if err == nil {
+			utils.Rc.Delete(utils.CACHE_KEY_BI_DASHBOARD_PREPARE_RESOURCE + strconv.Itoa(adminId))
+		}
+	}()
+	insertMapping := make([]*knowledge.KnowledgeResourceBiDashboardDetail, 0, len(req.KnowledgeResourceList))
+	for _, v := range req.KnowledgeResourceList {
+		tmp := new(knowledge.KnowledgeResourceBiDashboardDetail)
+		tmp.BiDashboardDetailId = ids[0]
+		tmp.KnowledgeResourceId = v.KnowledgeResourceId
+		tmp.KnowledgeResourceType = 3
+		tmp.CreateTime = time.Now()
+		insertMapping = append(insertMapping, tmp)
+	}
+	obj := new(knowledge.KnowledgeResourceBiDashboardDetail)
+	err = obj.BatchAdd(insertMapping)
+	if err != nil {
+		msg = "知识资源库添加失败"
+	}
+	return
+}
 
 // UpdateBiDashboardEditing 更新看板编辑状态
 func UpdateBiDashboardEditing(boardId, status, userId int, userName string) (ret bi_dashboard.BiDashboardEditingCache, err error) {

services/elastic/elastic.go

@@ -8,9 +8,10 @@ import (
 	"eta_gn/eta_api/models/data_manage"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/olivere/elastic/v7"
 	"strconv"
 	"strings"
+
+	"github.com/olivere/elastic/v7"
 )
 
 // indexName:索引名称
@@ -37,6 +38,28 @@ func EsCreateIndex(indexName, mappingJson string) (err error) {
 	return
 }
 
+// EsDeleteIndex 删除索引
+func EsDeleteIndex(indexName string) (err error) {
+	client := utils.EsClient
+
+	//定义表结构
+	exists, err := client.IndexExists(indexName).Do(context.Background()) //<5>
+	if err != nil {
+		return
+	}
+	if exists {
+		resp, err := client.DeleteIndex(indexName).Do(context.Background())
+		if err != nil {
+			fmt.Println("DeleteIndex Err:" + err.Error())
+			return err
+		}
+		fmt.Println(resp.Acknowledged)
+	} else {
+		fmt.Println(indexName + " 不存在")
+	}
+	return
+}
+
 // 删除数据
 func EsDeleteData(indexName, docId string) (err error) {
 	client := utils.EsClient

services/knowledge/es.go

@@ -0,0 +1,221 @@
+package knowledge
+
+import (
+	"context"
+	"encoding/json"
+	"eta_gn/eta_api/models/knowledge"
+	"eta_gn/eta_api/utils"
+	"fmt"
+	"html"
+	"strconv"
+	"strings"
+
+	"github.com/PuerkitoBio/goquery"
+)
+
+// SearchChartInfoData 查询es中的图表数据
+func SearchKnowledgeResourceByEs(resourceType int, keywordStr string, showSysIds []int, myId int, classifyIds []int, sourceList []string, tagIds []int, isIncludeFile bool, from, size int) (list []*knowledge.KnowledgeResource, total int64, err error) {
+	indexName := utils.EsKnowledgeResourceIndexName
+	list = make([]*knowledge.KnowledgeResource, 0)
+	defer func() {
+		if err != nil {
+			fmt.Println("SearchKnowledgeResource Err:", err.Error())
+			utils.FileLog.Info("SearchKnowledgeResource Err:", err.Error())
+		}
+	}()
+	client := utils.EsClient
+
+	mustMap := make([]interface{}, 0)
+
+	mustMap = append(mustMap, map[string]interface{}{
+		"term": map[string]interface{}{
+			"ResourceType": resourceType,
+		},
+	})
+
+	//指标来源
+	if len(showSysIds) > 0 {
+		mustMap = append(mustMap, map[string]interface{}{
+			"terms": map[string]interface{}{
+				"AdminId": showSysIds,
+			},
+		})
+	}
+	if myId > 0 {
+		mustMap = append(mustMap, map[string]interface{}{
+			"term": map[string]interface{}{
+				"AdminId": myId,
+			},
+		})
+	}
+	if len(tagIds) > 0 {
+		mustMap = append(mustMap, map[string]interface{}{
+			"terms": map[string]interface{}{
+				"TagId": tagIds,
+			},
+		})
+	}
+	if len(sourceList) > 0 {
+		mustMap = append(mustMap, map[string]interface{}{
+			"terms": map[string]interface{}{
+				"SourceFrom": sourceList,
+			},
+		})
+	}
+	if len(classifyIds) > 0 {
+		mustMap = append(mustMap, map[string]interface{}{
+			"terms": map[string]interface{}{
+				"ClassifyId": classifyIds,
+			},
+		})
+	}
+
+	mustMap = append(mustMap, map[string]interface{}{
+		"term": map[string]interface{}{
+			"IsDelete": 0,
+		},
+	})
+	if !isIncludeFile {
+		mustMap = append(mustMap, map[string]interface{}{
+			"term": map[string]interface{}{
+				"IsFile": 0,
+			},
+		})
+	}
+
+	if keywordStr != "" {
+		shouldMap := map[string]interface{}{
+			"should": []interface{}{
+				map[string]interface{}{
+					"match": map[string]interface{}{
+						"Title": keywordStr,
+					},
+				},
+				// 因为关键词被分了，所以需要用下面的语句来让他 整个词 查询，从而加重整词的权重
+				map[string]interface{}{
+					"match": map[string]interface{}{
+						"Title": map[string]interface{}{
+							"query":    keywordStr,
+							"operator": "and",
+						},
+					},
+				},
+			},
+		}
+		mustMap = append(mustMap, map[string]interface{}{
+			"bool": shouldMap,
+		})
+	}
+
+	queryMap := map[string]interface{}{
+		"query": map[string]interface{}{
+			"bool": map[string]interface{}{
+				"must": mustMap,
+			},
+		},
+	}
+
+	//根据条件数量统计
+	requestTotalHits := client.Count(indexName).BodyJson(queryMap)
+	total, err = requestTotalHits.Do(context.Background())
+	if err != nil {
+		return
+	}
+
+	// 分页查询
+	queryMap["from"] = from
+	queryMap["size"] = size
+
+	if keywordStr == "" {
+		sortMap := []map[string]interface{}{
+			{
+				"StartTime.keyword": map[string]interface{}{
+					"order": "desc", // 按照开始时间倒序排列
+				},
+			},
+		}
+		queryMap["sort"] = sortMap
+
+	}
+
+	request := client.Search(indexName).Source(queryMap) // sets the JSON request
+	searchMap := make(map[string]string)
+
+	searchResp, err := request.Do(context.Background())
+	if err != nil {
+		return
+	}
+	if searchResp.Status != 0 {
+		jsonBytes, _ := json.Marshal(queryMap)
+		utils.FileLog.Info("search json:%s,SearchKnowledgeResourceByEs Status:%d", string(jsonBytes), searchResp.Status)
+		return
+	}
+
+	if searchResp.Hits != nil {
+		for _, v := range searchResp.Hits.Hits {
+			if _, ok := searchMap[v.Id]; !ok {
+				itemJson, tmpErr := v.Source.MarshalJSON()
+				if tmpErr != nil {
+					err = tmpErr
+					utils.FileLog.Info("search json:%s,SearchKnowledgeResourceByEs Hits Source err:%s", string(itemJson), tmpErr.Error())
+					return
+				}
+				knowledgeItem := new(knowledge.KnowledgeResource)
+				tmpErr = json.Unmarshal(itemJson, &knowledgeItem)
+				if err != nil {
+					utils.FileLog.Info("json.Unmarshal KnowledgeResource err:%s", err.Error())
+					err = tmpErr
+					return
+				}
+				list = append(list, knowledgeItem)
+				searchMap[v.Id] = v.Id
+			}
+		}
+	}
+	return
+}
+
+func ExtractTextFromResourceContent(content string) (text string) {
+	content = html.UnescapeString(content)
+	doc, err := goquery.NewDocumentFromReader(strings.NewReader(content))
+	if err != nil {
+		return
+	}
+	text = doc.Text()
+	text = strings.ReplaceAll(text, "\n", "")
+	return
+}
+
+// EsAddOrEditKnowledgeResource 新增/修改es中的知识资源数据
+func EsAddOrEditKnowledgeResource(item *knowledge.KnowledgeResource) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println("EsAddOrEditData Err:", err.Error())
+			utils.FileLog.Info("EsAddOrEditKnowledgeResource err:", err)
+		}
+	}()
+	indexName := utils.EsKnowledgeResourceIndexName
+	client := utils.EsClient
+	if item.IsFile == 0 {
+		content := ExtractTextFromResourceContent(item.Content)
+		contentRunes := []rune(content)
+		if len(contentRunes) > 60 {
+			item.Content = string(contentRunes[:60])
+		} else {
+			item.Content = content
+		}
+	}
+	request := client.Index().Index(indexName).Id(strconv.Itoa(item.KnowledgeResourceId)).BodyJson(item)
+	response, err := request.Do(context.Background())
+	if err != nil {
+		jsonBytes, _ := json.Marshal(item)
+		utils.FileLog.Info("add json:%s,EsAddOrEditKnowledgeResource err:%s", string(jsonBytes), err.Error())
+		return
+	}
+	if response.Status == 0 {
+		err = nil
+	} else {
+		fmt.Println("EsAddOrEditKnowledgeResource:", response.Status, response.Result)
+	}
+	return
+}

services/knowledge/resource.go

@@ -1,6 +1,7 @@
 package knowledge
 
 import (
+	"encoding/json"
 	"errors"
 	"eta_gn/eta_api/models/knowledge"
 	"eta_gn/eta_api/models/system"
@@ -8,11 +9,14 @@ import (
 	"eta_gn/eta_api/services/alarm_msg"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/tealeg/xlsx"
 	"html"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/go-redis/redis/v8"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"github.com/tealeg/xlsx"
 )
 
 func AddResource(req *knowledge.AddReq, sysUser *system.Admin) (item *knowledge.KnowledgeResource, err error, errMsg string) {
@@ -148,9 +152,11 @@ func AddResource(req *knowledge.AddReq, sysUser *system.Admin) (item *knowledge.
 		err = fmt.Errorf("保存失败,Err:" + err.Error())
 		return
 	}
-	//todo 是否需要保存到es中
+	// 保存到es中
+	go EsAddOrEditKnowledgeResource(item)
 	return
 }
+
 func EditResource(resourceInfo *knowledge.KnowledgeResource, req knowledge.EditReq, sysUser *system.Admin) (err error, errMsg string) {
 	errMsg = `保存失败`
 	var startTime time.Time
@@ -274,6 +280,7 @@ func EditResource(resourceInfo *knowledge.KnowledgeResource, req knowledge.EditR
 	if err != nil {
 		return
 	}
+	go EsAddOrEditKnowledgeResource(resourceInfo)
 	return
 }
 
@@ -1053,3 +1060,128 @@ func addExcelResource(req *knowledge.AddReq, sysUser *system.Admin) (err error,
 	//todo 是否需要保存到es中
 	return
 }
+
+func GetKnowledgeResourceTmpList(dashboardDetailId, adminId int) (resp *knowledge.BiDashboardResourceAddResp, msg string, err error) {
+	if dashboardDetailId <= 0 {
+		data, er := utils.Rc.RedisBytes(utils.CACHE_KEY_BI_DASHBOARD_PREPARE_RESOURCE + strconv.Itoa(adminId))
+		req := new(knowledge.BiDashboardResourceAddReq)
+		if er != nil {
+			if er == redis.Nil {
+				msg = "暂无知识库"
+				err = nil
+				return
+			}
+			msg = "获取知识库模板列表失败"
+			return
+		}
+		if err = json.Unmarshal(data, &req); err != nil {
+			msg = "获取知识库模板列表失败"
+		}
+
+		selectedIds := make([]int, 0)
+		for _, item := range req.KnowledgeResourceList {
+			selectedIds = append(selectedIds, item.KnowledgeResourceId)
+		}
+		knowledgeList, er := knowledge.GetKnowledgeResourceByIds(selectedIds)
+		if er != nil {
+			msg = "获取知识库模板列表失败"
+			return
+		}
+		resp = new(knowledge.BiDashboardResourceAddResp)
+		resp.KnowledgeResourceList = toKnowledgeResourceList(knowledgeList)
+	} else {
+		condition := ` AND bi_dashboard_detail_id = ? `
+		pars := []interface{}{dashboardDetailId}
+		resourceIds, er := knowledge.GetKnowledgeResourceIdsByCondition(condition, pars)
+		if er != nil {
+			msg = "获取知识库模板列表失败"
+			return
+		}
+		if len(resourceIds) == 0 {
+			msg = "暂无知识库"
+			return
+		}
+		resp = new(knowledge.BiDashboardResourceAddResp)
+		knowledgeList, er := knowledge.GetKnowledgeResourceByIds(resourceIds)
+		if er != nil {
+			msg = "获取知识库模板列表失败"
+			return
+		}
+		resp.BiDashboardDetailId = dashboardDetailId
+		resp.KnowledgeResourceList = toKnowledgeResourceList(knowledgeList)
+	}
+	return
+}
+
+func GetKnowledgeResourceList(dashboardDetailId int) (resp *knowledge.KnowledgeResourceListResp, msg string, err error) {
+	// var startSize int
+	// if pageSize <= 0 {
+	// 	pageSize = utils.PageSize20
+	// }
+	// if currentIndex <= 0 {
+	// 	currentIndex = 1
+	// }
+	// startSize = utils.StartIndex(currentIndex, pageSize)
+
+	condition := ` AND bi_dashboard_detail_id = ? `
+	var pars = []interface{}{dashboardDetailId}
+
+	resourceIds, err := knowledge.GetKnowledgeResourceIdsByCondition(condition, pars)
+	if err != nil {
+		msg = "获取知识库列表失败"
+		return
+	}
+	if len(resourceIds) == 0 {
+		resp = &knowledge.KnowledgeResourceListResp{
+			List:   make([]*knowledge.KnowledgeResourceList, 0),
+			Paging: &paging.PagingItem{},
+		}
+		return
+	}
+
+	knowledgeList, err := knowledge.GetKnowledgeResourceByIds(resourceIds)
+	if err != nil {
+		msg = "获取知识库列表失败"
+		return
+	}
+
+	resp = new(knowledge.KnowledgeResourceListResp)
+	resp.List = toKnowledgeResourceList(knowledgeList)
+
+	return
+}
+
+func toKnowledgeResourceList(list []*knowledge.KnowledgeResource) (res []*knowledge.KnowledgeResourceList) {
+	for _, item := range list {
+		resItem := &knowledge.KnowledgeResourceList{
+			KnowledgeResourceId: item.KnowledgeResourceId,
+			ResourceType:        item.ResourceType,
+			ClassifyId:          item.ClassifyId,
+			Title:               item.Title,
+			State:               item.State,
+			ResourceCode:        item.ResourceCode,
+			AdminId:             item.AdminId,
+			AdminRealName:       item.AdminRealName,
+			SourceFrom:          item.SourceFrom,
+			TagId:               item.TagId,
+			CreateTime:          utils.TimeTransferString(utils.FormatDateTime, item.CreateTime),
+			ModifyTime:          utils.TimeTransferString(utils.FormatDateTime, item.ModifyTime),
+		}
+		if item.StartTime != nil {
+			if item.ResourceType == knowledge.KnowledgeResourceTypeEvent || item.ResourceType == knowledge.KnowledgeResourceTypePolicy {
+				resItem.StartTime = utils.TimeTransferString(utils.FormatDateTime, *item.StartTime)
+			} else {
+				resItem.StartTime = utils.TimeTransferString(utils.FormatDate, *item.StartTime)
+			}
+		}
+		if item.EndTime != nil {
+			if item.ResourceType == knowledge.KnowledgeResourceTypeEvent || item.ResourceType == knowledge.KnowledgeResourceTypePolicy {
+				resItem.EndTime = utils.TimeTransferString(utils.FormatDateTime, *item.EndTime)
+			} else {
+				resItem.EndTime = utils.TimeTransferString(utils.FormatDate, *item.EndTime)
+			}
+		}
+		res = append(res, resItem)
+	}
+	return
+}

utils/config.go

@@ -127,6 +127,7 @@ var (
 	MY_CHART_INDEX_NAME            string //研究图库（MY ETA）索引
 	EsSemanticAnalysisDocIndexName string //ES语义分析文档索引名
 	SmartReportIndexName           string //智能研报ES索引
+	EsKnowledgeResourceIndexName   string //ES知识库索引
 )
 
 var (
@@ -527,6 +528,7 @@ func init() {
 		EsEnglishReportIndexName = config["es_english_report_index_name"]
 		EsSemanticAnalysisDocIndexName = config["es_semantic_analysis_doc_index_name"]
 		SmartReportIndexName = config["es_smart_report_index_name"]
+		EsKnowledgeResourceIndexName = config["es_knowledge_resource_index_name"]
 	}
 
 	CrmEtaServerUrl = config["crm_eta_server_url"]

utils/constants.go

@@ -214,7 +214,8 @@ const (
 
 	CACHE_EDB_TERMINAL_CODE_URL = "edb:terminal_code:edb_code:" // 指标与终端关系的缓存
 
-	CACHE_KEY_REPLACE_EDB = "eta:replace_edb" //系统用户操作日志队列
+	CACHE_KEY_REPLACE_EDB                   = "eta:replace_edb"                   //系统用户操作日志队列
+	CACHE_KEY_BI_DASHBOARD_PREPARE_RESOURCE = "eta:bi_dashboard:prepare_resource" // 准备引用到看板的知识资源
 )
 
 // 模板消息推送类型