From 5af16af2b245d91987e6d86c917659aa93254961 Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Tue, 2 Jul 2024 15:18:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddevice=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handler/device.go | 48 +++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/handler/device.go b/handler/device.go
index b77d584..ff84b36 100644
--- a/handler/device.go
+++ b/handler/device.go
@@ -9,39 +9,39 @@ import (
 )
 
 type DeviceAddReq struct {
-	DeviceName     string `json:"device_name" form:"device_name" binding:"required"`
-	DeviceIP       string `json:"device_ip" form:"device_ip" binding:"required"`
-	DeviceStatus   string `json:"device_status" form:"device_status" binding:"required"`
-	AuthID         int    `json:"auth_id" form:"auth_id" binding:"required"`
-	DeviceInfo     string `json:"device_info" form:"device_info" binding:"required"`
-	DeviceType     string `json:"device_type" form:"device_type" binding:"required"`
-	DeviceLocation string `json:"device_location" form:"device_location" binding:"required"`
+	DeviceName     string `json:"device_name" form:"device_name"`
+	DeviceIP       string `json:"device_ip" form:"device_ip"`
+	DeviceStatus   string `json:"device_status" form:"device_status"`
+	AuthID         int    `json:"auth_id" form:"auth_id"`
+	DeviceInfo     string `json:"device_info" form:"device_info"`
+	DeviceType     string `json:"device_type" form:"device_type"`
+	DeviceLocation string `json:"device_location" form:"device_location"`
 }
 
 type DeviceUpdateReq struct {
 	ID             int    `json:"id" form:"id"`
-	DeviceName     string `json:"device_name" form:"device_name" binding:"required"`
-	DeviceIP       string `json:"device_ip" form:"device_ip" binding:"required"`
-	DeviceStatus   string `json:"device_status" form:"device_status" binding:"required"`
-	AuthID         int    `json:"auth_id" form:"auth_id" binding:"required"`
-	DeviceInfo     string `json:"device_info" form:"device_info" binding:"required"`
-	DeviceType     string `json:"device_type" form:"device_type" binding:"required"`
-	DeviceLocation string `json:"device_location" form:"device_location" binding:"required"`
+	DeviceName     string `json:"device_name" form:"device_name" `
+	DeviceIP       string `json:"device_ip" form:"device_ip" `
+	DeviceStatus   string `json:"device_status" form:"device_status" `
+	AuthID         int    `json:"auth_id" form:"auth_id" `
+	DeviceInfo     string `json:"device_info" form:"device_info" `
+	DeviceType     string `json:"device_type" form:"device_type" `
+	DeviceLocation string `json:"device_location" form:"device_location" `
 }
 
 type DeviceStatus struct {
-	IP     string `json:"ip" form:"ip" binding:"required"`
-	Status string `json:"status" form:"status" binding:"required"`
-	ID     int    `json:"id" form:"id" binding:"required"`
+	IP     string `json:"ip" form:"ip" `
+	Status string `json:"status" form:"status" `
+	ID     int    `json:"id" form:"id" `
 }
 
 type DeviceDelReq struct {
-	ID int `json:"id" form:"id" binding:"required"`
+	ID int `json:"id" form:"id" `
 }
 
 type DeviceRestartReq struct {
-	ID     int    `json:"id" form:"id" binding:"required"`
-	Option string `json:"option" form:"option" binding:"required"`
+	ID     int    `json:"id" form:"id" `
+	Option string `json:"option" form:"option" `
 }
 
 func SetUpDeviceGroup(router *gin.Engine) {
@@ -59,7 +59,7 @@ func DeleteDevice(c *gin.Context) {
 	id, _ := c.Get("id")
 	//获取post参数
 	var req DeviceDelReq
-	if err := c.ShouldBindJSON(&req); err == nil {
+	if err := c.ShouldBind(&req); err == nil {
 		if service.DeleteDevice(req.ID, int(id.(float64))) {
 			c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success"})
 		} else {
@@ -73,7 +73,7 @@ func DeleteDevice(c *gin.Context) {
 func UpdateDevice(c *gin.Context) {
 	var req DeviceUpdateReq
 	user_id, _ := c.Get("id")
-	if err := c.ShouldBindJSON(&req); err == nil {
+	if err := c.ShouldBind(&req); err == nil {
 		res := service.UpdateDevice(req.DeviceName, req.DeviceIP, req.DeviceStatus, req.DeviceInfo, req.DeviceType, req.DeviceLocation, req.ID, int(user_id.(float64)))
 		if res {
 			c.JSON(200, gin.H{
@@ -96,7 +96,7 @@ func UpdateDevice(c *gin.Context) {
 func SetDeviceStatus(c *gin.Context) {
 	var req DeviceStatus
 	id, _ := c.Get("id")
-	if err := c.ShouldBindJSON(&req); err == nil {
+	if err := c.ShouldBind(&req); err == nil {
 		if req.IP != "" {
 			if service.SetDeviceStatus(req.Status, req.ID, int(id.(float64))) {
 				c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success"})
@@ -112,7 +112,7 @@ func SetDeviceStatus(c *gin.Context) {
 func AddDevice(c *gin.Context) {
 	var req DeviceAddReq
 	id, _ := c.Get("id")
-	if err := c.ShouldBindJSON(&req); err == nil {
+	if err := c.ShouldBind(&req); err == nil {
 		user_id := int(id.(float64))
 		fmt.Println(req)
 		device_id := service.AddDevice(req.DeviceName, req.DeviceIP, req.DeviceStatus, req.DeviceInfo, req.DeviceType, req.DeviceLocation, user_id)