diff --git a/SensorHub.Servers/Common.cs b/SensorHub.Servers/Common.cs index ea35a63..966984e 100644 --- a/SensorHub.Servers/Common.cs +++ b/SensorHub.Servers/Common.cs @@ -886,7 +886,7 @@ { if (routeFlag == "03") //GPRS,3G网络,电信平台 { - senderSM4Config(session, devCode, btPdu, source); + senderGPRSConfig(session, devCode, btPdu, source); } else if (routeFlag == "01") //433 { diff --git a/SensorHub.Servers/Common.cs b/SensorHub.Servers/Common.cs index ea35a63..966984e 100644 --- a/SensorHub.Servers/Common.cs +++ b/SensorHub.Servers/Common.cs @@ -886,7 +886,7 @@ { if (routeFlag == "03") //GPRS,3G网络,电信平台 { - senderSM4Config(session, devCode, btPdu, source); + senderGPRSConfig(session, devCode, btPdu, source); } else if (routeFlag == "01") //433 { diff --git a/SensorHub.Well/Well.cs b/SensorHub.Well/Well.cs index 22a75ff..8dcc201 100644 --- a/SensorHub.Well/Well.cs +++ b/SensorHub.Well/Well.cs @@ -41,7 +41,14 @@ session.Logger.Info("设备类型:" + devType); session.Logger.Info("操作类型:" + operType); session.Logger.Info("会话:" + session.HubAddr + "," + session.SessionID); - + + //判断是返回的设置确认数据帧, 回复第三方 + if (operType == "SetResponse") + { + Common.sendSetResponse(session, devCode, devName); + return; + } + List tags = Common.getTags(settings, session); //具体业务处理 @@ -86,7 +93,7 @@ TagHandler wellHandler = new WellTagHandler(); wellHandler.resolve(tag, session); - if(wellHandler.DataList.Count > 0) + if (wellHandler.DataList.Count > 0) { DateTime upTime = Convert.ToDateTime(collectDate + " " + wellHandler.CollecTime); String uptime = upTime.ToString("yyyy") + upTime.ToString("MM") + upTime.ToString("dd") @@ -119,12 +126,13 @@ } } - Common.sendMessage(session, "Well", devCode, -1, eventList, datasList, startupList); + Common.sendMessage(session, devName, devCode, -1, eventList, datasList, startupList); // Common.kafkaProduce(session, devName, devCode, -1, null, null, null, eventList, datasList, startupList); - + /* if (source != "433") //433井盖不要求回复 { byte[] btPdu = new byte[2]; //2个字节 + if (operType == "TrapRequest") { btPdu[0] = 0x05; @@ -137,8 +145,13 @@ btPdu[1] = 0x86; Common.sendConfig(session, devCode, routeFlag, source, btPdu); - } - + }*/ + + byte[] btPdu = new byte[2]; //2个字节 + btPdu[0] = Common.getRespOperType(operType, source == "433" ? true : false); + btPdu[1] = 0x86; + Common.sendConfig(session, devCode, routeFlag, source, btPdu); + } } }