From 52fcc8c2ce0bb93a7817225ea2525426f51bcba3 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 19 十一月 2019 14:12:44 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 40 +++++++---------------------------------
1 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 4064acd..caf7e07 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -112,33 +112,6 @@
Y float64 `json:"y"`
}
-// yolo琛屼负鐨勬暟鎹粨鏋�
-//type Personaction struct {
-// Id string `json:"id"`
-// CameraId string `json:"cameraId"`
-// CameraName string `json:"cameraName"`
-// CameraAddr string `json:"cameraAddr"`
-// TaskId string `json:"taskId"`
-// TaskName string `json:"taskName"`
-// SdkName string `json:"sdkName"`
-// Content string `json:"content"`
-// AlarmRules []AlarmRule `json:"alarmRules"`
-// AnalyServerId string `json:"analyServerId"`
-// AnalyServerName string `json:"analyServerName"`
-// AnalyServerIp string `json:"analyServerIp"`
-// ClusterId string `json:"clusterId"`
-// PicSmUrl []string `json:"picSmUrl"`
-// PicDate string `json:"picDate"`
-// VideoUrl string `json:"videoUrl"`
-// IsAlarm int `json:"isAlarm"`
-// IsAckAlarm int `json:"isAckAlarm"`
-// IsCollect int `json:"isCollect"`
-// IsDelete int `json:"isDelete"`
-// TargetInfo []Target `json:"targetInfo"`
-// LinkTag string `json:"linkTag"`
-// LinkTagInfo []*LinkInfo `json:"linkTagInfo"`
-//}
-
type AlarmRule struct {
GroupId string `json:"groupId"`
AlarmLevel string `json:"alarmLevel"`
@@ -154,11 +127,11 @@
}
func InsertToEs(msg structure.ResultMsg) {
- //defer func() {
- // if err := recover(); err != nil {
- // logger.Error("es妯″潡鍎跨殑寮傚父鎹曡幏锛�", err)
- // }
- //}()
+ defer func() {
+ if err := recover(); err != nil {
+ logger.Error("es妯″潡鍎跨殑寮傚父鎹曡幏锛�", err)
+ }
+ }()
localConfig1, err := cache.GetServerInfo()
if err != nil {
panic("閰嶇疆鏂囦欢涓嶅悎娉�")
@@ -776,8 +749,9 @@
case "plate":
// 杞︾墝杩愬姩鏂瑰悜锛�0 unknown, 1 left, 2 right, 3 up, 4 down
+ logger.Info("杞﹁締杞︾墝淇℃伅锛�",obj.Car.NColor,obj.Car.NCarColor,obj.Car.NCarLogo,obj.Car.NCarType,obj.Car.NDirection)
lable = obj.Car.License + "/" + cache.GetDic("nColor"+strconv.Itoa(int(obj.Car.NColor))) + "杞︾墝" + "/" +
- cache.GetDic("nCarColor"+strconv.Itoa(int(obj.Car.NCarColor))) + "杞﹁締" + "/" + cache.GetDic("nCarLogo"+strconv.Itoa(int(obj.Car.NCarLogo))) + "/" + cache.GetDic("nCarLogo"+strconv.Itoa(int(obj.Car.NCarType)))
+ cache.GetDic("nCarColor"+strconv.Itoa(int(obj.Car.NCarColor))) + "杞﹁締" + "/" + cache.GetDic("nCarLogo"+strconv.Itoa(int(obj.Car.NCarLogo))) + "/" + cache.GetDic("nCarType"+strconv.Itoa(int(obj.Car.NCarType)))
lableAttach = cache.GetDic("nDirection"+strconv.Itoa(int(obj.Car.NDirection))) + "/" + "杞︾墝缃俊搴︼細" + strconv.Itoa(int(obj.Car.NConfidence)) + "/" +
"杞︾墝浜害锛�" + strconv.Itoa(int(obj.Car.NBright)) + "/" + "杞︾殑浜害锛�" + strconv.Itoa(int(obj.Car.NCarBright)) + "/" + "璇嗗埆鏃堕棿锛�" + strconv.Itoa(int(obj.Car.NTime))
}
--
Gitblit v1.8.0