修改新版协议主机 协议触发的机制，新增 缓存机制

WebSite/Controllers/AirConditionControlController.cs

@@ -66,13 +66,13 @@ namespace WebSite.Controllers
             var LLL = LieECOManager.LoadAll().Where(A => A.HotelID == CurrentHotelID).OrderBy(A => A.ID).ToList();
 
             string GGG = CacheKey.KT_Timer_Controller + "_" + CurrentHotelCode;
-            var LLL1= CSRedisCacheHelper.Get_Partition<List<LingChenECO>>(GGG, 5);
+            var LLL1 = CSRedisCacheHelper.Get_Partition<List<LingChenECO>>(GGG, 5);
 
             string LieKey = CacheKey.LieECOKey + "_" + CurrentHotelID;
             if (LLL != null && LLL.Count > 0)
             {
                 var LLLData = LieECOManager.LoadAll().Where(A => A.HotelID == CurrentHotelID && A.IsEnable).ToList();
-                CSRedisCacheHelper.Set_Partition<List<LieECO>>(LieKey,LLLData,1);
+                CSRedisCacheHelper.Set_Partition<List<LieECO>>(LieKey, LLLData, 1);
             }
             if (nn != null)
             {
@@ -85,7 +85,7 @@ namespace WebSite.Controllers
                     RoomNoBodyHowTo = nn,
                     ECO_Setting = ECO,
                     LieECOList = LLL,
-                    TimerECO=LLL1
+                    TimerECO = LLL1
                 }, JsonRequestBehavior.AllowGet);
             }
             else
@@ -98,7 +98,7 @@ namespace WebSite.Controllers
                     HotelData = new { StartDayTime = hotelData.StartDayTime, EndDayTime = hotelData.EndDayTime },
                     ECO_Setting = ECO,
                     LieECOList = LLL,
-                    TimerECO=LLL1
+                    TimerECO = LLL1
                 }, JsonRequestBehavior.AllowGet);
             }
         }
@@ -251,6 +251,11 @@ namespace WebSite.Controllers
                     RoomNoBodyMananger.Update(no);
                     id4 = id;
                 }
+
+
+                QuanJuVar.HotelSeaon = HotelSeasonManager.LoadAll().Where(A => !A.IsDeleted).ToList();
+                QuanJuVar.HotelAirControl = HotelAirControlManager.LoadAll().ToList();
+
                 //string logDetail = "【" + String.Join(",", roomNumberList.ToArray()) + "】【" + HttpContext.InnerLanguage("AirProperty" + property.ToString()) + "】";
                 //SaveSystemLog(AUTHORITY_AirConditionControl, HttpContext.InnerLanguage("SetRoomAirProperty"), logDetail);
                 return Json(new { IsSuccess = true, Message = HttpContext.InnerLanguage("SaveSuccess"), ID1 = id1, ID2 = id2, ID3 = id3, ID4 = id4 });

WebSite/Controllers/ApiController.cs

@@ -5337,6 +5337,23 @@ namespace WebSite.Controllers
                     var hostServer = (IHostServer)MvcApplication.cxt.GetObject("RCUHost.HostServer");
                     hostServer.Start();
                 }
+
+                try
+                {
+                    var len = CSRedisCacheHelper.redis1.XLen("All_UDPPackage_Data");
+                    if (len >= 20)
+                    {
+                        logger.Error("Redis积压数据太多，要重启一下");
+                        var hostServer = (IHostServer)MvcApplication.cxt.GetObject("RCUHost.HostServer");
+                        hostServer.Start();
+                    }
+                }
+                catch (Exception ex)
+                {
+
+                }
+
+
                 var TotalKey = "UDPPackage_TotalRecvPackage";
                 UDPPackageCount LLL_T = null;
                 DataTongJi.TotalCount.TryGetValue(TotalKey, out LLL_T);
@@ -6491,6 +6508,7 @@ namespace WebSite.Controllers
                 }
             }
             QuanJuVar.BaoJingUpLoad = RoomTypeModalManager.LoadAllBaoJingUpload();
+            QuanJuVar.BaoJingUpLoad = QuanJuVar.RoomTypeDeviceModal.Where(A => A.IsUploadBaoJing == true).ToList();
             return true;
         }
         #endregion
@@ -6834,6 +6852,20 @@ namespace WebSite.Controllers
             }
         }
 
+        [HttpPost()]
+        public ActionResult NewServerTest()
+        {
+            try
+            {
+                return Json(new { IsSuccess = true, Result = "success" }, JsonRequestBehavior.AllowGet);
+            }
+            catch (Exception ex)
+            {
+                logger.Error(ex.Message);
+                return Json(new { IsSuccess = false, Result = "操作异常：" + ex.Message }, JsonRequestBehavior.AllowGet);
+            }
+        }
+
     }
     public class NReturnInfo
     {

WebSite/Controllers/HomeController.cs

@@ -133,7 +133,7 @@ namespace WebSite.Controllers
             return Redirect("/");//Request.UrlReferrer.ToString());
         }
 
-        [Authorize()]
+        //[Authorize()]
         public ActionResult LogOn()
         {
             string result = "";

WebSite/Global.asax.cs

@@ -51,6 +51,9 @@ namespace WebSite
 
         public static IHostServer hostServer { get; set; }
         public IRoomTypeModalManager RoomTypeModalManager { get; set; }
+
+        public IHotelSeasonManager HotelSeasonRepository { get; set; }
+        public IHotelAirControlManager HotelAirControlRepository { get; set; }
         //private IGroupManager GroupManager;
         //private IHostRoomCardManager HostRoomCardManager;
         private syncstatus.syncstatusSoapClient _client = null;//房态同步接口
@@ -139,8 +142,10 @@ namespace WebSite
             }
             //HeartBeat();
 
-            QuanJuVar.BaoJingUpLoad = RoomTypeModalManager.LoadAllBaoJingUpload();
-
+            QuanJuVar.RoomTypeDeviceModal = RoomTypeModalManager.LoadAllBaoJingUpload();
+            QuanJuVar.BaoJingUpLoad = QuanJuVar.RoomTypeDeviceModal.Where(A => A.IsUploadBaoJing == true).ToList();
+            QuanJuVar.HotelSeaon = HotelSeasonRepository.LoadAll().Where(A => A.IsDeleted==false).ToList();
+            QuanJuVar.HotelAirControl= HotelAirControlRepository.LoadAll().ToList();
             StartHostServer();
             BLWMQTT.StartMqtt();
 
@@ -526,6 +531,8 @@ namespace WebSite
             OverviewManager = (IOverviewManager)cxt.GetObject("Manager.Overview");
             HostModalManager = (IHostModalManager)cxt.GetObject("Manager.HostModal");
             RoomTypeModalManager = (IRoomTypeModalManager)cxt.GetObject("Manager.RoomTypeModal");
+            HotelSeasonRepository = (IHotelSeasonManager)cxt.GetObject("Manager.HotelSeason");
+            HotelAirControlRepository = (IHotelAirControlManager)cxt.GetObject("Manager.HotelAirControl");
             _client = new syncstatus.syncstatusSoapClient();
 
             Timer timer2 = new Timer(20000);//每20秒扫描一次

WebSite/Web.config

@@ -218,8 +218,8 @@
       </assemblies>
     </compilation>
     <authentication mode="Forms">
-      <!--<forms name="MyAuth" cookieless="UseCookies" loginUrl="~/LogOn" timeout="2880"/>-->
-      <forms name="MyAuth" cookieless="UseCookies" loginUrl="/Home/III" timeout="2880"/>
+      <forms name="MyAuth" cookieless="UseCookies" loginUrl="~/LogOn" timeout="2880"/>
+      <!--<forms name="MyAuth" cookieless="UseCookies" loginUrl="/Home/III" timeout="2880"/>-->
     </authentication>
     <pages validateRequest="false">
       <namespaces>