From 56acb65a68fbe85e3ab8fc3b66e512eb4fcd8a30 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 08 四月 2024 17:54:34 +0800
Subject: [PATCH] 修复数据推送的延时问题
---
service/server.go | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/service/server.go b/service/server.go
index 39f2f64..2ad02fd 100644
--- a/service/server.go
+++ b/service/server.go
@@ -2,18 +2,20 @@
import (
"basic.com/pubsub/esutil.git"
+ "basic.com/valib/logger.git"
"bytes"
"data_msg_push_server/config"
"data_msg_push_server/model"
"data_msg_push_server/util"
"encoding/json"
+ "errors"
"fmt"
"io/ioutil"
"net/http"
)
func ConnectControl() bool {
- url := config.ServUrls.ServerUrl
+ url := config.Options.ServerUrl
resp, err := http.Get(url)
if err != nil {
fmt.Println("杩炴帴澶辫触", err)
@@ -26,7 +28,7 @@
}
func GetTotal() (total int, err error) {
- url := "http://" + config.ServUrls.EsUrl + "/ai_ocean/_search"
+ url := "http://" + config.Options.EsUrl + "/ai_ocean/_search"
queryDSL := `{
"size": "1",
"query": {
@@ -63,9 +65,9 @@
}
func GetData() (interface{}, error) {
- //fmt.Println(config.ServUrls.EsUrl)
- //fmt.Println(config.ServUrls.ServerUrl)
- url := "http://" + config.ServUrls.EsUrl + "/ai_ocean/_search"
+ //fmt.Println(config.Options.EsUrl)
+ //fmt.Println(config.Options.ServerUrl)
+ url := "http://" + config.Options.EsUrl + "/ai_ocean/_search"
queryDSL := `{
"size": "1",
"query": {
@@ -101,20 +103,25 @@
return nil, nil
}
picMaxImages := make([][]byte, 0) // 瀛樺偍鍥剧墖鏁版嵁鐨勬暟缁�
- if source[0]["picMaxUrl"].([]interface{}) != nil{
+ if source[0]["picMaxUrl"].([]interface{}) != nil {
//picMaxUrls := source[0]["picMaxUrl"].([]interface{})
if len(source[0]["picMaxUrl"].([]interface{})) > 0 {
for _, picMaxUrl := range source[0]["picMaxUrl"].([]interface{}) {
picMaxImageData, err := GetImageData("http://" + picMaxUrl.(string))
if err != nil {
- fmt.Println("鑾峰彇澶у浘鏁版嵁澶辫触:", err)
+ logger.Warn("鑾峰彇澶у浘鏁版嵁澶辫触:", err.Error())
continue
}
picMaxImages = append(picMaxImages, picMaxImageData)
}
- fmt.Println("鍥剧墖鏁版嵁鏁扮粍澶у皬:", len(picMaxImages))
}
}
+
+ if len(picMaxImages) == 0 {
+ return nil, errors.New("鑾峰彇澶у浘澶辫触, id:" + source[0]["id"].(string))
+ }
+
+ //fmt.Println("鍥剧墖鏁版嵁鏁扮粍澶у皬:", len(picMaxImages))
picSmImages := make([][]byte, 0) // 瀛樺偍鍥剧墖鏁版嵁鐨勬暟缁�
if source[0]["targetInfo"].(interface{}) != nil {
@@ -126,12 +133,20 @@
}
picSmImageData, err := GetImageData("http://" + picSmUrl)
if err != nil {
- fmt.Println("鑾峰彇鍥剧墖鏁版嵁澶辫触:", err)
+ fmt.Println("鑾峰彇灏忓浘鏁版嵁澶辫触:", err)
continue
}
picSmImages = append(picSmImages, picSmImageData)
}
}
+
+ if len(picSmImages) == 0 {
+ return nil, errors.New("鑾峰彇灏忓浘鏁版嵁澶辫触, id:" + source[0]["id"].(string))
+ }
+
+ // 涓婃姤鏈烘瀯鍚嶇О
+ source[0]["orgName"] = config.Options.OrgName
+
model.PushDataInfo.SourceData = source[0]
model.PushDataInfo.PicMaxImages = picMaxImages
model.PushDataInfo.PicSmImages = picSmImages
@@ -172,7 +187,7 @@
}
func DeleteData(id string) bool {
- url := "http://" + config.ServUrls.EsUrl + "/ai_ocean/_delete_by_query?refresh=true"
+ url := "http://" + config.Options.EsUrl + "/ai_ocean/_delete_by_query?refresh=true"
deleteDSL := `{
"query":{
"bool":{
@@ -199,7 +214,7 @@
}
func MarkData(id string) bool {
- url := "http://" + config.ServUrls.EsUrl + "/ai_ocean/_update_by_query?refresh=true"
+ url := "http://" + config.Options.EsUrl + "/ai_ocean/_update_by_query?refresh=true"
markDSL := `{
"script": {
"source": "ctx._source.isDelete=true"
@@ -215,7 +230,7 @@
fmt.Println(err)
return false
}
- total, err := util.SourceUpdated(buf)
+ total, err := util.SourceUpdated(buf)
if err != nil {
fmt.Println(err)
return false
--
Gitblit v1.8.0