From 3c00b78116b561186876eac1f8589366a347a981 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 01 九月 2023 19:16:11 +0800
Subject: [PATCH] 添加物料属性

---
 gui/gui.go |   18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/gui/gui.go b/gui/gui.go
index fcaa3b5..50080f0 100644
--- a/gui/gui.go
+++ b/gui/gui.go
@@ -6,10 +6,7 @@
 	"kingdee-dbapi/config"
 	"kingdee-dbapi/kingdee"
 	"kingdee-dbapi/logger"
-	"kingdee-dbapi/nsqclient"
-	"kingdee-dbapi/report"
 	"kingdee-dbapi/static"
-	"kingdee-dbapi/webserver"
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/app"
@@ -25,7 +22,7 @@
 	FullScreen bool
 }
 
-func NewDisplay() *Display {
+func NewDisplay(dbConnectedChan chan bool) *Display {
 	a := app.New()
 
 	// 璁剧疆鍥炬爣
@@ -66,6 +63,7 @@
 		//	//myWindow.Close()
 		//},
 	}
+
 	var submitBtn *widget.Button
 	submitBtn = widget.NewButtonWithIcon("鍚姩", theme.MailSendIcon(), func() {
 		config.Options.WebPort = strings.Trim(serverPort.Text, " ")
@@ -81,23 +79,13 @@
 		if err != nil {
 			logger.Error("db init error:%s", err.Error())
 			dialog.ShowError(err, w)
-
-			if !config.Options.Debug {
-				return
-			}
 		}
 
 		form.Disable()
 		submitBtn.Text = "宸插惎鍔�"
 		submitBtn.Disable()
 
-		report.StartReport()
-
-		// 寮�鍚闃匰QL鏌ヨ
-		go nsqclient.InitNsqConsumer(config.Options.SqlQueryTopic, "sensor01", kingdee.SqlQueryHandle)
-		go nsqclient.InitNsqConsumer(config.Options.CSTQueryTopic, "sensor01", kingdee.CSTQueryHandle)
-
-		go webserver.Serve(serverPort.Text)
+		dbConnectedChan <- true
 	})
 
 	content := container.New(layout.NewGridWrapLayout(fyne.NewSize(300, 200)), form)

--
Gitblit v1.8.0