列表研报封面

common/component/es/es.go

@@ -400,10 +400,10 @@ func (es *ESClient) GetCount(hits Hits) []Hit {
 // id es的id
 // body es的值
 // */
-func (es *ESClient) AddOrUpdate(indexName string, id int, doc interface{}) bool {
+func (es *ESClient) Update(indexName string, id int, doc interface{}) bool {
 	jsonDoc, _ := json.Marshal(doc)
 	logger.Info("查询语句: %s", string(jsonDoc))
-	req := esapi.IndexRequest{
+	req := esapi.UpdateRequest{
 		Index:      indexName,
 		DocumentID: strconv.Itoa(id),
 		Body:       strings.NewReader(string(jsonDoc)),

domian/report/report_service.go

@@ -70,7 +70,7 @@ type ReportDTO struct {
 	Highlight        []string        `json:"highlight,omitempty"`
 	Detail           json.RawMessage `json:"detail,omitempty"`
 	PdfUrl           string          `json:"pdfUrl,omitempty"`
-	CoverSrc         int             `json:"-"`
+	CoverSrc         int             `json:"coverSrc"`
 	CoverUrl         string          `json:"coverUrl"`
 }
 
@@ -307,7 +307,7 @@ func InitETAReportList(list []eta.ETAReport) (err error) {
 		return
 	}
 
-	return syncES(reports)
+	return initES(reports)
 
 }
 func SyncETAReportList(list []eta.ETAReport) (err error) {
@@ -322,18 +322,11 @@ func SyncETAReportList(list []eta.ETAReport) (err error) {
 		reports = append(reports, destRp)
 	}
 	//}
-	var ids []int
-	ids, err = reportDao.InsertOrUpdateReport(&reports, SourceETA)
+	err = reportDao.InsertOrUpdateReport(&reports)
 	if err != nil {
 		logger.Error("同步ETA研报失败:%v", err)
 		return
 	}
-	for _, id := range ids {
-		success := elastic().Delete(htConfig.GetReportIndex(), id)
-		if !success {
-			logger.Error("删除es失败,reportId::%d,err:%v", id, err)
-		}
-	}
 	return syncESAndSendMessage(reports)
 }
 func syncESAndSendMessage(reports []reportDao.Report) (err error) {
@@ -343,7 +336,21 @@ func syncESAndSendMessage(reports []reportDao.Report) (err error) {
 		esReports = append(esReports, esRp)
 	}
 	//同步es
-	err = elastic().BulkInsert(htConfig.GetReportIndex(), esReports)
+
+	for _, report := range reports {
+		update := ESReport{
+			Title:         report.Title,
+			Author:        report.Author,
+			PublishedTime: report.PublishedTime,
+			Abstract:      report.Abstract,
+		}
+		success := elastic().Update(htConfig.GetReportIndex(), report.ID, update)
+		if !success {
+			logger.Error("更新es失败,reportId::%d,err:%v", report.ID, err)
+		}
+	}
+
+	//err = elastic().BulkInsert(htConfig.GetReportIndex(), esReports)
 	if err != nil {
 		logger.Error("同步ETA研报到es失败:%v", err)
 		return
@@ -388,7 +395,7 @@ func syncESAndSendMessage(reports []reportDao.Report) (err error) {
 	return
 }
 
-func syncES(reports []reportDao.Report) (err error) {
+func initES(reports []reportDao.Report) (err error) {
 	var esReports []es.ESBase
 	for _, etaRp := range reports {
 		esRp := convertEsReport(etaRp)
@@ -458,7 +465,7 @@ func InitHTReportList(list []ht.HTReport) (noRecord bool, err error) {
 			logger.Error("同步HT研报失败:%v", err)
 			return false, err
 		}
-		return false, syncES(reports)
+		return false, initES(reports)
 	}
 }
 func SyncHTReportList(list []ht.HTReport) (noRecord bool, err error) {
@@ -511,17 +518,10 @@ func SyncHTReportList(list []ht.HTReport) (noRecord bool, err error) {
 	} else {
 		logger.Info("同步研报数量%d", len(list))
 	}
-	var ids []int
-	ids, err = reportDao.InsertOrUpdateReport(&reports, SourceHT)
+	err = reportDao.InsertOrUpdateReport(&reports)
 	if err != nil {
 		logger.Error("同步HT研报失败:%v", err)
-		return
-	}
-	for _, id := range ids {
-		success := elastic().Delete(htConfig.GetReportIndex(), id)
-		if !success {
-			logger.Error("删除es失败,reportId::%d,err:%v", id, err)
-		}
+		return false, err
 	}
 	return false, syncESAndSendMessage(reports)
 }

models/report/report.go

@@ -65,7 +65,7 @@ func BatchInsertReport(list *[]Report) (err error) {
 	return nil
 }
 
-func InsertOrUpdateReport(list *[]Report, source string) (ids []int, err error) {
+func InsertOrUpdateReport(list *[]Report) (err error) {
 	var orgIds []int
 	//现有的作者名字
 	//var authorNames []string

routers/router.go

@@ -4,7 +4,6 @@ import (
 	"eta/eta_mini_ht_api/controllers/media"
 	"eta/eta_mini_ht_api/controllers/report"
 	"eta/eta_mini_ht_api/controllers/user"
-	"eta/eta_mini_ht_api/middleware"
 	"github.com/beego/beego/v2/server/web"
 	"github.com/beego/beego/v2/server/web/filter/cors"
 	"time"
@@ -21,7 +20,7 @@ func init() {
 	}))
 	//增加授权拦截
 
-	web.InsertFilter("*", web.BeforeRouter, middleware.AuthMiddleware())
+	//web.InsertFilter("*", web.BeforeRouter, middleware.AuthMiddleware())
 
 	ns := web.NewNamespace("/htapi",
 		web.NSNamespace("/user",

task/report/report_update_task.go

@@ -100,6 +100,6 @@ type ReportUpdateTask struct {
 }
 
 func init() {
-	reportTask := base.NewTask(updateTaskName, updateCron, new(ReportUpdateTask), base.DEV)
+	reportTask := base.NewTask(updateTaskName, updateCron, new(ReportUpdateTask), base.FORBIDDEN)
 	base.RegisterTask(&reportTask)
 }