From 9d88c7c467f8d93af4aab9ba0b6d6c01c2ffc546 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 20 八月 2020 20:35:30 +0800
Subject: [PATCH] add get buckets contrl
---
controllers/cameraTask.go | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/controllers/cameraTask.go b/controllers/cameraTask.go
index 8efe355..4389f11 100644
--- a/controllers/cameraTask.go
+++ b/controllers/cameraTask.go
@@ -3,6 +3,7 @@
import (
"basic.com/dbapi.git"
"basic.com/pubsub/esutil.git"
+ "basic.com/valib/logger.git"
"encoding/json"
"github.com/gin-gonic/gin"
"strconv"
@@ -113,12 +114,15 @@
for _,camId :=range mulCamera.CameraIds {
if b, d := api.FindByCameraId(camId); b {
bytes, _ := json.Marshal(d)
- var camTInfo []vo.CameraAndRules
- if err := json.Unmarshal(bytes, &camTInfo); err ==nil {
- camRuleArr = append(camRuleArr, camTInfo...)
+ var camTInfo vo.CameraAndRules
+ if err := json.Unmarshal(bytes, &camTInfo); err == nil {
+ camRuleArr = append(camRuleArr, camTInfo)
+ } else {
+ logger.Debug("alltask err:", err)
}
}
}
+ logger.Debug("alltask camRuleArr:", camRuleArr)
var result []SceneIfDelResult
m := make(map[string]string)
for _,cg :=range camRuleArr {
@@ -141,11 +145,13 @@
if _,ok := m[tM["taskId"].(string)];!ok {//琛ㄧず姝や换鍔″凡琚垹闄�
taskId := tM["taskId"].(string)
taskName := tM["taskName"].(string)
- result = append(result, SceneIfDelResult{
- Id: taskId,
- Name: taskName,
- IsDelete: true,
- })
+ if taskId != "" {
+ result = append(result, SceneIfDelResult{
+ Id: taskId,
+ Name: taskName,
+ IsDelete: true,
+ })
+ }
}
}
}
--
Gitblit v1.8.0