From aafaf19184a4d3ef5bb88a8613d9bc9d7c1f27e5 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 13:52:36 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 2210007..6c6eb46 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -6,10 +6,10 @@
"fmt"
"log"
"net"
+ "ruleprocess/cache"
"strings"
"time"
- "basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
"github.com/golang/protobuf/proto"
"github.com/satori/go.uuid"
@@ -74,7 +74,7 @@
TaskName string `json:"taskName"`
SdkName string `json:"sdkName"`
Content string `json:"content"`
- AlarmRules []AlarmRule `json: "alarmRules"`
+ AlarmRules []AlarmRule `json:"alarmRules"`
AnalyServerId string `json:"analyServerId"`
AnalyServerName string `json:"analyServerName"`
AnalyServerIp string `json:"analyServerIp"`
@@ -114,8 +114,8 @@
fmt.Println(bigPhotoUrl)
if len(face.Liker) == 0 {
// 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
- flag, localConfig := dbapi.SysSetApi{}.GetServerInfo()
- if !flag {
+ localConfig, err := cache.GetServerInfo()
+ if err != nil {
log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
serverIp, err := GetLocalIP()
@@ -197,8 +197,13 @@
}
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"
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
@@ -206,12 +211,12 @@
}
// 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("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
--
Gitblit v1.8.0