Merge branch 'feature/pool_es_search' of hongze/hongze_yb into master

controller/report/report.go

@@ -27,7 +27,7 @@ func Detail(c *gin.Context)  {
 
 	reportDetail, err := report.GetReportDetail(userinfo, reportId)
 	if err != nil {
-		response.Fail(err.Error(), c)
+		response.FailMsg("查看报告详情出错",err.Error(), c)
 		return
 	}
 	response.OkData("查询成功", reportDetail, c )
@@ -50,7 +50,7 @@ func ChapterDetail(c *gin.Context)  {
 
 	chapterDetail, err := report.GetChapterDetail(userinfo, reportChapterId)
 	if err != nil {
-		response.Fail(err.Error(), c)
+		response.FailMsg("查看章节详情出错",err.Error(), c)
 		return
 	}
 	response.OkData("查询成功", chapterDetail, c )
@@ -99,7 +99,7 @@ func List(c *gin.Context)  {
 
 	list, err := report.GetReportList(userinfo, keyWord, classifyIdFirst, classifyIdSecond, pageIndex, pageSize)
 	if err != nil {
-		response.Fail(err.Error(), c)
+		response.FailMsg("查看研报列表出错",err.Error(), c)
 		return
 	}
 	response.OkData("查询成功", list, c )
@@ -137,7 +137,7 @@ func CollectReportList(c *gin.Context) {
 
 	list, err := report.GetCollectReportList(userinfo, chartPermissionId, pageIndex, pageSize)
 	if err != nil {
-		response.Fail(err.Error(), c)
+		response.FailMsg("汇总报告查询出错",err.Error(), c)
 		return
 	}
 	response.OkData("查询成功", list, c )
@@ -169,7 +169,7 @@ func Search(c *gin.Context) {
 	userinfo := userService.GetInfoByClaims(c)
 	data, err := report.SearchReport(userinfo, keyWord, pageIndex, pageSize)
 	if err != nil {
-		response.Fail(err.Error(), c)
+		response.FailMsg("搜索报告出错",err.Error(), c)
 		return
 	}
 	response.OkData("查询成功", data, c)

services/elastic/report.go

@@ -132,12 +132,12 @@ func SearchReport(keyWord string, classifyIdFirsts []int, classifyIdSeconds []in
 
 	source["sort"] = []map[string]interface{}{
 		map[string]interface{}{
-			"_score":map[string]interface{}{
+			"PublishTime.keyword":map[string]interface{}{
 				"order":"desc",
 			},
 		},
 		map[string]interface{}{
-			"PublishTime.keyword":map[string]interface{}{
+			"_score":map[string]interface{}{
 				"order":"desc",
 			},
 		},
@@ -271,12 +271,12 @@ func ReportListSearch(keyWord string, classifyIdFirst int, classifyIdSeconds []i
 
 	source["sort"] = []map[string]interface{}{
 		map[string]interface{}{
-			"_score":map[string]interface{}{
+			"PublishTime.keyword":map[string]interface{}{
 				"order":"desc",
 			},
 		},
 		map[string]interface{}{
-			"PublishTime.keyword":map[string]interface{}{
+			"_score":map[string]interface{}{
 				"order":"desc",
 			},
 		},

services/report/report.go

@@ -729,7 +729,7 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
 				temp.Stage = stageInt
 				temp.StageStr = reportItem.StageStr
 				temp.Title = reportItem.Title
-				temp.PublishTime, err = time.Parse("2006-01-02 15:04:05", reportItem.PublishTime)
+				temp.PublishTime, err = time.ParseInLocation(utils.FormatDateTime, reportItem.PublishTime, time.Local)
 				if len(v.Highlight["Title"]) > 0 {
 					temp.Title = v.Highlight["Title"][0]
 				}
@@ -1032,7 +1032,7 @@ func SearchReport(user user.UserInfo, keyWord string, pageIndex, pageSize int) (
 			temp.ClassifyNameSecond = reportItem.ClassifyNameSecond
 			temp.Title = reportItem.Title
 			temp.ContentSub = reportItem.BodyContent
-			temp.PublishTime, err = time.Parse("2006-01-02 15:04:05", reportItem.PublishTime)
+			temp.PublishTime, err = time.ParseInLocation(utils.FormatDateTime, reportItem.PublishTime,time.Local)
 
 			if len(v.Highlight["Title"]) > 0 {
 				temp.Title = v.Highlight["Title"][0]