From d4f2636c1773edd8f16ca34598e2e1f9d603ee5f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 19 十一月 2019 10:56:50 +0800
Subject: [PATCH] ---
---
algorithm/middleware/middleware.go | 2 +-
insertdata/insertDataToEs.go | 37 +++++--------------------------------
2 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/algorithm/middleware/middleware.go b/algorithm/middleware/middleware.go
index 60ea600..249a97d 100644
--- a/algorithm/middleware/middleware.go
+++ b/algorithm/middleware/middleware.go
@@ -333,7 +333,7 @@
} else if sdkId == "812b674b-2375-4589-919a-5c1c3278a977" {
soName = "static.so"
} else if sdkId == "812b674b-2375-4589-919a-5c1c3278a978" {
- soName = "car.so"
+ soName = "plate.so"
}
//soInfo,errr := cache.GetSoInfoById(sdkId)
//if errr != nil {
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 4064acd..c3923fd 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("閰嶇疆鏂囦欢涓嶅悎娉�")
--
Gitblit v1.8.0