一个非常平稳的版本
一个非常平稳的版本,兼容了新老服务器
This commit is contained in:
@@ -137,6 +137,28 @@ namespace WebSite.Controllers
|
||||
HttpContext.Cache.Remove(Key);
|
||||
return Json(new { result = "success" }, JsonRequestBehavior.AllowGet);
|
||||
}
|
||||
|
||||
public static string OldIOTServerUrl = "http://a.boonlive-rcu.com/";
|
||||
public void ZhuanFa<T>(T reqData, string ActionMethod)
|
||||
{
|
||||
try
|
||||
{
|
||||
//string nsa = JsonConvert.SerializeObject(reqData);
|
||||
logger.Error("进入转发" );
|
||||
logger.Error("进入转发" + ActionMethod);
|
||||
var client1 = new RestClient(OldIOTServerUrl);
|
||||
var request1 = new RestRequest("iot/" + ActionMethod, Method.POST);
|
||||
request1.AddJsonBody(reqData);
|
||||
var QQQ = client1.Execute(request1);
|
||||
string HHH = QQQ.Content;
|
||||
//logger.Error("转发结果:" + HHH);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.Error("转发出错:" + ex.Message);
|
||||
//return Json("语音机器人转发:"+ex.Message, JsonRequestBehavior.AllowGet);
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 小度对接
|
||||
/// </summary>
|
||||
@@ -164,10 +186,16 @@ namespace WebSite.Controllers
|
||||
byte[] reqBody = new byte[Request.InputStream.Length];
|
||||
Request.InputStream.Read(reqBody, 0, reqBody.Length);
|
||||
string reqData = System.Text.Encoding.UTF8.GetString(reqBody);
|
||||
|
||||
string platformName = "小度音箱";
|
||||
try
|
||||
{
|
||||
Domain.IoTXiaoDuEntity.Request.AppliancesRequest request = JsonConvert.DeserializeObject<Domain.IoTXiaoDuEntity.Request.AppliancesRequest>(reqData);//得到小度请求
|
||||
|
||||
if (NewOrOld.IsNew)
|
||||
{
|
||||
ZhuanFa<Domain.IoTXiaoDuEntity.Request.AppliancesRequest>(request, "XiaoDu");
|
||||
}
|
||||
if (string.IsNullOrEmpty(request.payload.cuid))
|
||||
{
|
||||
//logger.Error("设备cuid不能为空:" + reqData + ",来自:" + GetClientIP());
|
||||
@@ -606,7 +634,7 @@ namespace WebSite.Controllers
|
||||
if (!is_online)
|
||||
{
|
||||
logger.Error(platformName + "当前访问酒店(" + host.SysHotel.Name + host.SysHotel.Code + ")客房rcu(" + host.RoomNumber + ")不在线");
|
||||
return Json(ReturnXiaoDuError(request.header, "TargetOfflineError"), JsonRequestBehavior.AllowGet);//当技能检测到目标设备没有连接到设备云或者设备云不在线时,会给DuerOS发送TargetOfflineError消息。
|
||||
//return Json(ReturnXiaoDuError(request.header, "TargetOfflineError"), JsonRequestBehavior.AllowGet);//当技能检测到目标设备没有连接到设备云或者设备云不在线时,会给DuerOS发送TargetOfflineError消息。
|
||||
}
|
||||
|
||||
|
||||
@@ -3906,6 +3934,7 @@ namespace WebSite.Controllers
|
||||
byte[] reqBody = new byte[Request.InputStream.Length];
|
||||
Request.InputStream.Read(reqBody, 0, reqBody.Length);
|
||||
string reqData = System.Text.Encoding.UTF8.GetString(reqBody);
|
||||
|
||||
//logger.Error(reqData);
|
||||
string g_requestid = "";
|
||||
int g_hotelcode = 0;
|
||||
@@ -3916,6 +3945,10 @@ namespace WebSite.Controllers
|
||||
{
|
||||
Domain.IoTAliGenieEntity.Request req = JsonConvert.DeserializeObject<Domain.IoTAliGenieEntity.Request>(reqData);//得到天猫精灵请求
|
||||
|
||||
if (NewOrOld.IsNew)
|
||||
{
|
||||
ZhuanFa<Domain.IoTAliGenieEntity.Request>(req, "aligenie");
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(req.baseInfo.hotelId) || string.IsNullOrEmpty(req.baseInfo.roomNo))
|
||||
{
|
||||
@@ -4183,7 +4216,7 @@ namespace WebSite.Controllers
|
||||
if (!is_online)
|
||||
{
|
||||
logger.Error(platformName + "当前访问酒店(" + host.SysHotel.Name + host.SysHotel.Code + ")客房rcu(" + host.RoomNumber + ")不在线");
|
||||
return Json(ReturnAliGenieError("当前访问rcu主机不在线", req.baseInfo.requestId), JsonRequestBehavior.AllowGet);//当技能检测到目标设备没有连接到设备云或者设备云不在线时,会给DuerOS发送TargetOfflineError消息。
|
||||
//return Json(ReturnAliGenieError("当前访问rcu主机不在线", req.baseInfo.requestId), JsonRequestBehavior.AllowGet);//当技能检测到目标设备没有连接到设备云或者设备云不在线时,会给DuerOS发送TargetOfflineError消息。
|
||||
}
|
||||
bool is_card_in = CheckGetPower(host);
|
||||
|
||||
@@ -5730,7 +5763,7 @@ namespace WebSite.Controllers
|
||||
|
||||
result.code = 0;
|
||||
result.msg = "当前房间主机不在线,无法控制";
|
||||
return Json(result, JsonRequestBehavior.AllowGet);
|
||||
//return Json(result, JsonRequestBehavior.AllowGet);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user