|
@@ -61,19 +61,33 @@ func ModuleInit() bool {
|
|
|
dataBackfillTasks: make(map[string]*singletask.OnceTask),
|
|
dataBackfillTasks: make(map[string]*singletask.OnceTask),
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- for _, server := range config.GetMQTTServers() {
|
|
|
|
|
|
|
+ Reporter = reporter
|
|
|
|
|
+
|
|
|
|
|
+ // 1, 客户端连接服务器 /////////////////////////////////////////////
|
|
|
|
|
+ reporter.initMQTTClients()
|
|
|
|
|
+
|
|
|
|
|
+ // 2, 启动数据上报任务 /////////////////////////////////////////////
|
|
|
|
|
+ reporter.StartDataWorker()
|
|
|
|
|
+
|
|
|
|
|
+ // 3, 启动照片上报任务 /////////////////////////////////////////////
|
|
|
|
|
+ reporter.StartImagWorker()
|
|
|
|
|
+
|
|
|
|
|
+ return true
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+func (r *MQTTReporter) initMQTTClients() {
|
|
|
|
|
+ for _, server := range r.config.GetMQTTServers() {
|
|
|
switch server.Protocol {
|
|
switch server.Protocol {
|
|
|
case "yfkj-private":
|
|
case "yfkj-private":
|
|
|
- if err := reporter.initYFKJClient(server, devID); err != nil {
|
|
|
|
|
|
|
+ if err := r.initYFKJClient(server, r.deviceID); err != nil {
|
|
|
baseapp.Logger.Errorf("[%s] %s 服务器初始化失败: %v!!",
|
|
baseapp.Logger.Errorf("[%s] %s 服务器初始化失败: %v!!",
|
|
|
MODULE_NAME, server.Name, err)
|
|
MODULE_NAME, server.Name, err)
|
|
|
continue
|
|
continue
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
if server.DataBackfill { /////////////// 执行数据补录, 单实例运行
|
|
if server.DataBackfill { /////////////// 执行数据补录, 单实例运行
|
|
|
- reporter.dataBackfillTasks[server.Name] = &singletask.OnceTask{}
|
|
|
|
|
- reporter.dataBackfillTasks[server.Name].Run(func() {
|
|
|
|
|
- reporter.startYFKJDataBackfill(server)
|
|
|
|
|
|
|
+ r.dataBackfillTasks[server.Name] = &singletask.OnceTask{}
|
|
|
|
|
+ r.dataBackfillTasks[server.Name].Run(func() {
|
|
|
|
|
+ r.startYFKJDataBackfill(server)
|
|
|
}, true)
|
|
}, true)
|
|
|
}
|
|
}
|
|
|
default:
|
|
default:
|
|
@@ -81,9 +95,6 @@ func ModuleInit() bool {
|
|
|
MODULE_NAME, server.Name, server.Protocol)
|
|
MODULE_NAME, server.Name, server.Protocol)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- Reporter = reporter
|
|
|
|
|
- return true
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func (r *MQTTReporter) initYFKJClient(server MQTTServer, devID string) error {
|
|
func (r *MQTTReporter) initYFKJClient(server MQTTServer, devID string) error {
|