增加能耗推送和新的 那个日志数据推送

CommonEntity/CommonEntity.csproj

@@ -78,6 +78,7 @@
     <Compile Include="MissionRequestData.cs" />
     <Compile Include="MonitorLog.cs" />
     <Compile Include="MyHttp.cs" />
+    <Compile Include="NengHao_Repeat.cs" />
     <Compile Include="NewDataSQL.cs" />
     <Compile Include="NewRoomStatusPush.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

CommonEntity/DataTongJi.cs

@@ -238,32 +238,90 @@ namespace CommonEntity
         /// </summary>
         public bool IsTakeCard { get; set; }
 
+        /// <summary>
+        /// 是否插卡
+        /// </summary>
+        public int IsInsertCard { get; set; }
+
         /// <summary>
         ///短离长离 
         ///我们这里叫卡事件
         /// </summary>
         public ushort CardEvent { get; set; }
 
-        /// <summary>
-        /// 卡身份
-        /// </summary>
-        public ushort CardID { get; set; }
-
         /// <summary>
         /// PMS 状态
         /// </summary>
         public string PMS_Status { get; set; }
 
         public int CarbonVIP { get; set; }
-        public double V { get; set; }
-        public double A { get; set; }
-        public double P { get; set; }
-        public double Energy_Consumption { get; set; }
-        public double Sum_Energy_Consumption { get; set; }
+        public List<NengHao_Repeat> NengHaoList { get; set; }
+        //public double V { get; set; }
+        //public double A { get; set; }
+        //public double P { get; set; }
+        //public double Energy_Consumption { get; set; }
+        //public double Sum_Energy_Consumption { get; set; }
         public long CreateTime { get; set; }
         public string ReportTime { get; set; }
         public List<DingShiReportDate> AllDeviceData { get; set; }
-        public int IdentityInfo {get;set;}
+
+        /// <summary>
+        /// 卡身份
+        /// </summary>
+        public int IdentityInfo { get; set; }
+    }
+
+    /// <summary>
+    /// ts 日志
+    /// </summary>
+    public class NewVersionLog
+    {
+        public string hotel_id { get; set; }
+        public string room_id { get; set; }
+        public string device_id { get; set; }
+        public string ip { get; set; }
+
+        public ushort power_state { get; set; }
+        public ushort guest_type { get; set; }
+        public ushort cardless_state { get; set; }
+        public ulong service_mask { get; set; }
+        public ushort pms_state { get; set; }
+        public ushort carbon_state { get; set; }
+        public int device_count { get; set; }
+        public ushort comm_seq { get; set; }
+        public List<NengHaolog> electricity { get; set; }
+        public List<KongTiao> air_conditioner { get; set; }
+        public extra_data extra { get; set; }
+
+    }
+    public class NengHaolog
+    {
+        public string address { get; set; }
+        public double voltage { get; set; }
+        public double ampere { get; set; }
+        public double power { get; set; }
+        //public double watt { get; set; }
+        public double energy { get; set; }
+        public double sum_energy { get; set; }
+        public string phase { get; set; }
+    }
+    public class KongTiao
+    {
+        public string address { get; set; }
+        public int state { get; set; }
+        public int model { get; set; }
+        public int speed { get; set; }
+        public int set_temp { get; set; }
+        public int now_temp { get; set; }
+        public int solenoid_valve { get; set; }
+    }
+    public class extra_data
+    {
+        public byte[] original_byte { get; set; }
+        public string source { get; set; }
+        public string ver { get; set; }
+        public object ac { get; set; }
+        public object meter { get; set; }
     }
 
     public class Interface3Log

CommonEntity/NengHao_Repeat.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace CommonEntity
+{
+    public class NengHao_Repeat
+    {
+        public string address { get; set; }
+        public double dianya { get; set; }
+        public double dianliu { get; set; }
+        public double gonglv { get; set; }
+        public double nenghao { get; set; }
+        public double zongnenghao { get; set; }
+    }
+}