fix:修改事件es搜索

controllers/knowledge/resource.go

@@ -388,13 +388,18 @@ func (this *ResourceController) Search() {
 		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
-		item.StartTime = v.StartTime.Format(utils.FormatDateTime)
-		item.EndTime = v.EndTime.Format(utils.FormatDateTime)
+		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)
 	}
 

models/knowledge/knowledge_resource.go

@@ -65,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
 }

services/task.go

@@ -2,7 +2,6 @@ package services
 
 import (
 	"eta_gn/eta_api/services/data"
-	"eta_gn/eta_api/services/elastic"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"strings"
@@ -20,9 +19,6 @@ func Task() {
 	// 进行指标替换操作
 	go DealReplaceEdbCache()
 
-	// 知识库索引创建
-	go EsCreateKnowledgeResourceIndexName()
-
 	fmt.Println("task end")
 }
 
@@ -43,122 +39,3 @@ func ImportManualDataRefresh() {
 		})
 	}
 }
-
-func EsCreateKnowledgeResourceIndexName() {
-	mappingJson := `
-	{
-  "mappings": {
-    "properties": {
-      "KnowledgeResourceId": {
-        "type": "integer"
-      },
-      "ResourceType": {
-        "type": "integer"
-      },
-      "ClassifyId": {
-        "type": "integer"
-      },
-      "Title": {
-        "type": "text",
-        "analyzer": "ik_max_word",
-        "fields": {
-          "keyword": {
-            "type": "keyword",
-            "ignore_above": 256
-          }
-        }
-      },
-      "CreateTime": {
-        "type": "text",
-        "fields": {
-          "keyword": {
-            "type": "keyword",
-            "ignore_above": 256
-          }
-        }
-      },
-      "ModifyTime": {
-        "type": "text",
-        "fields": {
-          "keyword": {
-            "type": "keyword",
-            "ignore_above": 256
-          }
-        }
-      },
-      "State": {
-        "type": "integer"
-      },
-      "Content": {
-        "type": "text",
-        "analyzer": "standard",
-        "fields": {
-          "keyword": {
-            "type": "keyword",
-            "ignore_above": 256
-          }
-        }
-      },
-      "ResourceCode": {
-        "type": "keyword"
-      },
-      "AdminId": {
-        "type": "integer"
-      },
-      "AdminRealName": {
-        "type": "text",
-        "fields": {
-          "keyword": {
-            "type": "keyword",
-            "ignore_above": 256
-          }
-        }
-      },
-      "SourceFrom": {
-        "type": "keyword"
-      },
-      "TagId": {
-        "type": "integer"
-      },
-      "StartTime": {
-        "type": "text",
-        "fields": {
-          "keyword": {
-            "type": "keyword",
-            "ignore_above": 256
-          }
-        }
-      },
-      "EndTime": {
-        "type": "text",
-        "fields": {
-          "keyword": {
-            "type": "keyword",
-            "ignore_above": 256
-          }
-        }
-      },
-      "IsFile": {
-        "type": "integer"
-      },
-      "FileUrl": {
-        "type": "keyword"
-      },
-      "IsDelete": {
-        "type": "integer"
-      }
-    }
-  }
-}
-	`
-	err := elastic.EsDeleteIndex(utils.EsKnowledgeResourceIndexName)
-	if err != nil {
-		fmt.Println("EsDeleteIndex err:", err)
-		utils.FileLog.Info("EsDeleteIndex err:", err)
-	}
-	err = elastic.EsCreateIndex(utils.EsKnowledgeResourceIndexName, mappingJson)
-	if err != nil {
-		fmt.Println("EsCreateKnowledgeResourceIndexName err:", err)
-		utils.FileLog.Info("EsCreateKnowledgeResourceIndexName err:", err)
-	}
-}