修复device设备添加问题
This commit is contained in:
parent
9837847d55
commit
5af16af2b2
|
|
@ -9,39 +9,39 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
type DeviceAddReq struct {
|
type DeviceAddReq struct {
|
||||||
DeviceName string `json:"device_name" form:"device_name" binding:"required"`
|
DeviceName string `json:"device_name" form:"device_name"`
|
||||||
DeviceIP string `json:"device_ip" form:"device_ip" binding:"required"`
|
DeviceIP string `json:"device_ip" form:"device_ip"`
|
||||||
DeviceStatus string `json:"device_status" form:"device_status" binding:"required"`
|
DeviceStatus string `json:"device_status" form:"device_status"`
|
||||||
AuthID int `json:"auth_id" form:"auth_id" binding:"required"`
|
AuthID int `json:"auth_id" form:"auth_id"`
|
||||||
DeviceInfo string `json:"device_info" form:"device_info" binding:"required"`
|
DeviceInfo string `json:"device_info" form:"device_info"`
|
||||||
DeviceType string `json:"device_type" form:"device_type" binding:"required"`
|
DeviceType string `json:"device_type" form:"device_type"`
|
||||||
DeviceLocation string `json:"device_location" form:"device_location" binding:"required"`
|
DeviceLocation string `json:"device_location" form:"device_location"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type DeviceUpdateReq struct {
|
type DeviceUpdateReq struct {
|
||||||
ID int `json:"id" form:"id"`
|
ID int `json:"id" form:"id"`
|
||||||
DeviceName string `json:"device_name" form:"device_name" binding:"required"`
|
DeviceName string `json:"device_name" form:"device_name" `
|
||||||
DeviceIP string `json:"device_ip" form:"device_ip" binding:"required"`
|
DeviceIP string `json:"device_ip" form:"device_ip" `
|
||||||
DeviceStatus string `json:"device_status" form:"device_status" binding:"required"`
|
DeviceStatus string `json:"device_status" form:"device_status" `
|
||||||
AuthID int `json:"auth_id" form:"auth_id" binding:"required"`
|
AuthID int `json:"auth_id" form:"auth_id" `
|
||||||
DeviceInfo string `json:"device_info" form:"device_info" binding:"required"`
|
DeviceInfo string `json:"device_info" form:"device_info" `
|
||||||
DeviceType string `json:"device_type" form:"device_type" binding:"required"`
|
DeviceType string `json:"device_type" form:"device_type" `
|
||||||
DeviceLocation string `json:"device_location" form:"device_location" binding:"required"`
|
DeviceLocation string `json:"device_location" form:"device_location" `
|
||||||
}
|
}
|
||||||
|
|
||||||
type DeviceStatus struct {
|
type DeviceStatus struct {
|
||||||
IP string `json:"ip" form:"ip" binding:"required"`
|
IP string `json:"ip" form:"ip" `
|
||||||
Status string `json:"status" form:"status" binding:"required"`
|
Status string `json:"status" form:"status" `
|
||||||
ID int `json:"id" form:"id" binding:"required"`
|
ID int `json:"id" form:"id" `
|
||||||
}
|
}
|
||||||
|
|
||||||
type DeviceDelReq struct {
|
type DeviceDelReq struct {
|
||||||
ID int `json:"id" form:"id" binding:"required"`
|
ID int `json:"id" form:"id" `
|
||||||
}
|
}
|
||||||
|
|
||||||
type DeviceRestartReq struct {
|
type DeviceRestartReq struct {
|
||||||
ID int `json:"id" form:"id" binding:"required"`
|
ID int `json:"id" form:"id" `
|
||||||
Option string `json:"option" form:"option" binding:"required"`
|
Option string `json:"option" form:"option" `
|
||||||
}
|
}
|
||||||
|
|
||||||
func SetUpDeviceGroup(router *gin.Engine) {
|
func SetUpDeviceGroup(router *gin.Engine) {
|
||||||
|
|
@ -59,7 +59,7 @@ func DeleteDevice(c *gin.Context) {
|
||||||
id, _ := c.Get("id")
|
id, _ := c.Get("id")
|
||||||
//获取post参数
|
//获取post参数
|
||||||
var req DeviceDelReq
|
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))) {
|
if service.DeleteDevice(req.ID, int(id.(float64))) {
|
||||||
c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success"})
|
c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success"})
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -73,7 +73,7 @@ func DeleteDevice(c *gin.Context) {
|
||||||
func UpdateDevice(c *gin.Context) {
|
func UpdateDevice(c *gin.Context) {
|
||||||
var req DeviceUpdateReq
|
var req DeviceUpdateReq
|
||||||
user_id, _ := c.Get("id")
|
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)))
|
res := service.UpdateDevice(req.DeviceName, req.DeviceIP, req.DeviceStatus, req.DeviceInfo, req.DeviceType, req.DeviceLocation, req.ID, int(user_id.(float64)))
|
||||||
if res {
|
if res {
|
||||||
c.JSON(200, gin.H{
|
c.JSON(200, gin.H{
|
||||||
|
|
@ -96,7 +96,7 @@ func UpdateDevice(c *gin.Context) {
|
||||||
func SetDeviceStatus(c *gin.Context) {
|
func SetDeviceStatus(c *gin.Context) {
|
||||||
var req DeviceStatus
|
var req DeviceStatus
|
||||||
id, _ := c.Get("id")
|
id, _ := c.Get("id")
|
||||||
if err := c.ShouldBindJSON(&req); err == nil {
|
if err := c.ShouldBind(&req); err == nil {
|
||||||
if req.IP != "" {
|
if req.IP != "" {
|
||||||
if service.SetDeviceStatus(req.Status, req.ID, int(id.(float64))) {
|
if service.SetDeviceStatus(req.Status, req.ID, int(id.(float64))) {
|
||||||
c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success"})
|
c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success"})
|
||||||
|
|
@ -112,7 +112,7 @@ func SetDeviceStatus(c *gin.Context) {
|
||||||
func AddDevice(c *gin.Context) {
|
func AddDevice(c *gin.Context) {
|
||||||
var req DeviceAddReq
|
var req DeviceAddReq
|
||||||
id, _ := c.Get("id")
|
id, _ := c.Get("id")
|
||||||
if err := c.ShouldBindJSON(&req); err == nil {
|
if err := c.ShouldBind(&req); err == nil {
|
||||||
user_id := int(id.(float64))
|
user_id := int(id.(float64))
|
||||||
fmt.Println(req)
|
fmt.Println(req)
|
||||||
device_id := service.AddDevice(req.DeviceName, req.DeviceIP, req.DeviceStatus, req.DeviceInfo, req.DeviceType, req.DeviceLocation, user_id)
|
device_id := service.AddDevice(req.DeviceName, req.DeviceIP, req.DeviceStatus, req.DeviceInfo, req.DeviceType, req.DeviceLocation, user_id)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue