commit

amd64/web_server/handler/h_monitor.go

@@ -7,15 +7,17 @@ import (
 	"cicv-data-closedloop/common/util"
 	"github.com/gin-gonic/gin"
 	"net/http"
+	"time"
 )
 
 type DeviceMonitor struct {
-	Id               int    `db:"id" json:"id"`                               // 自增id
-	TotalCpuUsage    string `db:"total_cpu_usage" json:"totalCpuUsage"`       // cpu总占用
-	TotalMemoryUsage string `db:"total_memory_usage" json:"totalMemoryUsage"` // 内存总占用
-	Top10Process     string `db:"top10_process" json:"top10Process"`          // cpu占用前十的进程信息
-	DeviceNumber     string `db:"device_number" json:"deviceNumber"`          // cpu占用前十的进程信息
-	SocIp            string `db:"soc_ip" json:"socIp"`                        // cpu占用前十的进程信息
+	Id               int       `db:"id" json:"id"`                               // 自增id
+	TotalCpuUsage    string    `db:"total_cpu_usage" json:"totalCpuUsage"`       // cpu总占用
+	TotalMemoryUsage string    `db:"total_memory_usage" json:"totalMemoryUsage"` // 内存总占用
+	Top10Process     string    `db:"top10_process" json:"top10Process"`          // cpu占用前十的进程信息
+	DeviceNumber     string    `db:"device_number" json:"deviceNumber"`          // 设备编号
+	SocIp            string    `db:"soc_ip" json:"socIp"`                        // 芯片IP
+	ReportTime       time.Time `db:"report_time" json:"reportTime"`              // 数据上报时间
 }
 
 // 保存实车上传的监控信息
@@ -38,6 +40,7 @@ func SaveDeviceMonitor(c *gin.Context) {
 		param.Top10Process,
 		param.DeviceNumber,
 		param.SocIp,
+		time.Now(),
 	}); err != nil {
 		c_log.GlobalLogger.Error("插入数据报错：", err)
 		c.JSON(http.StatusBadRequest, commonEntity.Response{

test/main/main.go

@@ -16,6 +16,19 @@ import (
 
 // 保存资源占用情况
 func main() {
-	fmt.Println("cpu:", util.GetCpuPercent())
-	fmt.Println("memory:", util.GetMemoryPercent())
+	responseString, err := util.HttpPostJsonWithHeaders(
+		"http://36.110.106.142:12341/web_server/monitor/insert",
+		map[string]string{"Authorization": "U9yKpD6kZZDDe4LFKK6myAxBUT1XRrDM"},
+		map[string]string{
+			"totalCpuUsage":    "util.ToString(util.GetCpuPercent())",
+			"totalMemoryUsage": " util.ToString(util.GetMemoryPercent())",
+			"top10Process":     " util.ToString(util.GetTop10())",
+			"deviceNumber":     "LocalConfig.EquipmentNo",
+			"socIp":            "LocalConfig.Node.Ip",
+		},
+	)
+	if err != nil {
+		fmt.Printf("发送数据监控信息报错%v，响应信息为：%v", err, responseString)
+	}
+	fmt.Printf("发送数据监控信息成功，响应信息为：%v", responseString)
 }