增加一些功能，比如 修正重启后，队列消费会报错的问题

WebSite/Controllers/ApiController.cs

@@ -801,7 +801,10 @@ namespace WebSite.Controllers
         /// <returns></returns>
         public ActionResult GetRoomSceneList(string jsonData)
         {
-
+            if (string.IsNullOrEmpty(jsonData.Trim()))
+            {
+                return Json(new { IsSuccess = false, Result = "非法调用" }, JsonRequestBehavior.AllowGet);
+            }
             Interlocked.Increment(ref WebAPI_TongJi.GetRoomSceneList);
             string start_time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
             try
@@ -5327,7 +5330,7 @@ namespace WebSite.Controllers
                 }
 
                 long jishu_error = Interlocked.Read(ref MvcApplication.UDPServerErrorCount);
-                if (jishu_error >= 3)
+                if (jishu_error >= 5)
                 {
                     logger.Error("重启了UDP服务器");
                     Interlocked.Exchange(ref MvcApplication.UDPServerErrorCount, 0);
@@ -6421,7 +6424,7 @@ namespace WebSite.Controllers
             }
             catch (Exception ex)
             {
-                logger.Error("同派出错:"+ex.Message);
+                logger.Error("同派出错:" + ex.Message);
                 return Json(new { IsSuccess = false, Message = HttpContext.InnerLanguage("SaveFailedBecause") + ex.Message });
             }
         }
@@ -6480,13 +6483,14 @@ namespace WebSite.Controllers
             foreach (Host host in hosts)//该房型下所有主机关联回路
             {
                 //删除掉上报的
-                CSRedisCacheHelper.Del_Partition(CacheKey.DingShiReportData + "_" + host.ID, 3);
+                //CSRedisCacheHelper.Del_Partition(CacheKey.DingShiReportData + "_" + host.ID, 3);
                 var hostModal = HostModalManager.GetByModalAddress(host.ID, roomTypeModal.ModalAddress);
                 if (null == hostModal)
                 {
                     HostModalManager.Save(new HostModal { HostID = host.ID, Modal = roomTypeModal, Status = 2, Time = 0, UpdateTime = DateTime.Now });
                 }
             }
+            QuanJuVar.BaoJingUpLoad = RoomTypeModalManager.LoadAllBaoJingUpload();
             return true;
         }
         #endregion
@@ -6642,7 +6646,7 @@ namespace WebSite.Controllers
             try
             {
                 var qqq = HostManager.LoadAllID_HostNumberMapping();
-                var qqq1 = qqq.Select(a => new { a.HostNumber, a.Id }).ToList();
+                var qqq1 = qqq.Select(a => new { a.HostNumber, a.Id, a.RoomTypeId }).ToList();
 
 
                 if (qqq1.Count > 0)
@@ -6653,7 +6657,7 @@ namespace WebSite.Controllers
                         if (!string.IsNullOrEmpty(item.HostNumber))
                         {
                             //CSRedisCacheHelper.HMSet(5, CacheKey.RoomNumber_HostNumber, item.HostNumber, item.RoomNumber);
-                            CSRedisCacheHelper.HMSet(5, CacheKey.HostId_HostNumber, item.HostNumber, item.Id);
+                            CSRedisCacheHelper.HMSet(5, CacheKey.HostId_HostNumber, item.HostNumber, item.Id + "#" + item.RoomTypeId);
                         }
                     }
                 }
@@ -6815,7 +6819,7 @@ namespace WebSite.Controllers
         {
             try
             {
-                HostServer.StopConsumerTasks();
+                //HostServer.StopConsumerTasks();
                 if (key.Equals("blw^_^wlb"))
                 {
                     var hostServer = (IHostServer)MvcApplication.cxt.GetObject("RCUHost.HostServer");

WebSite/Controllers/HomeController.cs

@@ -35,10 +35,29 @@ namespace WebSite.Controllers
         [Authorize]
         public ActionResult Index()
         {
-            //ViewData["Account"] = User.Identity.Name;
+            ViewData["Account"] = User.Identity.Name;
             return View("SimonIndex");
         }
 
+        public ActionResult III()
+        {
+            return View("DencyLogin");
+        }
+
+        public ActionResult Loo()
+        {
+            var name = Request.Form["username"].ToString();
+            var pwd = Request.Form["password"].ToString();
+            if (name.Equals("mima") && pwd.Equals("3dfc3922112f460e81c2b7b7221bd9ad"))
+            {
+                return View("LogOn");
+            }
+            else
+            {
+                return View("DencyLogin");
+            }
+        }
+
         [Authorize]
         public ActionResult MenuIndex()
         {
@@ -114,6 +133,7 @@ namespace WebSite.Controllers
             return Redirect("/");//Request.UrlReferrer.ToString());
         }
 
+        [Authorize()]
         public ActionResult LogOn()
         {
             string result = "";

WebSite/Controllers/RoomStatusController.cs

@@ -1081,10 +1081,16 @@ namespace WebSite.Controllers
                     //"Color": "#FF8C69",
                     //"Beep": false
                     string Address = row["Code"].ToString();
+                    string Name1 = ReturnNameByLanguage(row["Name"].ToString(), row["EName"].ToString(), row["TWName"].ToString());
+                    if (Name1.Contains("红外")||Name1.Contains("infrared")||Name1.Contains("雷达")||Name1.Contains("radar"))
+                    {
+                        continue; 
+                    }
+
                     services.Add(new
                     {
                         Code = row["Code"],
-                        Name = ReturnNameByLanguage(row["Name"].ToString(), row["EName"].ToString(), row["TWName"].ToString()),// (bool)Session["isCN"] ? row["Name"] : row["EName"],
+                        Name=Name1,
                         Value = row["Number"],
                         Color = row["Color"],
                         Beep = row["Beep"]