From b4f52495ea8c990bba30efcb3f36a6167cc85bab Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 23 二月 2024 11:52:19 +0800
Subject: [PATCH] 添加设备所属机构的配置字段上报
---
main.go | 33 ++++++++++-----------------------
1 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/main.go b/main.go
index d173e44..62e1db2 100644
--- a/main.go
+++ b/main.go
@@ -3,41 +3,28 @@
import (
"data_msg_push_server/config"
"data_msg_push_server/service"
- "flag"
+
"fmt"
"time"
)
-var env = flag.String("config", "config", "read storage info")
-
func init() {
- config.Init(*env)
+ config.Init()
}
func main() {
- fmt.Println("hello!!!")
done := make(chan bool)
go runEvery(done)
- //result,err := service.GetData()
- //if err != nil {
- // fmt.Println(err)
- //}
- //if result != nil{
- //
- //}
<-done
fmt.Println("绋嬪簭宸查��鍑�")
- //fmt.Println(res)
- //fmt.Println(err)
-
}
-func runEvery(done chan<- bool){
+func runEvery(done chan<- bool) {
ticker := time.NewTicker(10 * time.Second)
defer ticker.Stop()
- for{
+ for {
select {
case <-ticker.C:
fmt.Println("寮�濮嬫墽琛屽嚱鏁般�傘�傘��")
@@ -48,10 +35,10 @@
}
}
-func doServer() {
+func doServer() {
total := 0
for {
- t,err := service.GetTotal()
+ t, err := service.GetTotal()
if err != nil {
fmt.Println(err)
}
@@ -62,16 +49,16 @@
} else {
for {
connectStatus := service.ConnectControl()
- fmt.Println("connectStatus: ",connectStatus)
+ fmt.Println("connectStatus: ", connectStatus)
if connectStatus == true {
- url := config.ServUrls.ServerUrl
+ url := config.Options.ServerUrl
result, err1 := service.GetData()
if err1 != nil {
fmt.Println(err1)
}
id, errs2 := service.SendData(result, url)
- fmt.Println("data id is: ",id)
- if errs2 == nil{
+ fmt.Println("data id is: ", id)
+ if errs2 == nil {
//delStatus := service.DeleteData(id)
markStatus := service.MarkData(id)
fmt.Println(markStatus)
--
Gitblit v1.8.0