From 6d0a2b62a05d146440b425598201d52a56b8c911 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 02 七月 2019 13:16:57 +0800
Subject: [PATCH] use camera and localconfig cache
---
insertdata/insertDataToEs.go | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index b4c5553..2f0b44f 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -6,6 +6,7 @@
"fmt"
"log"
"net"
+ "ruleprocess/cache"
"strings"
"time"
@@ -74,7 +75,7 @@
TaskName string `json:"taskName"`
SdkName string `json:"sdkName"`
Content string `json:"content"`
- AlarmRules []AlarmRule `json: "alramRules"`
+ AlarmRules []AlarmRule `json:"alarmRules"`
AnalyServerId string `json:"analyServerId"`
AnalyServerName string `json:"analyServerName"`
AnalyServerIp string `json:"analyServerIp"`
@@ -197,21 +198,26 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ //resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ resp, err =util.DrawPolygonOnImage(i)
+ if err != nil {
+ log.Println("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊",err)
+ }else{
+ log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ }
} else {
isAlarm = "0"
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
return
}
- log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
+ // log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
// 鏌ヨ鏈満淇℃伅
- flag, localConfig := dbapi.SysSetApi{}.GetServerInfo()
- if !flag {
+ localConfig, err := cache.GetServerInfo()
+ if err !=nil {
log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
// 鏌ヨcameraName
- camera, err := dbapi.CameraApi{}.GetCameraById(msg.Cid)
+ camera, err := cache.GetCameraById(msg.Cid)
if err != nil {
log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
@@ -247,7 +253,9 @@
}
err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
if err != nil {
- log.Println("es can not execute right.")
+ log.Println("寰�ES鎻掑叆鏁版嵁澶辫触",err)
+ } else {
+ log.Println("__________________________________________寰�ES鎻掑叆鏁版嵁鎴愬姛")
}
}
}
--
Gitblit v1.8.0