From 8a5f5dc40e82bf98e307082726ebe860002e019f Mon Sep 17 00:00:00 2001
From: gigibox <gigibox@163.com>
Date: 星期三, 21 六月 2023 15:45:31 +0800
Subject: [PATCH] 修改库存数据为增量上报

---
 gui/gui.go |   33 +++++++++++----------------------
 1 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/gui/gui.go b/gui/gui.go
index abbe701..e6d97e6 100644
--- a/gui/gui.go
+++ b/gui/gui.go
@@ -1,7 +1,8 @@
 package gui
 
 import (
-	"fmt"
+	"kingdee-dbapi/logger"
+	"kingdee-dbapi/nsqclient"
 	"strings"
 
 	"kingdee-dbapi/config"
@@ -12,11 +13,9 @@
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/app"
-	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/dialog"
 	"fyne.io/fyne/v2/layout"
-	"fyne.io/fyne/v2/storage"
 	"fyne.io/fyne/v2/theme"
 	"fyne.io/fyne/v2/widget"
 )
@@ -28,6 +27,7 @@
 
 func NewDisplay() *Display {
 	a := app.New()
+
 	// 璁剧疆鍥炬爣
 	a.SetIcon(static.IconPng)
 
@@ -79,9 +79,12 @@
 		// 杩炴帴鏁版嵁搴�
 		err := kingdee.Init(config.Options.SqlUsername, config.Options.SqlPassword, config.Options.SqlAddr, config.Options.SqlDBName)
 		if err != nil {
-			fmt.Println("db init error:", err.Error())
+			logger.Error("db init error:%s", err.Error())
 			dialog.ShowError(err, w)
-			return
+
+			if !config.Options.Debug {
+				return
+			}
 		}
 
 		form.Disable()
@@ -89,6 +92,9 @@
 		submitBtn.Disable()
 
 		report.StartReport()
+
+		// 寮�鍚闃�
+		go nsqclient.InitNsqConsumer(config.Options.QueryTopic, "sensor01", kingdee.QueryMsgHandle)
 
 		go webserver.Serve(serverPort.Text)
 	})
@@ -114,21 +120,4 @@
 	})
 
 	d.Window.ShowAndRun()
-}
-
-func (d *Display) DrawImage(imgUri string) {
-	uri, err := storage.ParseURI(imgUri)
-	if err != nil {
-		fmt.Println("parse uri error:", err)
-	}
-
-	image := canvas.NewImageFromURI(uri)
-	//image := canvas.NewImageFromImage(src)
-	// image := canvas.NewImageFromReader(reader, name)
-	//image := canvas.NewImageFromFile("./a.png")
-	//image.FillMode = canvas.ImageFillContain
-	//image.FillMode = canvas.ImageFillOriginal
-	image.FillMode = canvas.ImageFillStretch
-
-	d.Window.SetContent(image)
 }

--
Gitblit v1.8.0