From a61cd237d45c7bec7a3e0cdf32ed33c49b41b73b Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 16 十二月 2019 17:41:12 +0800
Subject: [PATCH] update
---
util/sqlite.go | 81 +++++++++++++++++++++++++---------------
1 files changed, 50 insertions(+), 31 deletions(-)
diff --git a/util/sqlite.go b/util/sqlite.go
index 35a6a9a..3ee87ca 100644
--- a/util/sqlite.go
+++ b/util/sqlite.go
@@ -1,12 +1,13 @@
package util
import (
- "fmt"
+ "flag"
- "basic.com/pubsub/protomsg.git"
"basic.com/dbapi.git"
+ "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/gopherdiscovery.git"
+ "basic.com/valib/logger.git"
"github.com/gogo/protobuf/proto"
- "github.com/long/test/gopherdiscovery"
)
/*************************
@@ -18,82 +19,100 @@
var camval dbapi.CameraApi
var taskapi dbapi.TaskApi
var sdkapi dbapi.SdkApi
+var fileApi dbapi.FileAnalysisApi
var IsInit bool
var CameraIds []protomsg.Camera
+var FileArr []protomsg.FileAnalysis
var CameraTasks []protomsg.CameraAndTaskInfo
-var TaskSdks []protomsg.TaskSdkInfo
+//var TaskSdks []protomsg.TaskSdkInfo
+var TaskSdks []protomsg.TaskSdkRun
+
var Sdklist []string
+var Sdkinfos []protomsg.Sdk
-var urlServer = "tcp://192.168.1.11:40007"
-var urlPubSub = "tcp://192.168.1.11:50007"
+var urlServer = flag.String("urlServer", "tcp://0.0.0.0:40007", "heartbeat address of url server")
+var urlPubSub = flag.String("urlPubsub", "tcp://0.0.0.0:50007", "heartbeat pubsub address of url server")
-//var urlServer = "tcp://127.0.0.1:40007"
-//var urlPubSub = "tcp://127.0.0.1:50007"
+var dbip = flag.String("dbip", "0.0.0.0", "address of database ip")
+var dbport = flag.Int("dbport", 8001, "port of database port")
var Sdkflag = make(chan bool)
var TaskSdkflag = make(chan bool)
var Cameraflag = make(chan bool)
+var Fileflag = make(chan bool)
var newsdkmsg = &protomsg.DbChangeMessage{}
-func processinit(initchan chan bool) {
+func initDbData(initchan chan bool) {
CameraIds = camval.FindAll()
- fmt.Println("==============camera camera with task ================")
- CameraTasks = camval.FindAllCameraAndTask()
- fmt.Println(CameraTasks)
+ FileArr, _ = fileApi.GetAnalysisFiles()
- TaskSdks = taskapi.FindAll()
+ logger.Info("==============camera camera with task ================")
+ CameraTasks = camval.FindAllCameraAndTask()
+
+ TaskSdks = taskapi.FindAllTaskSdkRun()
Sdklist = sdkapi.GetAllSdkIds()
+ Sdkinfos = sdkapi.FindAll("")
initchan <- true
}
-func Getdata(opt []byte) {
+func updateDbData(opt []byte) {
if err := proto.Unmarshal(opt, newsdkmsg); err != nil {
- fmt.Println("publichshMessage ", err)
+ logger.Error("publish Message ", err)
return
}
switch newsdkmsg.Table {
case protomsg.TableChanged_T_Camera:
- fmt.Println("update camera")
+ logger.Info("update camera")
CameraIds = camval.FindAll()
Cameraflag <- true
+ logger.Info("update camera finish.")
+ case protomsg.TableChanged_T_File:
+ logger.Info("update analysis files")
+ FileArr, _ = fileApi.GetAnalysisFiles()
+ Fileflag <- true
+ logger.Info("update files finish.")
case protomsg.TableChanged_T_CameraTask:
- fmt.Println("update cameratask")
+ logger.Info("update cameratask")
CameraTasks = camval.FindAllCameraAndTask()
- fmt.Println("update cameratask finished!")
+ logger.Info("update cameratask finished!")
case protomsg.TableChanged_T_TaskSdk:
- fmt.Println("update tasksdk")
- TaskSdks = taskapi.FindAll()
+ logger.Info("update tasksdk")
+ TaskSdks = taskapi.FindAllTaskSdkRun()
TaskSdkflag <- true
+ logger.Info("update tasksdk finished!")
case protomsg.TableChanged_T_Sdk:
- fmt.Println("update sdk")
+ logger.Info("update sdk")
Sdklist = sdkapi.GetAllSdkIds()
+ Sdkinfos = sdkapi.FindAll("")
Sdkflag <- true
- fmt.Println("update finished!")
+ logger.Info("update Sdkinfos finished!")
default:
- fmt.Println("unknow type operation")
+ logger.Info("other type operation")
}
- fmt.Println(newsdkmsg)
+
+ //logger.Info(newsdkmsg)
}
func Init(initchan chan bool) {
- clientOne, _ := gopherdiscovery.ClientWithSub(urlServer, urlPubSub, "ip:192.168.1.124")
- recvinit := clientOne.HeartBeatMsg()
- fmt.Println(<-recvinit)
- processinit(initchan)
+ dbapi.Init(*dbip, *dbport)
+ client, _ := gopherdiscovery.ClientWithSub(*urlServer, *urlPubSub, "ip:local")
+ recvinit := client.HeartBeatMsg()
+ _ = <-recvinit
- peers, _ := clientOne.Peers()
+ initDbData(initchan)
+
+ peers, _ := client.Peers()
for x := range peers {
- fmt.Println("client: ", x)
- Getdata(x)
+ updateDbData(x)
}
}
--
Gitblit v1.8.0