diff --git a/CRICS_V3_1124.suo b/CRICS_V3_1124.suo
index b7c5f86..913694f 100644
Binary files a/CRICS_V3_1124.suo and b/CRICS_V3_1124.suo differ
diff --git a/Common/Tools.cs b/Common/Tools.cs
index 6fba793..8bc48f2 100644
--- a/Common/Tools.cs
+++ b/Common/Tools.cs
@@ -789,6 +789,17 @@ namespace Common
long unixTimestampMillisecondsManual = (long)(DateTime.UtcNow - unixEpoch).TotalSeconds;
return unixTimestampMillisecondsManual;
}
+
+ ///
+ /// 格林尼治时间 毫秒
+ ///
+ ///
+ public static long GetUnixTime_MS()
+ {
+ DateTime unixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+ long unixTimestampMillisecondsManual = (long)(DateTime.UtcNow - unixEpoch).TotalMilliseconds;
+ return unixTimestampMillisecondsManual;
+ }
public static DateTime GetTimeFromUnixTime(long timestampSeconds)
{
// Unix 时间戳的起始时间(1970-01-01 00:00:00 UTC)
diff --git a/CommonEntity/CommonEntity.csproj b/CommonEntity/CommonEntity.csproj
index 873c302..9ac461d 100644
--- a/CommonEntity/CommonEntity.csproj
+++ b/CommonEntity/CommonEntity.csproj
@@ -70,6 +70,7 @@
+
diff --git a/CommonEntity/Kafka_XinTiao.cs b/CommonEntity/Kafka_XinTiao.cs
new file mode 100644
index 0000000..d66fd5e
--- /dev/null
+++ b/CommonEntity/Kafka_XinTiao.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace CommonEntity
+{
+ public struct Kafka_XinTiao
+ {
+ public string current_time { get; set; }
+ public long ts_ms { get; set; }
+ public string hotel_id { get; set; }
+ public string device_id { get; set; }
+ public string room_id { get; set; }
+ }
+}
diff --git a/RCUHost/Implement/HostServer.cs b/RCUHost/Implement/HostServer.cs
index 251823b..cbfbace 100644
--- a/RCUHost/Implement/HostServer.cs
+++ b/RCUHost/Implement/HostServer.cs
@@ -1270,6 +1270,22 @@ namespace RCUHost.Implement
string CODE = context111.SystemHeader.Value.HostNumber.ToHotelCode().ToString();
string hotelCode = CODE;
string EndPoint = context111.RemoteEndPoint.ToString();
+ if (cmdType == 0x02)
+ {
+ string RoomNUMBER = CSRedisCacheHelper.HMGet(5, CacheKey.RoomNumber_HostNumber, HostNNN)[0];
+ if (!string.IsNullOrEmpty(RoomNUMBER))
+ {
+ string hotelid = CODE;
+ string roomid = RoomNUMBER;
+ Kafka_XinTiao k = new Kafka_XinTiao();
+ k.hotel_id = CODE;
+ k.device_id = HostNNN;
+ k.room_id = RoomNUMBER;
+ k.ts_ms = Tools.GetUnixTime_MS();
+ k.current_time = CPUData.GetNowPrecise().ToString("yyyy-MM-dd HH:mm:ss.ffffff") ;
+ CSRedisCacheHelper.Publish("redis-heartbeat", Newtonsoft.Json.JsonConvert.SerializeObject(k));
+ }
+ }
if (cmdType != 0x01 && cmdType != 0xb1)
//if (!(cmdType==0x01||cmdType==0xb1) )
//在线状态 不排队 注册0x01
@@ -2506,7 +2522,7 @@ namespace RCUHost.Implement
//温控器
var DataLen1 = Convert.ToInt32(WenKongQiDataLen);
- ///ushort StatusReceiver = reader.ReadUInt16();
+ //ushort StatusReceiver = reader.ReadUInt16();
ushort StatusReceiver = BitConverter.ToUInt16(reader.ReadBytes(2).Reverse().ToArray(), 0);
int XiaoShu_BuFen = 0;
float xiaoshu_l = 0.0f;
diff --git a/WebSite/Controllers/IoTController.cs b/WebSite/Controllers/IoTController.cs
index f826636..1eaa19b 100644
--- a/WebSite/Controllers/IoTController.cs
+++ b/WebSite/Controllers/IoTController.cs
@@ -1626,6 +1626,13 @@ namespace WebSite.Controllers
}
else
{
+
+ string tiaowen = request.header.name;
+ if (tiaowen.Equals("IncrementTemperatureRequest") || tiaowen.Equals("IncrementTemperatureRequest"))
+ {
+ HostModalManager.SetDevice(host, hostModal, 1, 0);
+ Thread.Sleep(50);
+ }
//对房间设备进行操作
HostModalManager.SetDevice(host, hostModal, status, brightness, temperature, fanSpeed, mode, valve);
}