From 70e3e0ebba3068a2c98f0d13c806c228115374f6 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 24 六月 2019 15:52:32 +0800
Subject: [PATCH] 添加了上传图片的工具包
---
insertdata/insertDataToEs.go | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 310f7b4..db93ac7 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -4,16 +4,18 @@
"errors"
"fmt"
"encoding/json"
+ "log"
"net"
"time"
"basic.com/pubsub/protomsg.git"
"basic.com/dbapi.git"
- "github.com/golang/protobuf/proto"
"ruleprocess/ruleserver"
+ "ruleprocess/util"
+ "github.com/golang/protobuf/proto"
"github.com/satori/go.uuid"
)
-
+var weedfsUrl = "http://192.168.1.182:6333/submit"
// 浜鸿劯鐨勬暟鎹粨鏋�
type PerVideoPicture struct {
Id string `json:"id"`
@@ -86,10 +88,10 @@
type AlarmRule struct {
GroupId string `json:"groupId"`
- AlarmLevel int32 `json:"alarmLevel"`
+ AlarmLevel int32 `json:"alarmLevel"`
RuleText string `json:"ruleText"`
}
-
+// 寰�ES鎻掓暟鎹�
func InsertToEs(msg ruleserver.ResultMsg) {
fmt.Println("寰�ES鎻掓暟鎹�")
@@ -176,12 +178,22 @@
alarmRules = append(alarmRules,AlarmRule{result.RuleGroupId,result.AlarmLevel,result.RuleText})
}
isAlarm := ""
+ resp := make(map[string]interface{})
if len(alarmRules) > 0 {
isAlarm = "1"
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ resp,err = util.PostFormBufferData(weedfsUrl,i.Data,uuid.NewV4().String())
}else {
isAlarm = "0"
- continue
+ //continue
}
+ log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細",resp)
// 鏌ヨ鏈満淇℃伅
flag,localConfig := dbapi.SysSetApi{}.GetServerInfo()
if !flag {
@@ -207,7 +219,7 @@
localConfig.ServerName,
serverIp,
"",
- "",
+ resp["fileUrl"].(string),
time.Now().Format("2006-01-02 15:04:05"),
"",
isAlarm,
--
Gitblit v1.8.0