diff --git a/SensorHub.Methane/Methane.cs b/SensorHub.Methane/Methane.cs index 5b7d69c..54cfc88 100644 --- a/SensorHub.Methane/Methane.cs +++ b/SensorHub.Methane/Methane.cs @@ -53,8 +53,8 @@ uint offset = 0; uint size = 0; - // if (exist == "0")//数据没有缓存 - //{ + if (exist == "0")//数据没有缓存 + { //判断是返回的设置确认数据帧, 回复第三方 if (operType == "SetResponse") { @@ -213,7 +213,7 @@ Common.remoteUpgrade(session, operType, devName, devCode, btPdu, softwareVersion, size, offset, source); return; } - // } + } Common.sendConfig(session, devCode, routeFlag, source, btPdu); } diff --git a/SensorHub.Methane/Methane.cs b/SensorHub.Methane/Methane.cs index 5b7d69c..54cfc88 100644 --- a/SensorHub.Methane/Methane.cs +++ b/SensorHub.Methane/Methane.cs @@ -53,8 +53,8 @@ uint offset = 0; uint size = 0; - // if (exist == "0")//数据没有缓存 - //{ + if (exist == "0")//数据没有缓存 + { //判断是返回的设置确认数据帧, 回复第三方 if (operType == "SetResponse") { @@ -213,7 +213,7 @@ Common.remoteUpgrade(session, operType, devName, devCode, btPdu, softwareVersion, size, offset, source); return; } - // } + } Common.sendConfig(session, devCode, routeFlag, source, btPdu); } diff --git a/SensorHub.Servers/Common.cs b/SensorHub.Servers/Common.cs index af124ab..132ac88 100644 --- a/SensorHub.Servers/Common.cs +++ b/SensorHub.Servers/Common.cs @@ -177,10 +177,10 @@ else { String strBase64Value = Convert.ToBase64String(afcrc); - // int ret = SendNACommand(session, strBase64Value, source); - int ret = SendAepCommand(session, strBase64Value, source); // 新AEP平台指令 - - if (ret != 0) + int ret = SendNACommand(session, strBase64Value, source); // OC平台 + // int ret = SendAepCommand(session, strBase64Value, source); // 新AEP平台指令 + if (ret != 201) + // if (ret != 0) { session.Logger.Info("电信平台下发配置信息失败，返回的Http状态码：" + ret); } diff --git a/SensorHub.Methane/Methane.cs b/SensorHub.Methane/Methane.cs index 5b7d69c..54cfc88 100644 --- a/SensorHub.Methane/Methane.cs +++ b/SensorHub.Methane/Methane.cs @@ -53,8 +53,8 @@ uint offset = 0; uint size = 0; - // if (exist == "0")//数据没有缓存 - //{ + if (exist == "0")//数据没有缓存 + { //判断是返回的设置确认数据帧, 回复第三方 if (operType == "SetResponse") { @@ -213,7 +213,7 @@ Common.remoteUpgrade(session, operType, devName, devCode, btPdu, softwareVersion, size, offset, source); return; } - // } + } Common.sendConfig(session, devCode, routeFlag, source, btPdu); } diff --git a/SensorHub.Servers/Common.cs b/SensorHub.Servers/Common.cs index af124ab..132ac88 100644 --- a/SensorHub.Servers/Common.cs +++ b/SensorHub.Servers/Common.cs @@ -177,10 +177,10 @@ else { String strBase64Value = Convert.ToBase64String(afcrc); - // int ret = SendNACommand(session, strBase64Value, source); - int ret = SendAepCommand(session, strBase64Value, source); // 新AEP平台指令 - - if (ret != 0) + int ret = SendNACommand(session, strBase64Value, source); // OC平台 + // int ret = SendAepCommand(session, strBase64Value, source); // 新AEP平台指令 + if (ret != 201) + // if (ret != 0) { session.Logger.Info("电信平台下发配置信息失败，返回的Http状态码：" + ret); } diff --git a/SensorHub.Servers/TelecomReceiveFilter.cs b/SensorHub.Servers/TelecomReceiveFilter.cs index dd3b850..790eed6 100644 --- a/SensorHub.Servers/TelecomReceiveFilter.cs +++ b/SensorHub.Servers/TelecomReceiveFilter.cs @@ -20,8 +20,8 @@ //开始和结束标记也可以是两个或两个以上的字节 // 改成电信AEP平台后传入的data有变化 通过java接口进行转发 增加了##作为帧头 **作为帧尾 private readonly static byte[] BeginMark = new byte[] { (byte)'P', (byte)'O', (byte)'S', (byte)'T' }; - private readonly static byte[] EndMark = new byte[] { (byte)'*', (byte)'*' }; // AEP平台的结尾 - // private readonly static byte[] EndMark = new byte[] { (byte)'}', (byte)'}' }; // OC平台的结尾 + // private readonly static byte[] EndMark = new byte[] { (byte)'*', (byte)'*' }; // AEP平台的结尾 + private readonly static byte[] EndMark = new byte[] { (byte)'}', (byte)'}' }; // OC平台的结尾 private static MemoryCache memoryCache = new MemoryCache("Telecom"); private readonly object SyncObj = new object(); @@ -37,16 +37,17 @@ String dataJson = System.Text.Encoding.Default.GetString(readBuffer); // AEP平台对应的data部分 - int startIdx = dataJson.IndexOf("##"); - int endIdx = dataJson.IndexOf("**"); - dataJson = dataJson.Substring(dataJson.IndexOf("##") + 2, endIdx - startIdx - 2); + // int startIdx = dataJson.IndexOf("##"); + // int endIdx = dataJson.IndexOf("**"); + // dataJson = dataJson.Substring(dataJson.IndexOf("##") + 2, endIdx - startIdx - 2); - // dataJson = dataJson.Substring(dataJson.LastIndexOf('\n') + 1); + // OC平台对应的data部分 + dataJson = dataJson.Substring(dataJson.LastIndexOf('\n') + 1); JObject jo = (JObject)JsonConvert.DeserializeObject(dataJson); String telecomDeviceId = jo["deviceId"].ToString();//电信平台设备编号 - String Value = jo["payload"]["serviceData"]["Value"].ToString();//{"Value":"ow=="} //AEP平台 - // String Value = jo["service"]["data"]["Value"].ToString();//{"Value":"ow=="} + // String Value = jo["payload"]["serviceData"]["Value"].ToString();//{"Value":"ow=="} //AEP平台 + String Value = jo["service"]["data"]["Value"].ToString();//{"Value":"ow=="} //OC平台 String result = ""; byte[] src = Convert.FromBase64String(Value); @@ -110,13 +111,14 @@ } */ + // /* //对tag进行sm4解密 Byte[] dat = new Byte[data.Length / 2 - 18]; Array.Copy(src, 16, dat, 0, data.Length / 2 - 18); String plainText = SM4Utils.sm4Decrypt(dat, deviceId); settings = plainText.Substring(0, Convert.ToInt32(leng, 16) * 2 - 12 * 2); - + // */ result = Common.getDeviceTypeByPdu(pduType); result += ":" + preamble + "," + version + "," + diff --git a/SensorHub.Methane/Methane.cs b/SensorHub.Methane/Methane.cs index 5b7d69c..54cfc88 100644 --- a/SensorHub.Methane/Methane.cs +++ b/SensorHub.Methane/Methane.cs @@ -53,8 +53,8 @@ uint offset = 0; uint size = 0; - // if (exist == "0")//数据没有缓存 - //{ + if (exist == "0")//数据没有缓存 + { //判断是返回的设置确认数据帧, 回复第三方 if (operType == "SetResponse") { @@ -213,7 +213,7 @@ Common.remoteUpgrade(session, operType, devName, devCode, btPdu, softwareVersion, size, offset, source); return; } - // } + } Common.sendConfig(session, devCode, routeFlag, source, btPdu); } diff --git a/SensorHub.Servers/Common.cs b/SensorHub.Servers/Common.cs index af124ab..132ac88 100644 --- a/SensorHub.Servers/Common.cs +++ b/SensorHub.Servers/Common.cs @@ -177,10 +177,10 @@ else { String strBase64Value = Convert.ToBase64String(afcrc); - // int ret = SendNACommand(session, strBase64Value, source); - int ret = SendAepCommand(session, strBase64Value, source); // 新AEP平台指令 - - if (ret != 0) + int ret = SendNACommand(session, strBase64Value, source); // OC平台 + // int ret = SendAepCommand(session, strBase64Value, source); // 新AEP平台指令 + if (ret != 201) + // if (ret != 0) { session.Logger.Info("电信平台下发配置信息失败，返回的Http状态码：" + ret); } diff --git a/SensorHub.Servers/TelecomReceiveFilter.cs b/SensorHub.Servers/TelecomReceiveFilter.cs index dd3b850..790eed6 100644 --- a/SensorHub.Servers/TelecomReceiveFilter.cs +++ b/SensorHub.Servers/TelecomReceiveFilter.cs @@ -20,8 +20,8 @@ //开始和结束标记也可以是两个或两个以上的字节 // 改成电信AEP平台后传入的data有变化 通过java接口进行转发 增加了##作为帧头 **作为帧尾 private readonly static byte[] BeginMark = new byte[] { (byte)'P', (byte)'O', (byte)'S', (byte)'T' }; - private readonly static byte[] EndMark = new byte[] { (byte)'*', (byte)'*' }; // AEP平台的结尾 - // private readonly static byte[] EndMark = new byte[] { (byte)'}', (byte)'}' }; // OC平台的结尾 + // private readonly static byte[] EndMark = new byte[] { (byte)'*', (byte)'*' }; // AEP平台的结尾 + private readonly static byte[] EndMark = new byte[] { (byte)'}', (byte)'}' }; // OC平台的结尾 private static MemoryCache memoryCache = new MemoryCache("Telecom"); private readonly object SyncObj = new object(); @@ -37,16 +37,17 @@ String dataJson = System.Text.Encoding.Default.GetString(readBuffer); // AEP平台对应的data部分 - int startIdx = dataJson.IndexOf("##"); - int endIdx = dataJson.IndexOf("**"); - dataJson = dataJson.Substring(dataJson.IndexOf("##") + 2, endIdx - startIdx - 2); + // int startIdx = dataJson.IndexOf("##"); + // int endIdx = dataJson.IndexOf("**"); + // dataJson = dataJson.Substring(dataJson.IndexOf("##") + 2, endIdx - startIdx - 2); - // dataJson = dataJson.Substring(dataJson.LastIndexOf('\n') + 1); + // OC平台对应的data部分 + dataJson = dataJson.Substring(dataJson.LastIndexOf('\n') + 1); JObject jo = (JObject)JsonConvert.DeserializeObject(dataJson); String telecomDeviceId = jo["deviceId"].ToString();//电信平台设备编号 - String Value = jo["payload"]["serviceData"]["Value"].ToString();//{"Value":"ow=="} //AEP平台 - // String Value = jo["service"]["data"]["Value"].ToString();//{"Value":"ow=="} + // String Value = jo["payload"]["serviceData"]["Value"].ToString();//{"Value":"ow=="} //AEP平台 + String Value = jo["service"]["data"]["Value"].ToString();//{"Value":"ow=="} //OC平台 String result = ""; byte[] src = Convert.FromBase64String(Value); @@ -110,13 +111,14 @@ } */ + // /* //对tag进行sm4解密 Byte[] dat = new Byte[data.Length / 2 - 18]; Array.Copy(src, 16, dat, 0, data.Length / 2 - 18); String plainText = SM4Utils.sm4Decrypt(dat, deviceId); settings = plainText.Substring(0, Convert.ToInt32(leng, 16) * 2 - 12 * 2); - + // */ result = Common.getDeviceTypeByPdu(pduType); result += ":" + preamble + "," + version + "," + diff --git a/SensorHub.Well/Well.cs b/SensorHub.Well/Well.cs index 48546da..b558515 100644 --- a/SensorHub.Well/Well.cs +++ b/SensorHub.Well/Well.cs @@ -111,7 +111,7 @@ eventList.Add("WellDeviceBadAlarm");//设备故障 break; case 3: - //eventList.Add("WellLowBatteryAlarm");//低电量 + eventList.Add("WellLowBatteryAlarm");//低电量 break; default: eventList.Add("WellUnknown");//未知异常