From 89ce2bc6b71ea331c219c295074a289d09c808af Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 13 七月 2023 16:06:34 +0800
Subject: [PATCH] 修改车间代码的查询方式，返回正确的车间代码
---
gui/gui.go | 45 +++++++++++++++++++--------------------------
1 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/gui/gui.go b/gui/gui.go
index 1046e8c..fcaa3b5 100644
--- a/gui/gui.go
+++ b/gui/gui.go
@@ -1,21 +1,21 @@
package gui
import (
- "fmt"
- "kingdee-dbapi/config"
- "kingdee-dbapi/models"
- "kingdee-dbapi/webserver"
"strings"
+ "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"
- "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"
)
@@ -27,6 +27,7 @@
func NewDisplay() *Display {
a := app.New()
+
// 璁剧疆鍥炬爣
a.SetIcon(static.IconPng)
@@ -76,16 +77,25 @@
config.SaveConfig()
// 杩炴帴鏁版嵁搴�
- err := models.Init(config.Options.SqlUsername, config.Options.SqlPassword, config.Options.SqlAddr, config.Options.SqlDBName)
+ 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()
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)
})
@@ -111,21 +121,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