update router

services/knowoapi/controllers/device.go

@@ -218,9 +218,9 @@ func (a *DeviceController) GetLivechart() {
 	})
 }
 
-// Upgrade ota升级
-// POST /device/upgrade
-func (a *DeviceController) Upgrade() {
+// PostUpgrade ota升级
+// POST /device/ota/upgrade
+func (a *DeviceController) PostUpgrade() {
 	params := new(models.UpgradeParams)
 	if err := parseBody(a.Ctx, params); err != nil {
 		badRequest(a.Ctx, err)
@@ -248,9 +248,9 @@ func (a *DeviceController) Upgrade() {
 	done(a.Ctx, params)
 }
 
-// OtaProgress ota升级
-// GET /device/progress?device_id=
-func (a *DeviceController) OtaProgress() {
+// GetOtaProgress ota升级
+// GET /device/ota/progress?device_id=
+func (a *DeviceController) GetOtaProgress() {
 	deviceId := a.Ctx.URLParam("device_id")
 
 	data, err := a.Service.GetUpgradeProgress(deviceId)
@@ -278,9 +278,9 @@ func (a *DeviceController) GetStatus() {
 	})
 }
 
-// UpdateSplitInfo
+// PostStatus
 // POST /device/status
-func (a *DeviceController) UpdateSplitInfo() {
+func (a *DeviceController) PostStatus() {
 
 	d := new(models.UpgradeParams)
 	if err := parseBody(a.Ctx, d); err != nil {

services/knowoapi/services/device.go

@@ -179,45 +179,25 @@ func (a deviceservice) GetDeviceStatus(deviceId string) (*gjson.Json, error) {
 	var args rpcs.ArgsGetStatus
 	args.Id = deviceId
 
-	//var reply rpcs.ReplyStatus
-
-	str := `{
-      "power": 1,
-      "mode": 1,
-      "fan_speed": 3,
-      "set_temp": 25,
-      "env_temp": 2348,
-      "env_humidity": 4336,
-      "env_co2": 612,
-      "env_pm25": 22,
-      "status_code": 29,
-      "air_mode": 3,
-      "ac_type": 1,
-      "air_type": 3,
-      "hum_type": 0
-    }`
-	j := gjson.New(str)
-	server.Log.Debugf("获取设备信息请求成功")
-	return j, nil
-	//err := server.RPCCallByName(nil, rpcs.DeviceManagerName, "DeviceManager.GetDeviceStatus", args, &reply)
-	//if err != nil {
-	//	server.Log.Errorf("设备状态数据获取失败：%v", err)
-	//	return reply.Status, err
-	//}
-	//
-	//return reply.Status, nil
+	var reply rpcs.ReplyStatus
+	err := server.RPCCallByName(nil, rpcs.DeviceManagerName, "DeviceManager.GetDeviceStatus", args, &reply)
+	if err != nil {
+		server.Log.Errorf("设备状态数据获取失败：%v", err)
+		return nil, err
+	}
+
+	return &reply.Status, nil
 }
 
 func (a deviceservice) GetSplitInfo(deviceId string) error {
-	//var args rpcs.ArgsSendCommand
-	//args.DeviceId = deviceId
-	//args.Cmd = "getInfo"
-	//var reply rpcs.ReplySendCommand
-	//err := server.RPCCallByName(nil, rpcs.ControllerName, "Controller.SendCommand", args, &reply)
-	//if err != nil {
-	//	server.Log.Errorf("设备状态数据获取失败：%v", err)
-	//	return err
-	//}
-	server.Log.Debugf("更新设备信息请求成功")
+	var args rpcs.ArgsSendCommand
+	args.DeviceId = deviceId
+	args.Cmd = "getInfo"
+	var reply rpcs.ReplySendCommand
+	err := server.RPCCallByName(nil, rpcs.ControllerName, "Controller.SendCommand", args, &reply)
+	if err != nil {
+		server.Log.Errorf("设备状态数据获取失败：%v", err)
+		return err
+	}
 	return nil
 }