From b4f52495ea8c990bba30efcb3f36a6167cc85bab Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 23 二月 2024 11:52:19 +0800
Subject: [PATCH] 添加设备所属机构的配置字段上报
---
service/server.go | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/service/server.go b/service/server.go
index 39f2f64..5f1eb69 100644
--- a/service/server.go
+++ b/service/server.go
@@ -13,7 +13,7 @@
)
func ConnectControl() bool {
- url := config.ServUrls.ServerUrl
+ url := config.Options.ServerUrl
resp, err := http.Get(url)
if err != nil {
fmt.Println("杩炴帴澶辫触", err)
@@ -26,7 +26,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 +63,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,7 +101,7 @@
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{}) {
@@ -132,6 +132,10 @@
picSmImages = append(picSmImages, picSmImageData)
}
}
+
+ // 涓婃姤鏈烘瀯鍚嶇О
+ source[0]["orgName"] = config.Options.OrgName
+
model.PushDataInfo.SourceData = source[0]
model.PushDataInfo.PicMaxImages = picMaxImages
model.PushDataInfo.PicSmImages = picSmImages
@@ -172,7 +176,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 +203,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 +219,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