From 8c2d873b46cd91d4e7bd2fc55137b9190689e9b8 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 05 六月 2024 17:13:51 +0800
Subject: [PATCH] 调整打印信息
---
controller/systemCtl.go | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/controller/systemCtl.go b/controller/systemCtl.go
index 0dc7cd4..6985d70 100644
--- a/controller/systemCtl.go
+++ b/controller/systemCtl.go
@@ -39,10 +39,8 @@
})
controller.Auth.PlainTextSecrets = true
-
- for k, v := range svr.CollectDeviceType() {
- controller.DevCache.Store(k, v)
- }
+ controller.DevCache = new(sync.Map)
+ controller.InitDeviceCache()
return controller
}
@@ -70,8 +68,8 @@
LocalTime: time.Now().Format("20060102150405"),
}
- if user == config.ServeConf.Username {
- s.DevCache.Store(req.RegisterObject.DeviceID, "ape")
+ if user == config.ServeConf.Username || user == req.RegisterObject.DeviceID {
+ s.DevCache.Store(req.RegisterObject.DeviceID, 0)
if err := s.ApeRepo.Create(req.RegisterObject.DeviceID); err != nil {
logger.Warn("Create ape failure,%s", err.Error())
@@ -80,9 +78,8 @@
}
} else {
// 鏈紦瀛樼殑id, 鍙兘鏄柊娣诲姞鐨勪笂涓嬬骇, 鏇存柊缂撳瓨
- _, ok := s.DevCache.Load(req.RegisterObject.DeviceID)
- if ok {
- s.ApeRepo.CollectDeviceType()
+ if _, ok := s.DevCache.Load(req.RegisterObject.DeviceID); !ok {
+ s.InitDeviceCache()
}
}
@@ -161,7 +158,8 @@
return
}
- err := s.ApeRepo.Update(&req)
+ fromId := c.Param("from_id")
+ err := s.ApeRepo.Save(fromId, &req)
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"msg": err.Error()})
return
@@ -169,3 +167,16 @@
c.JSON(http.StatusOK, gin.H{"msg": "ok"})
}
+
+func (s SystemController) InitDeviceCache() {
+ // 娓呯┖
+ s.DevCache.Range(func(key, value interface{}) bool {
+ s.DevCache.Delete(key)
+ return true
+ })
+
+ for k, v := range s.ApeRepo.CollectDeviceType() {
+ s.DevCache.Store(k, v)
+ }
+
+}
--
Gitblit v1.8.0