给宝易软件增加

UI/Controllers/UpgradeController.cs

@@ -497,7 +497,7 @@ namespace UI.Controllers
         /// 查询设备列表
         /// </summary>
         [HttpPost()]
-        public List<RCUDBData> QueryDeviceList(int HotelID, int RoomTypeID)
+        public ActionResult QueryDeviceList(int HotelID, int RoomTypeID)
         {
             try
             {
@@ -509,15 +509,14 @@ namespace UI.Controllers
                     ,`DevAddr`
                     ,`Process`
                     FROM `blv_rcu_db`.`tbl_configured_devlist`
-                    where `hoHotelID` ={0} and `RoomTypeID`={1};", HotelID, RoomTypeID);
+                    where `HotelID` ={0} and `RoomTypeID`={1};", HotelID, RoomTypeID);
                 var Data = SqlSugarBase.RcuDb.SqlQueryable<RCUDBData>(str).ToList();
-                return Data;
+                return Json(new { Status=1,Data=Data},JsonRequestBehavior.AllowGet);
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-
+                return Json(new { Status = -1, Message = "服务器错误", Detail = ex.Message  } ,JsonRequestBehavior.AllowGet);
             }
-            return new List<RCUDBData>();
         }