diff --git a/README.md b/README.md index ef47f18..2dc24e4 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # 2.请求状态码 状态码 | 说明 ---|--- -0 | 请求成功 +0 | 请求成功,处理成功 1 | 请求失败 2 | Token失效,未登录 3 | Token为空 @@ -16,4 +16,8 @@ 10 | 服务器内部错误 11 | 视频延迟操作失败 12 | 视频删除失败 -13 | 设备重启失败 \ No newline at end of file +13 | 设备重启失败 +14 | 查询数据失败 +15 | 设备添加失败 +16 | 设备修改失败 +17 | 数据库数据操作失败 \ No newline at end of file diff --git a/handler/device.go b/handler/device.go index 7b422aa..62e38bb 100644 --- a/handler/device.go +++ b/handler/device.go @@ -62,10 +62,10 @@ func DeleteDevice(c *gin.Context) { if service.DeleteDevice(req.ID, int(id.(float64))) { c.JSON(200, gin.H{"code": 0, "message": "success"}) } else { - c.JSON(200, gin.H{"code": 1, "message": "failed"}) + c.JSON(200, gin.H{"code": 17, "message": "failed"}) } } else { - c.JSON(200, gin.H{"code": 1, "message": "failed"}) + c.JSON(200, gin.H{"code": 9, "message": "failed"}) } } @@ -81,13 +81,13 @@ func UpdateDevice(c *gin.Context) { }) } else { c.JSON(200, gin.H{ - "code": 1, + "code": 16, "message": "failed", }) } } else { c.JSON(200, gin.H{ - "code": 1, + "code": 9, "message": "failed", }) } @@ -104,7 +104,7 @@ func SetDeviceStatus(c *gin.Context) { } } } else { - c.JSON(200, gin.H{"code": 1, "message": "failed"}) + c.JSON(200, gin.H{"code": 9, "message": "failed", "data": err.Error()}) } } @@ -117,20 +117,22 @@ func AddDevice(c *gin.Context) { device_id := service.AddDevice(req.DeviceName, req.DeviceIP, req.DeviceStatus, req.DeviceInfo, req.DeviceType, req.DeviceLocation, user_id) if device_id != 0 { c.JSON(200, gin.H{ - "code": 0, - "message": "success", - "device_id": device_id, + "code": 0, + "message": "success", + "data": device_id, }) } else { c.JSON(200, gin.H{ - "code": 1, + "code": 15, "message": "failed", + "data": "device add failed", }) } } else { c.JSON(200, gin.H{ - "code": 1, + "code": 9, "message": "failed", + "data": err.Error(), }) } } @@ -149,7 +151,7 @@ func RestartDevice(c *gin.Context) { user_id, _ := c.Get("id") var req DeviceRestartReq if err := c.ShouldBind(&req); err != nil { - c.JSON(200, gin.H{"code": 1, "message": "failed"}) + c.JSON(200, gin.H{"code": 9, "message": "failed", "data": err.Error()}) return } device_id := req.ID @@ -160,11 +162,11 @@ func RestartDevice(c *gin.Context) { if Restart(device.DeviceIP) { c.JSON(200, gin.H{"code": 0, "message": "success"}) } else { - c.JSON(200, gin.H{"code": 1, "message": "failed"}) + c.JSON(200, gin.H{"code": 13, "message": "failed"}) } } } else { - c.JSON(200, gin.H{"code": 1, "message": "failed"}) + c.JSON(200, gin.H{"code": 14, "message": "failed", "data": string(device_id) + ": device not found"}) } } else if req.Option == "all" { devices := service.GetDeviceList(int(user_id.(float64))) @@ -172,11 +174,13 @@ func RestartDevice(c *gin.Context) { for _, device := range devices { if device.DeviceIP != "" { if !Restart(device.DeviceIP) { - c.JSON(200, gin.H{"code": 1, "message": "failed"}) + c.JSON(200, gin.H{"code": 13, "message": "failed"}) return } } } + } else { + c.JSON(200, gin.H{"code": 14, "message": "failed", "data": "device not found"}) } c.JSON(200, gin.H{"code": 0, "message": "success"}) }