diff --git a/CRICS_V3_1124.suo b/CRICS_V3_1124.suo
index 1a784d9..c2e1977 100644
Binary files a/CRICS_V3_1124.suo and b/CRICS_V3_1124.suo differ
diff --git a/CommonEntity/LMRegisterInfo.cs b/CommonEntity/LMRegisterInfo.cs
index 0ce822e..6f082a2 100644
--- a/CommonEntity/LMRegisterInfo.cs
+++ b/CommonEntity/LMRegisterInfo.cs
@@ -25,6 +25,7 @@ namespace CommonEntity
}
public class RegisterInfo
{
+ public long ts_ms { get; set; }
public long hotel_id { get; set; }
public string room_id { get; set; }
public string device_id { get; set; }
@@ -48,16 +49,27 @@ namespace CommonEntity
public string gateway { get; set; }
public string dns { get; set; }
public string version { get; set; }
+ ///
+ /// RCU 时间,年月日 那种
+ ///
public string rcu_time { get; set; }
public string launcher_version { get; set; }
public string mac { get; set; }
- public string room_type_id { get; set; }
+ public int room_type_id { get; set; }
public string config_version { get; set; }
- public string room_status { get; set; }
+ public int room_status { get; set; }
public string season { get; set; }
- public string sys_lock_status { get; set; }
- public string authorization_time { get; set; }
- public string authorization_days { get; set; }
+
+ ///
+ /// 系统锁定状态
+ ///
+ public int sys_lock_status { get; set; }
+
+ ///
+ /// 授权时间
+ ///
+ public long authorization_time { get; set; }
+ public long authorization_days { get; set; }
public string room_num_remark { get; set; }
public string room_type_remark { get; set; }
public string room_remark { get; set; }
diff --git a/ConsoleApplication4/obj/x86/Debug/.NETFramework,Version=v4.0,Profile=Client.AssemblyAttributes.cs b/ConsoleApplication4/obj/x86/Debug/.NETFramework,Version=v4.0,Profile=Client.AssemblyAttributes.cs
new file mode 100644
index 0000000..c66f422
--- /dev/null
+++ b/ConsoleApplication4/obj/x86/Debug/.NETFramework,Version=v4.0,Profile=Client.AssemblyAttributes.cs
@@ -0,0 +1,4 @@
+//
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0,Profile=Client", FrameworkDisplayName = ".NET Framework 4 Client Profile")]
diff --git a/ConsoleApplication4/obj/x86/Debug/ConsoleApplication4.csproj.AssemblyReference.cache b/ConsoleApplication4/obj/x86/Debug/ConsoleApplication4.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..8431357
Binary files /dev/null and b/ConsoleApplication4/obj/x86/Debug/ConsoleApplication4.csproj.AssemblyReference.cache differ
diff --git a/RCUHost/Implement/HostRegisterReceiver.cs b/RCUHost/Implement/HostRegisterReceiver.cs
index 7d8c166..70b21c3 100644
--- a/RCUHost/Implement/HostRegisterReceiver.cs
+++ b/RCUHost/Implement/HostRegisterReceiver.cs
@@ -263,22 +263,43 @@ namespace RCUHost.Implement
RegisterInfo rsg = new RegisterInfo()
{
- hotel_id=hotel_code,
- room_id=host.RoomNumber,
+ ts_ms=Tools.GetUnixTime_MS(),
+ hotel_id = hotel_code,
+ room_id = host.RoomNumber,
device_id = HostNumberOnly,
- is_send=0,
- udp_raw=context.Data,
- ip_type=ipType,
+ is_send = 0,
+ udp_raw = context.Data,
+ ip_type = ipType,
model_num = type_number,
- server_ip=server_ip,
- ip=lan_ip+":"+lan_port,
- subnet_mask=subnet_mask,
- gateway=gateway,
- dns=dns,
+ server_ip = server_ip,
+ ip = lan_ip + ":" + lan_port,
+ subnet_mask = subnet_mask,
+ gateway = gateway,
+ dns = dns,
version = software_version,
+ rcu_time = rcuTime,
+ launcher_version = launcher_version,
+ mac = mac,
+ room_type_id = roomtype_id,
+ config_version = hostRCU.ConfigVersion,
+ room_status = room_status_id,
+ season = hostRCU.Season,
+ sys_lock_status = hostRCU.LockStatus,
+ authorization_time = set_expiration_time,
+ authorization_days = expiration_time,
+ room_num_remark = roomnumber,
+ room_type_remark = roomtype,
+ room_remark = room_remark,
+ mcu_name = core,
+ central_control_name = model,
+ configure_hotel_name = hotel_name,
+ configure_room_type_name = roomtype_remark
};
+ string N1N = Newtonsoft.Json.JsonConvert.SerializeObject(rsg);
+ CSRedisCacheHelper.Publish("redis-0XB1", N1N);
+
HostRepository.SetModelAndLauncher(host, hostRCU.ConfigVersion, software_version, lan_ip, lan_port, model, launcher_version, hostRCU.ExpireTime, hostRCU.SetExpireTime);
HostRCURepository.SaveOrUpdate(hostRCU);
diff --git a/RCUHost/Implement/HostSearchReceiver.cs b/RCUHost/Implement/HostSearchReceiver.cs
index d5e7d7c..4c45b44 100644
--- a/RCUHost/Implement/HostSearchReceiver.cs
+++ b/RCUHost/Implement/HostSearchReceiver.cs
@@ -78,6 +78,7 @@ namespace RCUHost.Implement
StepTongJi.SendInfo(4, "注册命令Task内部开始执行", context.MessageID, context.IsMonitor);
//Reply(context);
+ string RoomNumber = "";
var OriginalByte = context.Data;
int lll = OriginalByte.Length;
@@ -340,6 +341,16 @@ namespace RCUHost.Implement
//B1不能被去掉
HostRegisterReceiver.Send(exitEntity);//通知同步工具
+ RegisterInfo rsg = new RegisterInfo()
+ {
+ ts_ms=Tools.GetUnixTime_MS(),
+ hotel_id = long.Parse(hotelCode),
+ room_id = exitEntity.RoomNumber,
+ device_id = hostNumber,
+ is_send = 1
+ };
+ string NNN = Newtonsoft.Json.JsonConvert.SerializeObject(rsg);
+ CSRedisCacheHelper.Publish("redis-0XB1", NNN);
//logger.Error(string.Format("通知酒店({0})客房({1})同步主机信息。", exitEntity.SysHotel.Code, exitEntity.RoomNumber));
}