From 59e6096769bc175516c1bcbbc12e4711d1ff294c Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 15 八月 2023 18:08:17 +0800
Subject: [PATCH] 调整代码结构

---
 main.go |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/main.go b/main.go
index 8e31c56..ce907ad 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,8 @@
 package main
 
 import (
+	"kingdee-dbapi/report"
+	"kingdee-dbapi/webserver"
 	"os"
 	"strings"
 
@@ -36,10 +38,29 @@
 	defer kingdee.CloseDB()
 
 	// 鍒涘缓绐楀彛骞惰繍琛�
-	window := gui.NewDisplay()
+	var dbConnectedChan chan bool
+	window := gui.NewDisplay(dbConnectedChan)
+
+	// 鏁版嵁搴撹繛鎺ユ垚鍔熷悗鍚姩鍏朵粬鏈嶅姟
+	go onSqlServerConnected(dbConnectedChan)
+
 	window.ShowMainWindow()
 }
 
+func onSqlServerConnected(dbConnectedChan chan bool) {
+	<-dbConnectedChan
+
+	logger.Debug("鏁版嵁搴撳凡杩炴帴, 鍚姩鎺ュ彛鏈嶅姟")
+	report.Start()
+
+	// 寮�鍚闃匰QL鏌ヨ
+	go nsqclient.InitNsqConsumer(config.Options.SqlQueryTopic, "sensor01", kingdee.SqlQueryHandle)
+	go nsqclient.InitNsqConsumer(config.Options.CSTQueryTopic, "sensor01", kingdee.CSTQueryHandle)
+	go nsqclient.InitNsqConsumer(config.Options.BomQueryTopic, "sensor01", report.HandleBomQuery)
+
+	go webserver.Serve(config.Options.WebPort)
+}
+
 func setFont() {
 	fontPaths := findfont.List()
 

--
Gitblit v1.8.0