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 | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/controllers/cameraTask.go b/controllers/cameraTask.go
index 30fb496..4389f11 100644
--- a/controllers/cameraTask.go
+++ b/controllers/cameraTask.go
@@ -114,9 +114,11 @@
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)
}
}
}
@@ -143,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