增加RCU上离线功能，能耗双通道

CommonEntity/UDPPackage.cs

@@ -26,7 +26,17 @@ namespace CommonEntity
         /// <summary>
         /// 宝镜系统使用的数据
         /// </summary>
-        public static string BLWLog4BaoJing_RCU_Topic = "blwlog4BaoJing-rcu-udppackage-topic";
+        //public static string BLWLog4BaoJing_RCU_Topic = "blwlog4BaoJing-rcu-udppackage-topic";
+        public static string BLWLog4BaoJing_RCU_Topic = "blwlog4BaoJing-rcu-heartbeat-topic";
+
+        #region 日志系统
+        /// <summary>
+        /// 新的 TS写的日志系统
+        /// 心跳包
+        /// </summary>
+        public static string BLWLog4NodeJs_RCU_Topic = "blwlog4Nodejs-rcu-heartbeat-topic";
+
+        #endregion
 
         /// <summary>
         /// 选住使用kafka数据
@@ -176,11 +186,38 @@ namespace CommonEntity
         public int Valve { get; set; }
     }
 
+
+    /// <summary>
+    /// 能耗实体类
+    /// </summary>
+    [MessagePackObject()]
+    public class NengHao_Repeat
+    {
+        [Key(0)]
+        public string? address { get; set; }
+
+        [Key(1)]
+        public double dianya { get; set; }
+
+        [Key(2)]
+        public double dianliu { get; set; }
+
+        [Key(3)]
+        public double gonglv { get; set; }
+
+        [Key(4)]
+        public double nenghao { get; set; }
+
+        [Key(5)]
+        public double zongnenghao { get; set; }
+    }
+
     [MessagePackObject()]
     public class NengHao
     {
         [Key(0)]
         public long HotelCode { get; set; }
+
         [Key(1)]
         public string? HostNumber { get; set; }
 
@@ -197,43 +234,66 @@ namespace CommonEntity
         public bool IsTakeCard { get; set; }
 
         [Key(6)]
-        public double V { get; set; }
+        public List<NengHao_Repeat> NengHaoList { get; set; }
+
+        #region 过期的数据
+        //[Key(6)]
+        //public double V { get; set; }
+
+        //[Key(7)]
+        //public double A { get; set; }
+
+        //[Key(8)]
+        //public double P { get; set; }
+
+        ///// <summary>
+        ///// 能耗
+        ///// </summary>
+        //[Key(9)]
+        //public double Energy_Consumption { get; set; }
+
+        ///// <summary>
+        ///// 总能耗
+        ///// </summary>
+        //[Key(10)]
+        //public double Sum_Energy_Consumption { get; set; }
+        #endregion
 
         [Key(7)]
-        public double A { get; set; }
-
-        [Key(8)]
-        public double P { get; set; }
-
-        /// <summary>
-        /// 能耗
-        /// </summary>
-        [Key(9)]
-        public double Energy_Consumption { get; set; }
-
-        /// <summary>
-        /// 总能耗
-        /// </summary>
-        [Key(10)]
-        public double Sum_Energy_Consumption { get; set; }
-
-        [Key(11)]
         public long CreateTime { get; set; }
 
-        [Key(12)]
+        [Key(8)]
         public string? ReportTime { get; set; }
 
-        [Key(13)]
+        [Key(9)]
         public string? RoomNumber { get; set; }
 
-        [Key(14)]
+        [Key(10)]
         public int CarbonVIP { get; set; }
 
-        [Key(15)]
+        [Key(11)]
         public List<DingShiReportDate>? AllDeviceData { get; set; }
 
-        [Key(16)]
+        [Key(12)]
         public int IdentityInfo { get; set; }
+
+
+        /// <summary>
+        ///短离长离 
+        ///我们这里叫卡事件
+        /// </summary>
+        [Key(13)]
+        public ushort CardEvent { get; set; }
+
+
+        /// <summary>
+        /// PMS 状态
+        /// </summary>
+        [Key(14)]
+        public string? PMS_Status { get; set; }
+
+        [Key(15)]
+        public int IsInsertCard { get; set; }
     }
 
     [MessagePackObject()]