From 73d7bb4e27940d76aae16ad47fc8ad2104623e1a Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 27 七月 2020 16:33:11 +0800
Subject: [PATCH] use hik data
---
controllers/sys.go | 1 +
controllers/car.go | 20 +++++++++++++-------
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/controllers/car.go b/controllers/car.go
index 5d197bc..a92440e 100644
--- a/controllers/car.go
+++ b/controllers/car.go
@@ -20,15 +20,20 @@
func ComputeSpaceLeftRealTime() {
ticker := time.NewTicker(3 * time.Second)
prePushLeft := 0
+ sv := service.NewCarService()
for {
select {
case <-ticker.C:
- m := time.Now().Minute()
- i := m % 20
- left := 80
- if i == 0 { //鏁存暟鍒嗛挓
- left = m / 10
- }
+ hikSta := sv.Statistic()
+ left := hikSta.Left
+ fmt.Println("realTime left:", left)
+
+ //m := time.Now().Minute()
+ //i := m % 20
+ //left := 80
+ //if i == 0 { //鏁存暟鍒嗛挓
+ // left = m / 10
+ //}
if left <=10 && left != prePushLeft {
go func() {
message := fmt.Sprintf("%s 鍓╀綑杞︿綅锛�%d涓�", time.Now().Format("2006-01-02 15:04:05"), left)
@@ -66,7 +71,8 @@
// @router /statistic [get]
func (c *CarController) Statistic() {
//sv := service.NewCarService()
- //sta := sv.Statistic()
+ //hikStc := sv.Statistic()
+ //left := hikStc.Left
left := getSpaceLeft()
sta := models.CarStatistic{
Left: left,
diff --git a/controllers/sys.go b/controllers/sys.go
index c4844f0..92e6729 100644
--- a/controllers/sys.go
+++ b/controllers/sys.go
@@ -46,6 +46,7 @@
} else {
result.IsUpgrade = false
+ result.Msg = []string{}
}
}
--
Gitblit v1.8.0