From 6ea3cdb3641552aa4baf10749f5d6acbcaf44280 Mon Sep 17 00:00:00 2001 From: LinkLeong Date: Thu, 13 Oct 2022 04:45:17 +0100 Subject: [PATCH] Utilization interface to supplement disk information --- route/v1/system.go | 6 ++++-- service/notify.go | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/route/v1/system.go b/route/v1/system.go index 29fbcf2..95674e7 100644 --- a/route/v1/system.go +++ b/route/v1/system.go @@ -270,7 +270,7 @@ func GetSystemHardwareInfo(c *gin.Context) { // @Success 200 {string} string "ok" // @Router /sys/utilization [get] func GetSystemUtilization(c *gin.Context) { - var data = make(map[string]interface{}, 6) + var data = make(map[string]interface{}) cpu := service.MyService.System().GetCpuPercent() num := service.MyService.System().GetCpuCoreNum() cpuData := make(map[string]interface{}) @@ -299,7 +299,9 @@ func GetSystemUtilization(c *gin.Context) { } data["net"] = newNet - + for k, v := range service.MyService.Notify().GetSystemTempMap() { + data[k] = v + } c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: data}) } diff --git a/service/notify.go b/service/notify.go index 05d3162..5e31ebe 100644 --- a/service/notify.go +++ b/service/notify.go @@ -37,6 +37,7 @@ type NotifyServer interface { SendStorageBySocket(message notify.StorageMessage) SendNotify(path string, message map[string]interface{}) SettingSystemTempData(message map[string]interface{}) + GetSystemTempMap() map[string]interface{} } type notifyServer struct { @@ -442,7 +443,11 @@ func SendMeg() { // } // } +func (i *notifyServer) GetSystemTempMap() map[string]interface{} { + return i.SystemTempMap + +} func NewNotifyService(db *gorm.DB) NotifyServer { return ¬ifyServer{db: db, SystemTempMap: make(map[string]interface{})} }