From 9cb979b5ab6df03bc64b09fb4a722bab8557f4bc Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 05 十二月 2019 11:13:06 +0800
Subject: [PATCH] add file analysis
---
camera/camera.go | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index 81bc720..5c38d6e 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -1,6 +1,7 @@
package camera
import (
+ "strings"
"taskpubsub/sdk"
"taskpubsub/util"
@@ -43,10 +44,20 @@
createCameraRecvServerAndListen(cam.Id)
}
+ //鏂囦欢鍒濆鍖�
+ for _,f := range util.FileArr {
+ logger.Info(f)
+ }
+ for _,f :=range util.FileArr {
+ createCameraRecvServerAndListen(f.Id)
+ }
+
// 鎵嬪姩杈撳叆鐨勪富棰�
initInnerTopic()
go autoUpdateCamera(util.Cameraflag)
+
+ go autoUpdateFiles(util.Fileflag)
}
// camera 鎺ュ彈鏁版嵁
@@ -89,7 +100,9 @@
var oldcameras []string
for key := range SocketManage {
- oldcameras = append(oldcameras, key)
+ if !strings.HasPrefix(key,util.File_Video_Id_Pre) && !strings.HasPrefix(key,util.File_Audio_Id_Pre) && !strings.HasPrefix(key,util.File_Img_Id_Pre){
+ oldcameras = append(oldcameras, key)
+ }
}
var newcameras []string
@@ -115,6 +128,37 @@
}
}
+//鍔ㄦ�佸鐞嗘枃浠�
+func autoUpdateFiles(fileflag chan bool) {
+
+ for _ = range fileflag {
+ logger.Info("do auto del fileflag")
+ var oldIds []string
+
+ for key := range SocketManage {
+ if strings.HasPrefix(key,util.File_Video_Id_Pre) || strings.HasPrefix(key,util.File_Audio_Id_Pre) || strings.HasPrefix(key,util.File_Img_Id_Pre){
+ oldIds = append(oldIds, key)
+ }
+ }
+
+ var newIds []string
+ for _, f := range util.FileArr {
+ newIds = append(newIds, f.Id)
+ }
+
+ fileListUpdate := util.Difference(oldIds, newIds)
+ logger.Info(fileListUpdate)
+
+ for key, op := range fileListUpdate {
+ if op == "add" {
+ createCameraRecvServerAndListen(key)
+ } else {
+ deleteCameraRecvServer(key)
+ }
+ }
+ }
+}
+
func Recv(socket util.SocketContext) {
tryCount := 0
--
Gitblit v1.8.0