修改接口，完成显示屏接口

DataService/BLL/viewing_screen.cs

@@ -0,0 +1,179 @@
+/**  版本信息模板在安装目录下，可自行修改。
+* viewing_screen.cs
+*
+* 功 能： N/A
+* 类 名： viewing_screen
+*
+* Ver    变更日期             负责人  变更内容
+* ───────────────────────────────────
+* V0.01  2024/3/26 14:24:53   N/A    初版
+*
+* Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
+*┌──────────────────────────────────┐
+*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
+*│　版权所有：动软卓越（北京）科技有限公司　　　　　　　　　　　　　　│
+*└──────────────────────────────────┘
+*/
+using System;
+using System.Data;
+using System.Collections.Generic;
+using Maticsoft.Common;
+using DataService.Model;
+namespace DataService.BLL
+{
+	/// <summary>
+	/// viewing_screen
+	/// </summary>
+	public partial class viewing_screen
+	{
+		private readonly DataService.DAL.viewing_screen dal=new DataService.DAL.viewing_screen();
+		public viewing_screen()
+		{}
+		#region  BasicMethod
+		/// <summary>
+		/// 是否存在该记录
+		/// </summary>
+		public bool Exists(string ScreenId)
+		{
+			return dal.Exists(ScreenId);
+		}
+
+		/// <summary>
+		/// 增加一条数据
+		/// </summary>
+		public bool Add(DataService.Model.viewing_screen model)
+		{
+			return dal.Add(model);
+		}
+
+		/// <summary>
+		/// 更新一条数据
+		/// </summary>
+		public bool Update(DataService.Model.viewing_screen model)
+		{
+			return dal.Update(model);
+		}
+
+		/// <summary>
+		/// 删除一条数据
+		/// </summary>
+		public bool Delete(string ScreenId)
+		{
+			
+			return dal.Delete(ScreenId);
+		}
+		/// <summary>
+		/// 删除一条数据
+		/// </summary>
+		public bool DeleteList(string ScreenIdlist )
+		{
+			return dal.DeleteList(ScreenIdlist );
+		}
+
+		/// <summary>
+		/// 得到一个对象实体
+		/// </summary>
+		public DataService.Model.viewing_screen GetModel(string ScreenId)
+		{
+			
+			return dal.GetModel(ScreenId);
+		}
+
+		/// <summary>
+		/// 得到一个对象实体，从缓存中
+		/// </summary>
+		public DataService.Model.viewing_screen GetModelByCache(string ScreenId)
+		{
+			
+			string CacheKey = "viewing_screenModel-" + ScreenId;
+			object objModel = Maticsoft.Common.DataCache.GetCache(CacheKey);
+			if (objModel == null)
+			{
+				try
+				{
+					objModel = dal.GetModel(ScreenId);
+					if (objModel != null)
+					{
+						int ModelCache = Maticsoft.Common.ConfigHelper.GetConfigInt("ModelCache");
+						Maticsoft.Common.DataCache.SetCache(CacheKey, objModel, DateTime.Now.AddMinutes(ModelCache), TimeSpan.Zero);
+					}
+				}
+				catch{}
+			}
+			return (DataService.Model.viewing_screen)objModel;
+		}
+
+		/// <summary>
+		/// 获得数据列表
+		/// </summary>
+		public DataSet GetList(string strWhere)
+		{
+			return dal.GetList(strWhere);
+		}
+		/// <summary>
+		/// 获得数据列表
+		/// </summary>
+		public List<DataService.Model.viewing_screen> GetModelList(string strWhere)
+		{
+			DataSet ds = dal.GetList(strWhere);
+			return DataTableToList(ds.Tables[0]);
+		}
+		/// <summary>
+		/// 获得数据列表
+		/// </summary>
+		public List<DataService.Model.viewing_screen> DataTableToList(DataTable dt)
+		{
+			List<DataService.Model.viewing_screen> modelList = new List<DataService.Model.viewing_screen>();
+			int rowsCount = dt.Rows.Count;
+			if (rowsCount > 0)
+			{
+				DataService.Model.viewing_screen model;
+				for (int n = 0; n < rowsCount; n++)
+				{
+					model = dal.DataRowToModel(dt.Rows[n]);
+					if (model != null)
+					{
+						modelList.Add(model);
+					}
+				}
+			}
+			return modelList;
+		}
+
+		/// <summary>
+		/// 获得数据列表
+		/// </summary>
+		public DataSet GetAllList()
+		{
+			return GetList("");
+		}
+
+		/// <summary>
+		/// 分页获取数据列表
+		/// </summary>
+		public int GetRecordCount(string strWhere)
+		{
+			return dal.GetRecordCount(strWhere);
+		}
+		/// <summary>
+		/// 分页获取数据列表
+		/// </summary>
+		public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
+		{
+			return dal.GetListByPage( strWhere,  orderby,  startIndex,  endIndex);
+		}
+		/// <summary>
+		/// 分页获取数据列表
+		/// </summary>
+		//public DataSet GetList(int PageSize,int PageIndex,string strWhere)
+		//{
+			//return dal.GetList(PageSize,PageIndex,strWhere);
+		//}
+
+		#endregion  BasicMethod
+		#region  ExtensionMethod
+
+		#endregion  ExtensionMethod
+	}
+}
+

DataService/DAL/viewing_screen.cs

@@ -0,0 +1,364 @@
+/**  版本信息模板在安装目录下，可自行修改。
+* viewing_screen.cs
+*
+* 功 能： N/A
+* 类 名： viewing_screen
+*
+* Ver    变更日期             负责人  变更内容
+* ───────────────────────────────────
+* V0.01  2024/3/26 14:24:53   N/A    初版
+*
+* Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
+*┌──────────────────────────────────┐
+*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
+*│　版权所有：动软卓越（北京）科技有限公司　　　　　　　　　　　　　　│
+*└──────────────────────────────────┘
+*/
+using System;
+using System.Data;
+using System.Text;
+using MySql.Data.MySqlClient;
+using Maticsoft.DBUtility;//Please add references
+namespace DataService.DAL
+{
+	/// <summary>
+	/// 数据访问类:viewing_screen
+	/// </summary>
+	public partial class viewing_screen
+	{
+		public viewing_screen()
+		{}
+		#region  BasicMethod
+
+		/// <summary>
+		/// 是否存在该记录
+		/// </summary>
+		public bool Exists(string ScreenId)
+		{
+			StringBuilder strSql=new StringBuilder();
+			strSql.Append("select count(1) from viewing_screen");
+			strSql.Append(" where ScreenId=@ScreenId ");
+			MySqlParameter[] parameters = {
+					new MySqlParameter("@ScreenId", MySqlDbType.VarChar,255)			};
+			parameters[0].Value = ScreenId;
+
+			return DbHelperMySQL.Exists(strSql.ToString(),parameters);
+		}
+
+
+		/// <summary>
+		/// 增加一条数据
+		/// </summary>
+		public bool Add(DataService.Model.viewing_screen model)
+		{
+			StringBuilder strSql=new StringBuilder();
+			strSql.Append("insert into viewing_screen(");
+			strSql.Append("ScreenId,ScreenName,ScreenAlarm,ScreenState,CreateTime,EntireTime,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5)");
+			strSql.Append(" values (");
+			strSql.Append("@ScreenId,@ScreenName,@ScreenAlarm,@ScreenState,@CreateTime,@EntireTime,@Reserve1,@Reserve2,@Reserve3,@Reserve4,@Reserve5)");
+			MySqlParameter[] parameters = {
+					new MySqlParameter("@ScreenId", MySqlDbType.VarChar,255),
+					new MySqlParameter("@ScreenName", MySqlDbType.VarChar,255),
+					new MySqlParameter("@ScreenAlarm", MySqlDbType.VarChar,255),
+					new MySqlParameter("@ScreenState", MySqlDbType.VarChar,255),
+					new MySqlParameter("@CreateTime", MySqlDbType.DateTime),
+					new MySqlParameter("@EntireTime", MySqlDbType.DateTime),
+					new MySqlParameter("@Reserve1", MySqlDbType.VarChar,255),
+					new MySqlParameter("@Reserve2", MySqlDbType.VarChar,255),
+					new MySqlParameter("@Reserve3", MySqlDbType.VarChar,255),
+					new MySqlParameter("@Reserve4", MySqlDbType.VarChar,255),
+					new MySqlParameter("@Reserve5", MySqlDbType.VarChar,255)};
+			parameters[0].Value = model.ScreenId;
+			parameters[1].Value = model.ScreenName;
+			parameters[2].Value = model.ScreenAlarm;
+			parameters[3].Value = model.ScreenState;
+			parameters[4].Value = model.CreateTime;
+			parameters[5].Value = model.EntireTime;
+			parameters[6].Value = model.Reserve1;
+			parameters[7].Value = model.Reserve2;
+			parameters[8].Value = model.Reserve3;
+			parameters[9].Value = model.Reserve4;
+			parameters[10].Value = model.Reserve5;
+
+			int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters);
+			if (rows > 0)
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+		/// <summary>
+		/// 更新一条数据
+		/// </summary>
+		public bool Update(DataService.Model.viewing_screen model)
+		{
+			StringBuilder strSql=new StringBuilder();
+			strSql.Append("update viewing_screen set ");
+			strSql.Append("ScreenName=@ScreenName,");
+			strSql.Append("ScreenAlarm=@ScreenAlarm,");
+			strSql.Append("ScreenState=@ScreenState,");
+			strSql.Append("CreateTime=@CreateTime,");
+			strSql.Append("EntireTime=@EntireTime,");
+			strSql.Append("Reserve1=@Reserve1,");
+			strSql.Append("Reserve2=@Reserve2,");
+			strSql.Append("Reserve3=@Reserve3,");
+			strSql.Append("Reserve4=@Reserve4,");
+			strSql.Append("Reserve5=@Reserve5");
+			strSql.Append(" where ScreenId=@ScreenId ");
+			MySqlParameter[] parameters = {
+					new MySqlParameter("@ScreenName", MySqlDbType.VarChar,255),
+					new MySqlParameter("@ScreenAlarm", MySqlDbType.VarChar,255),
+					new MySqlParameter("@ScreenState", MySqlDbType.VarChar,255),
+					new MySqlParameter("@CreateTime", MySqlDbType.DateTime),
+					new MySqlParameter("@EntireTime", MySqlDbType.DateTime),
+					new MySqlParameter("@Reserve1", MySqlDbType.VarChar,255),
+					new MySqlParameter("@Reserve2", MySqlDbType.VarChar,255),
+					new MySqlParameter("@Reserve3", MySqlDbType.VarChar,255),
+					new MySqlParameter("@Reserve4", MySqlDbType.VarChar,255),
+					new MySqlParameter("@Reserve5", MySqlDbType.VarChar,255),
+					new MySqlParameter("@ScreenId", MySqlDbType.VarChar,255)};
+			parameters[0].Value = model.ScreenName;
+			parameters[1].Value = model.ScreenAlarm;
+			parameters[2].Value = model.ScreenState;
+			parameters[3].Value = model.CreateTime;
+			parameters[4].Value = model.EntireTime;
+			parameters[5].Value = model.Reserve1;
+			parameters[6].Value = model.Reserve2;
+			parameters[7].Value = model.Reserve3;
+			parameters[8].Value = model.Reserve4;
+			parameters[9].Value = model.Reserve5;
+			parameters[10].Value = model.ScreenId;
+
+			int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters);
+			if (rows > 0)
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// 删除一条数据
+		/// </summary>
+		public bool Delete(string ScreenId)
+		{
+			
+			StringBuilder strSql=new StringBuilder();
+			strSql.Append("delete from viewing_screen ");
+			strSql.Append(" where ScreenId=@ScreenId ");
+			MySqlParameter[] parameters = {
+					new MySqlParameter("@ScreenId", MySqlDbType.VarChar,255)			};
+			parameters[0].Value = ScreenId;
+
+			int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters);
+			if (rows > 0)
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+		/// <summary>
+		/// 批量删除数据
+		/// </summary>
+		public bool DeleteList(string ScreenIdlist )
+		{
+			StringBuilder strSql=new StringBuilder();
+			strSql.Append("delete from viewing_screen ");
+			strSql.Append(" where ScreenId in ("+ScreenIdlist + ")  ");
+			int rows=DbHelperMySQL.ExecuteSql(strSql.ToString());
+			if (rows > 0)
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+
+		/// <summary>
+		/// 得到一个对象实体
+		/// </summary>
+		public DataService.Model.viewing_screen GetModel(string ScreenId)
+		{
+			
+			StringBuilder strSql=new StringBuilder();
+			strSql.Append("select ScreenId,ScreenName,ScreenAlarm,ScreenState,CreateTime,EntireTime,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5 from viewing_screen ");
+			strSql.Append(" where ScreenId=@ScreenId ");
+			MySqlParameter[] parameters = {
+					new MySqlParameter("@ScreenId", MySqlDbType.VarChar,255)			};
+			parameters[0].Value = ScreenId;
+
+			DataService.Model.viewing_screen model=new DataService.Model.viewing_screen();
+			DataSet ds=DbHelperMySQL.Query(strSql.ToString(),parameters);
+			if(ds.Tables[0].Rows.Count>0)
+			{
+				return DataRowToModel(ds.Tables[0].Rows[0]);
+			}
+			else
+			{
+				return null;
+			}
+		}
+
+
+		/// <summary>
+		/// 得到一个对象实体
+		/// </summary>
+		public DataService.Model.viewing_screen DataRowToModel(DataRow row)
+		{
+			DataService.Model.viewing_screen model=new DataService.Model.viewing_screen();
+			if (row != null)
+			{
+				if(row["ScreenId"]!=null)
+				{
+					model.ScreenId=row["ScreenId"].ToString();
+				}
+				if(row["ScreenName"]!=null)
+				{
+					model.ScreenName=row["ScreenName"].ToString();
+				}
+				if(row["ScreenAlarm"]!=null)
+				{
+					model.ScreenAlarm=row["ScreenAlarm"].ToString();
+				}
+				if(row["ScreenState"]!=null)
+				{
+					model.ScreenState=row["ScreenState"].ToString();
+				}
+				if(row["CreateTime"]!=null && row["CreateTime"].ToString()!="")
+				{
+					model.CreateTime=DateTime.Parse(row["CreateTime"].ToString());
+				}
+				if(row["EntireTime"]!=null && row["EntireTime"].ToString()!="")
+				{
+					model.EntireTime=DateTime.Parse(row["EntireTime"].ToString());
+				}
+				if(row["Reserve1"]!=null)
+				{
+					model.Reserve1=row["Reserve1"].ToString();
+				}
+				if(row["Reserve2"]!=null)
+				{
+					model.Reserve2=row["Reserve2"].ToString();
+				}
+				if(row["Reserve3"]!=null)
+				{
+					model.Reserve3=row["Reserve3"].ToString();
+				}
+				if(row["Reserve4"]!=null)
+				{
+					model.Reserve4=row["Reserve4"].ToString();
+				}
+				if(row["Reserve5"]!=null)
+				{
+					model.Reserve5=row["Reserve5"].ToString();
+				}
+			}
+			return model;
+		}
+
+		/// <summary>
+		/// 获得数据列表
+		/// </summary>
+		public DataSet GetList(string strWhere)
+		{
+			StringBuilder strSql=new StringBuilder();
+			strSql.Append("select ScreenId,ScreenName,ScreenAlarm,ScreenState,CreateTime,EntireTime,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5 ");
+			strSql.Append(" FROM viewing_screen ");
+			if(strWhere.Trim()!="")
+			{
+				strSql.Append(" where "+strWhere);
+			}
+			return DbHelperMySQL.Query(strSql.ToString());
+		}
+
+		/// <summary>
+		/// 获取记录总数
+		/// </summary>
+		public int GetRecordCount(string strWhere)
+		{
+			StringBuilder strSql=new StringBuilder();
+			strSql.Append("select count(1) FROM viewing_screen ");
+			if(strWhere.Trim()!="")
+			{
+				strSql.Append(" where "+strWhere);
+			}
+			object obj = DbHelperSQL.GetSingle(strSql.ToString());
+			if (obj == null)
+			{
+				return 0;
+			}
+			else
+			{
+				return Convert.ToInt32(obj);
+			}
+		}
+		/// <summary>
+		/// 分页获取数据列表
+		/// </summary>
+		public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
+		{
+			StringBuilder strSql=new StringBuilder();
+			strSql.Append("SELECT * FROM ( ");
+			strSql.Append(" SELECT ROW_NUMBER() OVER (");
+			if (!string.IsNullOrEmpty(orderby.Trim()))
+			{
+				strSql.Append("order by T." + orderby );
+			}
+			else
+			{
+				strSql.Append("order by T.ScreenId desc");
+			}
+			strSql.Append(")AS Row, T.*  from viewing_screen T ");
+			if (!string.IsNullOrEmpty(strWhere.Trim()))
+			{
+				strSql.Append(" WHERE " + strWhere);
+			}
+			strSql.Append(" ) TT");
+			strSql.AppendFormat(" WHERE TT.Row between {0} and {1}", startIndex, endIndex);
+			return DbHelperMySQL.Query(strSql.ToString());
+		}
+
+		/*
+		/// <summary>
+		/// 分页获取数据列表
+		/// </summary>
+		public DataSet GetList(int PageSize,int PageIndex,string strWhere)
+		{
+			MySqlParameter[] parameters = {
+					new MySqlParameter("@tblName", MySqlDbType.VarChar, 255),
+					new MySqlParameter("@fldName", MySqlDbType.VarChar, 255),
+					new MySqlParameter("@PageSize", MySqlDbType.Int32),
+					new MySqlParameter("@PageIndex", MySqlDbType.Int32),
+					new MySqlParameter("@IsReCount", MySqlDbType.Bit),
+					new MySqlParameter("@OrderType", MySqlDbType.Bit),
+					new MySqlParameter("@strWhere", MySqlDbType.VarChar,1000),
+					};
+			parameters[0].Value = "viewing_screen";
+			parameters[1].Value = "ScreenId";
+			parameters[2].Value = PageSize;
+			parameters[3].Value = PageIndex;
+			parameters[4].Value = 0;
+			parameters[5].Value = 0;
+			parameters[6].Value = strWhere;	
+			return DbHelperMySQL.RunProcedure("UP_GetRecordByPage",parameters,"ds");
+		}*/
+
+		#endregion  BasicMethod
+		#region  ExtensionMethod
+
+		#endregion  ExtensionMethod
+	}
+}
+

DataService/DataService.csproj

@@ -105,6 +105,7 @@
     <Compile Include="BLL\multi_rate.cs" />
     <Compile Include="BLL\pollution_discharge.cs" />
     <Compile Include="BLL\unit_list.cs" />
+    <Compile Include="BLL\viewing_screen.cs" />
     <Compile Include="DAL\boot_strategy.cs" />
     <Compile Include="DAL\device_info.cs" />
     <Compile Include="DAL\electricity_data.cs" />
@@ -114,6 +115,7 @@
     <Compile Include="DAL\multi_rate.cs" />
     <Compile Include="DAL\pollution_discharge.cs" />
     <Compile Include="DAL\unit_list.cs" />
+    <Compile Include="DAL\viewing_screen.cs" />
     <Compile Include="Model\boot_strategy.cs" />
     <Compile Include="Model\device_info.cs" />
     <Compile Include="Model\electricity_data.cs" />
@@ -123,6 +125,7 @@
     <Compile Include="Model\multi_rate.cs" />
     <Compile Include="Model\pollution_discharge.cs" />
     <Compile Include="Model\unit_list.cs" />
+    <Compile Include="Model\viewing_screen.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup />

DataService/Model/viewing_screen.cs

@@ -0,0 +1,132 @@
+/**  版本信息模板在安装目录下，可自行修改。
+* viewing_screen.cs
+*
+* 功 能： N/A
+* 类 名： viewing_screen
+*
+* Ver    变更日期             负责人  变更内容
+* ───────────────────────────────────
+* V0.01  2024/3/26 14:24:53   N/A    初版
+*
+* Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
+*┌──────────────────────────────────┐
+*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
+*│　版权所有：动软卓越（北京）科技有限公司　　　　　　　　　　　　　　│
+*└──────────────────────────────────┘
+*/
+using System;
+namespace DataService.Model
+{
+	/// <summary>
+	/// viewing_screen:实体类(属性说明自动提取数据库字段的描述信息)
+	/// </summary>
+	[Serializable]
+	public partial class viewing_screen
+	{
+		public viewing_screen()
+		{}
+		#region Model
+		private string _screenid;
+		private string _screenname;
+		private string _screenalarm;
+		private string _screenstate;
+		private DateTime? _createtime;
+		private DateTime? _entiretime;
+		private string _reserve1;
+		private string _reserve2;
+		private string _reserve3;
+		private string _reserve4;
+		private string _reserve5;
+		/// <summary>
+		/// 
+		/// </summary>
+		public string ScreenId
+		{
+			set{ _screenid=value;}
+			get{return _screenid;}
+		}
+		/// <summary>
+		/// 
+		/// </summary>
+		public string ScreenName
+		{
+			set{ _screenname=value;}
+			get{return _screenname;}
+		}
+		/// <summary>
+		/// 
+		/// </summary>
+		public string ScreenAlarm
+		{
+			set{ _screenalarm=value;}
+			get{return _screenalarm;}
+		}
+		/// <summary>
+		/// 
+		/// </summary>
+		public string ScreenState
+		{
+			set{ _screenstate=value;}
+			get{return _screenstate;}
+		}
+		/// <summary>
+		/// 
+		/// </summary>
+		public DateTime? CreateTime
+		{
+			set{ _createtime=value;}
+			get{return _createtime;}
+		}
+		/// <summary>
+		/// 
+		/// </summary>
+		public DateTime? EntireTime
+		{
+			set{ _entiretime=value;}
+			get{return _entiretime;}
+		}
+		/// <summary>
+		/// 
+		/// </summary>
+		public string Reserve1
+		{
+			set{ _reserve1=value;}
+			get{return _reserve1;}
+		}
+		/// <summary>
+		/// 
+		/// </summary>
+		public string Reserve2
+		{
+			set{ _reserve2=value;}
+			get{return _reserve2;}
+		}
+		/// <summary>
+		/// 
+		/// </summary>
+		public string Reserve3
+		{
+			set{ _reserve3=value;}
+			get{return _reserve3;}
+		}
+		/// <summary>
+		/// 
+		/// </summary>
+		public string Reserve4
+		{
+			set{ _reserve4=value;}
+			get{return _reserve4;}
+		}
+		/// <summary>
+		/// 
+		/// </summary>
+		public string Reserve5
+		{
+			set{ _reserve5=value;}
+			get{return _reserve5;}
+		}
+		#endregion Model
+
+	}
+}
+

DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-3d7b754a8e6bef93a538695d1bf4b7d4c716a7b3
+3293909a0dc8db44a592efac06c1049f33aa95ca

LonglslandExhibitionCenter/Controllers/api/GetAirconditioningLoadController.cs

@@ -56,9 +56,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
             }
             catch (Exception ex)
             {
-
                 res.code = 500;
-                res.msg = ex.Message;
+                res.msg ="失败:"+ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetBigScreenController.cs

@@ -16,6 +16,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
     /// </summary>
     public class GetBigScreenController : ApiController
     {
+        DataService.BLL.viewing_screen bll = new DataService.BLL.viewing_screen();
         public HttpResponseMessage Get()
         {
             var res = new get_big_screen();
@@ -23,15 +24,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
             {
                 var data = new List<big_screenData>();
                 var now = DateTime.Now;
-                for (int i = 0; i < 10; i++)
+                var list = bll.GetModelList("");
+                foreach (var item in list)
                 {
-                    var model = new big_screenData()
+                    if (item.ScreenState == "0")
                     {
-                        Device = "LED1",
-                        Place = "1楼中廊",
-                        time = now.ToString("yyyy-MM-dd HH:mm:ss")
-                    };
-                    data.Add(model);
+                        var model = new big_screenData()
+                        {
+                            Device = item.ScreenName,
+                            Place = item.Reserve1 + "层",
+                            time = Convert.ToString(item.CreateTime),
+                        };
+                        data.Add(model);
+                    }
                 }
                 res.code = 200;
                 res.msg = "成功";
@@ -40,7 +45,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
             catch (Exception ex)
             {
                 res.code = 500;
-                res.msg = "失败，" + ex.Message;
+                res.msg ="失败:"+ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetBootStrategyController.cs

@@ -40,7 +40,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
             catch (Exception ex)
             {
                 res.code = 500;
-                res.msg = "失败，" + ex.Message;
+                res.msg = "失败:" + ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs

@@ -24,12 +24,10 @@ namespace LonglslandExhibitionCenter.Controllers.api
             {
                 var data = new List<carbon_emissionData>();
                 var now = DateTime.Now;
-
                 if (!string.IsNullOrEmpty(date))
                 {
                     if (date == "月")
                     {
-
                         var time_count = Convert.ToInt32(DateTime.Now.Month);
                         for (int i = 0; i < time_count; i++)
                         {
@@ -52,12 +50,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             }
                             else
                             {
-                                var stime1 = Convert.ToDateTime(now.AddMonths(-i+1).ToString("yyyy-MM-01 00:00:00"));
-                                sdate = stime1.AddDays(-1).ToString("yyyy-MM-dd 00:00:00");
+                                sdate = now.AddMonths(-i+1).ToString("yyyy-MM-01 00:00:00");
                             }
                             var edate = now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00");
-                            var slist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime);
-                            var elist = bll.GetModelListDate(" EntireTime='" + edate + "'", etime);
+                            var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
+                            var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
                             decimal? num1 = slist.Sum(x => x.EH);
                             decimal? num2 = elist.Sum(x => x.EH);
                             var model = new carbon_emissionData()
@@ -99,8 +96,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
                                 sdate = now.AddYears(-i+1).ToString("yyyy-01-01 00:00:00");
                             }
                             var edate = now.AddYears(-i).ToString("yyyy-01-01 00:00:00");
-                            var slist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime);
-                            var elist = bll.GetModelListDate(" EntireTime='" + edate + "'", etime);
+                            var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
+                            var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
                             decimal? num1 = slist.Sum(x => x.EH);
                             decimal? num2 = elist.Sum(x => x.EH);
                             var model = new carbon_emissionData()
@@ -125,13 +122,12 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     res.code = 201;
                     res.msg = "参数不能为空";
                 }
-
             }
             catch (Exception ex)
             {
 
                 res.code = 500;
-                res.msg = ex.Message;
+                res.msg ="失败:"+ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs

@@ -35,7 +35,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
             try
             {
                 var data = new List<carbon_fluxData>();
-                var list = bll.GetModelListDate("", time);
+                var list = bll.GetModelListDate(" Reserve1!='配电室高压' and Reserve1!='电能-室外箱变'", time);
                 var sdate = Convert.ToDateTime(DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"));
                 var edate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
                 #region 电
@@ -79,9 +79,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
             }
             catch (Exception ex)
             {
-
                 res.code = 500;
-                res.msg = ex.Message;
+                res.msg = "失败:" + ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs

@@ -34,7 +34,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
             try
             {
                 var data = new List<carbon_intensityData>();
-                var list = bll.GetModelListDate("", time);
+                var list = bll.GetModelListDate(" Reserve1='配电室高压'", time);
                 var now=DateTime.Now;
                 var time_count = Convert.ToInt32(DateTime.Now.Month);
                 for (int i = 0; i < time_count; i++)
@@ -46,8 +46,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     }
                     else
                     {
-                        var sdate1 = now.AddMonths(-i + 1).ToString("yyyy-MM-01 00:00:00");
-                        sdate = Convert.ToDateTime(sdate1).ToString("yyyy-MM-dd 00:00:00");
+                        sdate = now.AddMonths(-i + 1).ToString("yyyy-MM-01 00:00:00");
                     }
                     var edate = now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00");
                     var etime = Convert.ToDateTime(edate).ToString("yyyyMM");
@@ -63,6 +62,10 @@ namespace LonglslandExhibitionCenter.Controllers.api
                         time = DateTime.Now.AddMonths(-i).ToString("MM月"),
                         CarbonIntensity = Convert.ToDecimal(Math.Round(Convert.ToDouble(alist.Sum(x => x.EH) - blist.Sum(x => x.EH)) / 1000 * 0.5703, 3))
                     };
+                    if (model.CarbonIntensity < 0)
+                    {
+                        model.CarbonIntensity = 0;
+                    }
                     data.Add(model);
                 }
                 var adata = data.OrderBy(x => x.time).ToList();
@@ -74,7 +77,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
             {
 
                 res.code = 500;
-                res.msg = ex.Message;
+                res.msg = "失败:" + ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetCarbonNeutralController.cs

@@ -16,7 +16,6 @@ namespace LonglslandExhibitionCenter.Controllers.api
     /// </summary>
     public class GetCarbonNeutralController : ApiController
     {
-        ///DataService.BLL.electricity_data bll = new DataService.BLL.electricity_data();
         // GET api/<controller>
         public HttpResponseMessage Get()
         {
@@ -44,7 +43,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
             {
 
                 res.code = 500;
-                res.msg = ex.Message;
+                res.msg = "失败:" + ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetCarbonOverviewController.cs

@@ -38,8 +38,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             string sdate;
                             sdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                             var edate = now.ToString("yyyy-dd-01 00:00:00");
-                            var slist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime);
-                            var elist = bll.GetModelListDate(" EntireTime='" + edate + "'", stime);
+                            var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
+                            var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", stime);
                             decimal? num1 = slist.Sum(x => x.EH);
                             decimal? num2 = elist.Sum(x => x.EH);
                             var model = new carbon_overviewData()
@@ -71,8 +71,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             string sdate;
                             sdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                             var edate = now.ToString("yyyy-01-01 00:00:00");
-                            var slist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime);
-                            var elist = bll.GetModelListDate(" EntireTime='" + edate + "'", etime);
+                            var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
+                            var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
                             decimal? num1 = slist.Sum(x => x.EH);
                             decimal? num2 = elist.Sum(x => x.EH);
                             var model = new carbon_overviewData()
@@ -100,9 +100,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
             }
             catch (Exception ex)
             {
-
                 res.code = 500;
-                res.msg = ex.Message;
+                res.msg ="失败:"+ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetCarbonTrendController.cs

@@ -34,7 +34,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
             try
             {
                 var data = new List<carbon_trendData>();
-                var list = bll.GetModelListDate("", time);
+                var list = bll.GetModelListDate(" Reserve1='配电室高压'", time);
                 var now=DateTime.Now;
                 if(!string.IsNullOrEmpty(date))
                 {
@@ -60,6 +60,10 @@ namespace LonglslandExhibitionCenter.Controllers.api
                                 time = DateTime.Now.AddDays(-i).ToString("dd日"),
                                 EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(alist.Sum(x => x.EH) - blist.Sum(x => x.EH)) / 1000 * 0.5703, 3))
                             };
+                            if (model.EH < 0)
+                            {
+                                model.EH = 0;
+                            }
                             data.Add(model);
                         }
                     }
@@ -75,8 +79,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             }
                             else
                             {
-                               var sdate1 = now.AddMonths(-i+1).ToString("yyyy-MM-01 00:00:00");
-                                sdate = Convert.ToDateTime(sdate1).AddDays(-1).ToString("yyyy-MM-dd 00:00:00");
+                                sdate = now.AddMonths(-i+1).ToString("yyyy-MM-01 00:00:00");
+                                //sdate = Convert.ToDateTime(sdate1).AddDays(-1).ToString("yyyy-MM-dd 00:00:00");
                             }
                             var edate = now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00");
                             var etime = Convert.ToDateTime(edate).ToString("yyyyMM");
@@ -85,13 +89,23 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             {
                                 bll.CreateTable(etime);
                             }
-                            var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList();
-                            var blist = list.Where(x => x.EntireTime == Convert.ToDateTime(edate)).ToList();
+                            string stime = Convert.ToDateTime(sdate).ToString("yyyyMM");
+                            var c = bll.IsExistsTable(date_base, "electricity_data_" + stime);
+                            if(c == false)
+                            {
+                                bll.CreateTable(stime);
+                            }
+                            var alist = bll.GetModelListDate(" EntireTime='"+sdate+ "' and Reserve1='配电室高压'", stime);
+                            var blist=bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
                             var model = new carbon_trendData()
                             {
                                 time = DateTime.Now.AddMonths(-i).ToString("MM月"),
                                 EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(alist.Sum(x => x.EH) - blist.Sum(x => x.EH)) / 1000 * 0.5703, 3))
                             };
+                            if (model.EH < 0)
+                            {
+                                model.EH = 0;
+                            }
                             data.Add(model);
                         }
                     }
@@ -110,7 +124,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
             {
 
                 res.code = 500;
-                res.msg = ex.Message;
+                res.msg = "失败:" + ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs

@@ -35,12 +35,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 {
                     bll.CreateTable(time);
                 }
-                var list = bll.GetModelListDate("", time);
+                var list = bll.GetModelListDate(" Reserve1='配电室高压'", time);
                 for (int i = 1; i < time_count; i++)
                 {
-                    
                     var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
-                    var sdate = now.AddHours(-(i + 1)).ToString("yyyy-MM-dd HH:00:00");
+                    var sdate = now.AddHours(-(i + 1) ).ToString("yyyy-MM-dd HH:00:00");
                     var jlist = list.Where(x => x.EntireTime == Convert.ToDateTime(jdate)).ToList();
                     var slist=list.Where(x=>x.EntireTime==Convert.ToDateTime(sdate)).ToList();
                     var num1 = jlist.Sum(x => x.EH);
@@ -61,10 +60,10 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 res.msg = "成功";
                 res.data = adata;
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-
-                throw;
+                res.code = 500;
+                res.msg = "失败:" + ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs

@@ -55,9 +55,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
             }
             catch (Exception ex)
             {
-
                 res.code = 500;
-                res.msg = ex.Message;
+                res.msg ="失败:"+ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetDrainHeadingController.cs

@@ -90,9 +90,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
             }
             catch (Exception ex)
             {
-
                 res.code = 500;
-                res.msg = ex.Message;
+                res.msg ="失败:"+ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs

@@ -25,17 +25,26 @@ namespace LonglslandExhibitionCenter.Controllers.api
             {
                 var data = new List<electricity_consumptionData>();
                 var now=DateTime.Now;
-                
                 if (!string.IsNullOrEmpty(date))
                 {
                     if (date == "月")
                     {
-
                         var time_count = Convert.ToInt32(DateTime.Now.Month);
                         for (int i = 0; i < time_count; i++)
                         {
-                            var stime = now.AddMonths(-i).ToString("yyyyMM");
-                            var etime = now.AddMonths(-(i + 1)).ToString("yyyyMM");
+                            string sdate;
+                            if (i == 0)
+                            {
+                                 sdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
+                            }
+                            else
+                            {
+                                sdate = now.AddMonths(-i+1).ToString("yyyy-MM-01 00:00:00");
+                                //sdate = stime1.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd 00:00:00");
+                            }
+                            var edate = now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00");
+                            var stime = Convert.ToDateTime(sdate).ToString("yyyyMM");
+                            var etime = Convert.ToDateTime(edate).ToString("yyyyMM");
                             var a = bll.IsExistsTable("changdao_zhanlanguang", "electricity_data_" + stime);
                             if (a == false)
                             {
@@ -46,19 +55,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             {
                                 bll.CreateTable(etime);
                             }
-                            string sdate;
-                            if (i == 0)
-                            {
-                                 sdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
-                            }
-                            else
-                            {
-                                var stime1 =Convert.ToDateTime(now.AddMonths(-i).ToString("yyyy-MM-dd 00:00:00"));
-                                sdate = stime1.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd 00:00:00");
-                            }
-                            var edate = now.AddMonths(-i).ToString("yyyy-dd-01 00:00:00");
-                            var slist = bll.GetModelListDate(" EntireTime='"+sdate+"'", stime);
-                            var elist = bll.GetModelListDate(" EntireTime='"+edate+"'", etime);
+                            var slist = bll.GetModelListDate(" EntireTime='"+sdate+ "' and Reserve1='配电室高压'", stime);
+                            var elist = bll.GetModelListDate(" EntireTime='"+edate+ "' and Reserve1='配电室高压'", etime);
                             decimal? num1 = slist.Sum(x => x.EH);
                             decimal? num2=elist.Sum(x => x.EH);
                             var model = new electricity_consumptionData()
@@ -78,8 +76,18 @@ namespace LonglslandExhibitionCenter.Controllers.api
                         var time_count = Convert.ToInt32(DateTime.Now.Year) - 2023;
                         for (int i = 0; i < time_count; i++)
                         {
-                            var stime = now.AddYears(-i).ToString("yyyyMM");
-                            var etime = now.AddYears(-(i + 1)).ToString("yyyyMM");
+                            string sdate;
+                            if (i == 0)
+                            {
+                                sdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
+                            }
+                            else
+                            {
+                                sdate = now.AddYears(-i + 1).ToString("yyyy-01-01 00:00:00");
+                            }
+                            var edate = now.AddYears(-i).ToString("yyyy-01-01 00:00:00");
+                            var stime = Convert.ToDateTime(sdate).ToString("yyyyMM");
+                            var etime = Convert.ToDateTime(edate).ToString("yyyyMM");
                             var a = bll.IsExistsTable("changdao_zhanlanguang", "electricity_data_" + stime);
                             if (a == false)
                             {
@@ -90,18 +98,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             {
                                 bll.CreateTable(etime);
                             }
-                            string sdate;
-                            if (i == 0)
-                            {
-                                sdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
-                            }
-                            else
-                            {
-                                sdate = now.AddYears(-i).ToString("yyyy-12-31 00:00:00");
-                            }
-                            var edate = now.AddYears(-(i+1)).ToString("yyyy-12-31 00:00:00");
-                            var slist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime);
-                            var elist = bll.GetModelListDate(" EntireTime='" + edate + "'", etime);
+                            var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
+                            var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
                             decimal? num1 = slist.Sum(x => x.EH);
                             decimal? num2 = elist.Sum(x => x.EH);
                             var model = new electricity_consumptionData()
@@ -116,7 +114,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             data.Add(model);
                         }
                     }
-                   var adata=data.OrderBy(x=>x.time).ToList();
+                    var adata=data.OrderBy(x=>x.time).ToList();
                     res.code = 200;
                     res.msg = "成功";
                     res.data = adata;
@@ -126,13 +124,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     res.code = 201;
                     res.msg = "参数不能为空";
                 }
-               
             }
             catch (Exception ex)
             {
-
                 res.code = 500;
-                res.msg = ex.Message;
+                res.msg ="失败:"+ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetElectricalConditionController.cs

@@ -37,7 +37,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 #region 日
                 var jdate1 = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                 var sdate1 = now.ToString("yyyy-MM-dd 00:00:00");
-                var list = bll.GetModelListDate("", time);
+                var list = bll.GetModelListDate(" Reserve2='%空调%'", time);
                 var jlist1 = list.Where(x => x.EntireTime == Convert.ToDateTime(jdate1)).ToList();
                 var slist1 = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate1)).ToList();
                 var amodel = new electrical_conditionData()
@@ -63,13 +63,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 var jdate3 = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                 var sdate3 = now.ToString("yyyy-01-01 00:00:00");
                 var jlist3 = list.Where(x => x.EntireTime == Convert.ToDateTime(jdate3)).ToList();
-                var slist3 = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate3)).ToList();
                 var stime = Convert.ToDateTime(sdate3).ToString("yyyyMM");
                 var b = bll.IsExistsTable(date_base, "electricity_data_" + stime);
                 if (b == false)
                 {
                     bll.CreateTable(stime);
                 }
+                var slist3 = bll.GetModelListDate(" Reserve2='%空调%'", stime).Where(x => x.EntireTime == Convert.ToDateTime(sdate3)).ToList();
                 var cmodel = new electrical_conditionData()
                 {
                     EH = jlist3.Sum(x => x.EH) - slist3.Sum(x => x.EH),
@@ -84,7 +84,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
             catch (Exception ex)
             {
                 res.code = 500;
-                res.msg = "失败，" + ex.Message;
+                res.msg = "失败:" + ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetElectricityRateController.cs

@@ -43,7 +43,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
             catch (Exception ex)
             {
                 res.code = 500;
-                res.msg = "失败，" + ex.Message;
+                res.msg = "失败:" + ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs

@@ -45,8 +45,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     {
                         bll.CreateTable(btime);
                     }
-                    var list1 = bll.GetModelListDate("", atime);
-                    var list2 = bll.GetModelListDate("", btime);
+                    var list1 = bll.GetModelListDate(" Reserve1='配电室高压'", atime);
+                    var list2 = bll.GetModelListDate(" Reserve1='配电室高压'", btime);
                     var time_count = Convert.ToInt32(stime.Day);
                     for (int i = 0; i < time_count; i++)
                     {
@@ -56,7 +56,6 @@ namespace LonglslandExhibitionCenter.Controllers.api
                         if (num1 == num2)
                         {
                             sdate= DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
-
                         }
                         else
                         {
@@ -84,13 +83,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     res.code = 201;
                     res.msg = "参数不能为空";
                 }
-
             }
             catch (Exception ex)
             {
-
                 res.code = 500;
-                res.msg = ex.Message;
+                res.msg ="失败:"+ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs

@@ -21,23 +21,10 @@ namespace LonglslandExhibitionCenter.Controllers.api
         // GET api/<controller>
         public HttpResponseMessage Get(string sdate = "",string edate="")
         {
-            var res = new get_energy_flow();
-            #region 表是否存在
-            var stime = Convert.ToDateTime(sdate).ToString("yyyyMM");
-            var etime = Convert.ToDateTime(edate).ToString("yyyyMM");
             //表名
             var date_base = ConfigurationManager.AppSettings["MySQLDataBase"].ToString();
-            var a = bll.IsExistsTable(date_base, "electricity_data_" + stime);
-            if (a == false)
-            {
-                bll.CreateTable(stime);
-            }
-            var b = bll.IsExistsTable(date_base, "electricity_data_" + etime);
-            if (b== false)
-            {
-                bll.CreateTable(etime);
-            }
-            #endregion
+            var res = new get_energy_flow();
+            var now=DateTime.Now;
             try
             {
                 if (!string.IsNullOrEmpty(sdate)&&!string.IsNullOrEmpty(edate))
@@ -45,132 +32,140 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     var data = new List<energy_flowData>();
                     DateTime startDate = DateTime.Parse(sdate);
                     DateTime endDate = DateTime.Parse(edate);
-
                     TimeSpan timeDifference = endDate - startDate;
+                    var time_day=timeDifference.Days;
+                    decimal? num = 0;
                     #region 全部
-                    int hoursDifference = Convert.ToInt32(timeDifference.TotalHours);
-                    var time_day = 0;
-                    if (hoursDifference > 24)
+                    for (int i = 0; i <= time_day; i++)
                     {
-                        time_day = Convert.ToInt32(hoursDifference / 24);
-                    }
-                    var time_hour = hoursDifference - time_day * 24;
-                    string eedate = "";
-                    decimal? anum = 0;
-                    decimal? bnum = 0;
-                    if (time_day < 1)
-                    {
-                        eedate = edate + " 00:00:00";
-                    }
-                    else
-                    {
-                        for (int i = 0; i < time_day; i++)
+                        string ssdate;
+                        if (Convert.ToDateTime(edate).AddDays(-i).ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd"))
                         {
-                            var sedate = Convert.ToDateTime(edate).AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
-                            eedate = Convert.ToDateTime(edate).AddDays(-(i + 1)).ToString("yyyy-MM-dd HH:00:00");
-                            var alist = bll.GetModelListDate(" EntireTime='" + sedate + "'", stime);
-                            var blist = bll.GetModelListDate(" EntireTime='" + eedate + "'", etime);
-                            anum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
+                            ssdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                         }
-                    }
-                    for (int i = 0; i < time_hour; i++)
-                    {
-                        var sedate = Convert.ToDateTime(eedate).AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
-                        var eedate1 = Convert.ToDateTime(eedate).AddDays(-1).AddHours(-i).ToString("yyyy-MM-dd HH;00:00");
-                        var alist = bll.GetModelListDate(" EntireTime='" + sedate + "'", stime);
-                        var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "'", etime);
-                        bnum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
+                        else
+                        {
+                            ssdate = Convert.ToDateTime(edate).AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
+                        }
+                        var eedate = Convert.ToDateTime(edate).AddDays(-(i+1)).ToString("yyyy-MM-dd 00:00:00");
+                        var stime = Convert.ToDateTime(ssdate).ToString("yyyyMM");
+                        var etime = Convert.ToDateTime(eedate).ToString("yyyyMM");
+                        var a = bll.IsExistsTable(date_base, "electricity_data_" + stime);
+                        if (a == false)
+                        {
+                            bll.CreateTable(stime);
+                        }
+                        var b = bll.IsExistsTable(date_base, "electricity_data_" + etime);
+                        if (b == false)
+                        {
+                            bll.CreateTable(etime);
+                        }
+                        var alist = bll.GetModelListDate(" Reserve1!='配电室高压' and Reserve1!='电能-室外箱变' and EntireTime='"+ssdate+"'", stime);
+                        var blist= bll.GetModelListDate(" Reserve1!='配电室高压' and Reserve1!='电能-室外箱变' and EntireTime='" + eedate + "'", etime);
+                        num=Convert.ToDecimal(alist.Sum(x=>x.EH)-blist.Sum(x=>x.EH));
                     }
                     var model = new energy_flowData()
                     {
-                        Amont = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum + bnum),3))
+                        Amont = Convert.ToDecimal(Math.Round(Convert.ToDouble(num) * 1.229, 3))
                     };
                     #endregion
+                    #region 空调
+                    decimal? knum = 0;
+                    for (int i = 0; i <= time_day; i++)
+                    {
+                        string ssdate;
+                        if (Convert.ToDateTime(edate).AddDays(-i).ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd"))
+                        {
+                            ssdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
+                        }
+                        else
+                        {
+                            ssdate = Convert.ToDateTime(edate).AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
+                        }
+                        var eedate = Convert.ToDateTime(edate).AddDays(-(i + 1)).ToString("yyyy-MM-dd 00:00:00");
+                        var stime = Convert.ToDateTime(ssdate).ToString("yyyyMM");
+                        var etime = Convert.ToDateTime(eedate).ToString("yyyyMM");
+                        var a = bll.IsExistsTable(date_base, "electricity_data_" + stime);
+                        if (a == false)
+                        {
+                            bll.CreateTable(stime);
+                        }
+                        var b = bll.IsExistsTable(date_base, "electricity_data_" + etime);
+                        if (b == false)
+                        {
+                            bll.CreateTable(etime);
+                        }
+                        var alist = bll.GetModelListDate(" Reserve2 like '%空调%' and EntireTime='" + ssdate + "'", stime);
+                        var blist = bll.GetModelListDate(" Reserve2 like '%空调%' and EntireTime='" + eedate + "'", etime);
+                        knum = Convert.ToDecimal(alist.Sum(x => x.EH) - blist.Sum(x => x.EH));
+                    }
                     var adata = new List<energy_flow>();
                     var amodel = new energy_flow();
-                    #region 空调
-                    anum = 0;
-                    bnum = 0;
-                    if (time_day < 1)
-                    {
-                        eedate = edate + " 00:00:00";
-                    }
-                    else
-                    {
-                        for (int i = 0; i < time_day; i++)
-                        {
-                            var sedate = Convert.ToDateTime(edate).AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
-                            eedate = Convert.ToDateTime(edate).AddDays(-(i + 1)).ToString("yyyy-MM-dd HH:00:00");
-                            var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && Reserve2 like '%空调%'", stime);
-                            var blist = bll.GetModelListDate(" EntireTime='" + eedate + "' && Reserve2 like '%空调%'", etime);
-                            anum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
-                        }
-                    }
-                    for (int i = 0; i < time_hour; i++)
-                    {
-                        var sedate = Convert.ToDateTime(eedate).AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
-                        var eedate1 = Convert.ToDateTime(eedate).AddDays(-1).AddHours(-i).ToString("yyyy-MM-dd HH;00:00");
-                        var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && Reserve2 like '%空调%'", stime);
-                        var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "' && Reserve2 like '%空调%'", etime);
-                        bnum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
-                    }
-                    amodel.AirConditioner =Convert.ToDecimal(Math.Round(Convert.ToDouble(anum + bnum),3));
+                    amodel.AirConditioner =Convert.ToDecimal(Math.Round(Convert.ToDouble(knum)*1.229,3));
                     #endregion
                     #region 照明
-                    anum = 0;
-                    bnum = 0;
-                    if (time_day < 1)
+                    decimal? znum = 0;
+                    for (int i = 0; i <= time_day; i++)
                     {
-                        eedate = edate + " 00:00:00";
-                    }
-                    else
-                    {
-                        for (int i = 0; i < time_day; i++)
+                        string ssdate;
+                        if (Convert.ToDateTime(edate).AddDays(-i).ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd"))
                         {
-                            var sedate = Convert.ToDateTime(edate).AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
-                            eedate = Convert.ToDateTime(edate).AddDays(-(i + 1)).ToString("yyyy-MM-dd HH:00:00");
-                            var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && Reserve2 like '%照明%'", stime);
-                            var blist = bll.GetModelListDate(" EntireTime='" + eedate + "' && Reserve2 like '%照明%'", etime);
-                            anum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
+                            ssdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                         }
+                        else
+                        {
+                            ssdate = Convert.ToDateTime(edate).AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
+                        }
+                        var eedate = Convert.ToDateTime(edate).AddDays(-(i + 1)).ToString("yyyy-MM-dd 00:00:00");
+                        var stime = Convert.ToDateTime(ssdate).ToString("yyyyMM");
+                        var etime = Convert.ToDateTime(eedate).ToString("yyyyMM");
+                        var a = bll.IsExistsTable(date_base, "electricity_data_" + stime);
+                        if (a == false)
+                        {
+                            bll.CreateTable(stime);
+                        }
+                        var b = bll.IsExistsTable(date_base, "electricity_data_" + etime);
+                        if (b == false)
+                        {
+                            bll.CreateTable(etime);
+                        }
+                        var alist = bll.GetModelListDate(" Reserve2 like '%照明%' and EntireTime='" + ssdate + "'", stime);
+                        var blist = bll.GetModelListDate(" Reserve2 like '%照明%' and EntireTime='" + eedate + "'", etime);
+                        znum = Convert.ToDecimal(alist.Sum(x => x.EH) - blist.Sum(x => x.EH));
                     }
-                    for (int i = 0; i < time_hour; i++)
-                    {
-                        var sedate = Convert.ToDateTime(eedate).AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
-                        var eedate1 = Convert.ToDateTime(eedate).AddDays(-1).AddHours(-i).ToString("yyyy-MM-dd HH;00:00");
-                        var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && Reserve2 like '%照明%'", stime);
-                        var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "' && Reserve2 like '%照明%'", etime);
-                        bnum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
-                    }
-                    amodel.Illumination =Convert.ToDecimal(Math.Round(Convert.ToDouble(anum + bnum),3));
+                    amodel.Illumination =Convert.ToDecimal(Math.Round(Convert.ToDouble(znum) * 1.229,3));
                     #endregion
                     #region 电梯
-                    anum = 0;
-                    bnum = 0;
-                    if (time_day < 1)
+                    decimal? dnum = 0;
+                    for (int i = 0; i <= time_day; i++)
                     {
-                        eedate = edate + " 00:00:00";
-                    }
-                    else
-                    {
-                        for (int i = 0; i < time_day; i++)
+                        string ssdate;
+                        if (Convert.ToDateTime(edate).AddDays(-i).ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd"))
                         {
-                            var sedate = Convert.ToDateTime(edate).AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
-                            eedate = Convert.ToDateTime(edate).AddDays(-(i + 1)).ToString("yyyy-MM-dd HH:00:00");
-                            var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && Reserve2 like '%电梯%'", stime);
-                            var blist = bll.GetModelListDate(" EntireTime='" + eedate + "' && Reserve2 like '%电梯%'", etime);
-                            anum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
+                            ssdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                         }
+                        else
+                        {
+                            ssdate = Convert.ToDateTime(edate).AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
+                        }
+                        var eedate = Convert.ToDateTime(edate).AddDays(-(i + 1)).ToString("yyyy-MM-dd 00:00:00");
+                        var stime = Convert.ToDateTime(ssdate).ToString("yyyyMM");
+                        var etime = Convert.ToDateTime(eedate).ToString("yyyyMM");
+                        var a = bll.IsExistsTable(date_base, "electricity_data_" + stime);
+                        if (a == false)
+                        {
+                            bll.CreateTable(stime);
+                        }
+                        var b = bll.IsExistsTable(date_base, "electricity_data_" + etime);
+                        if (b == false)
+                        {
+                            bll.CreateTable(etime);
+                        }
+                        var alist = bll.GetModelListDate(" Reserve2 like '%电梯%' and EntireTime='" + ssdate + "'", stime);
+                        var blist = bll.GetModelListDate(" Reserve2 like '%电梯%' and EntireTime='" + eedate + "'", etime);
+                        dnum = Convert.ToDecimal(alist.Sum(x => x.EH) - blist.Sum(x => x.EH));
                     }
-                    for (int i = 0; i < time_hour; i++)
-                    {
-                        var sedate = Convert.ToDateTime(eedate).AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
-                        var eedate1 = Convert.ToDateTime(eedate).AddDays(-1).AddHours(-i).ToString("yyyy-MM-dd HH;00:00");
-                        var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && Reserve2 like '%电梯%'", stime);
-                        var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "' && Reserve2 like '%电梯%'", etime);
-                        bnum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
-                    }
-                    amodel.Elevator =Convert.ToDecimal(Math.Round(Convert.ToDouble(anum + bnum),3));
+                    amodel.Elevator =Convert.ToDecimal(Math.Round(Convert.ToDouble(dnum)*1.229,3));
                     #endregion
                     adata.Add(amodel);
                     model.data = adata;
@@ -188,7 +183,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
             catch (Exception ex)
             {
                 res.code = 500;
-                res.msg = "失败，" + ex.Message;
+                res.msg = "失败:" + ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs

@@ -88,7 +88,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             }
                             else
                             {
-                                sdate = now.AddYears(-i).ToString("yyyy-01-01 00:00:00");
+                                sdate = now.AddYears(-i+1).ToString("yyyy-01-01 00:00:00");
                             }
                             var edate = now.AddYears(-i).ToString("yyyy-01-01 00:00:00");
                             var stime = Convert.ToDateTime(sdate).ToString("yyyyMM");
@@ -129,7 +129,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
             catch (Exception ex)
             {
                 res.code = 500;
-                res.msg = "失败，" + ex.Message;
+                res.msg = "失败:" + ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetFailureWarningController.cs

@@ -39,7 +39,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
             catch (Exception ex)
             {
                 res.code = 500;
-                res.msg = "失败，" + ex.Message;
+                res.msg = "失败:" + ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetFaultConditionController.cs

@@ -39,9 +39,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
             }
             catch (Exception ex)
             {
-
                 res.code = 500;
-                res.msg = ex.Message;
+                res.msg ="失败:"+ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetGeneralSituationController.cs

@@ -23,14 +23,14 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 var data = new List<general_situationData>();
                 var now = DateTime.Now;
                 var time_count = Convert.ToInt32(now.Month);
-                    var model = new general_situationData()
-                    {
-                        Operation = 83,
-                        Stop = 0,
-                        Area = Convert.ToDecimal(2.601),
-                        Amount = 83
-                    };
-                    data.Add(model);                
+                var model = new general_situationData()
+                {
+                    Operation = 83,
+                    Stop = 0,
+                    Area = Convert.ToDecimal(2.601),
+                    Amount = 83
+                };
+                data.Add(model);                
                 res.code = 200;
                 res.msg = "成功";
                 res.data = data;
@@ -38,7 +38,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
             catch (Exception ex)
             {
                 res.code = 500;
-                res.msg = "失败，" + ex.Message;
+                res.msg = "失败:" + ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetLightingControlController.cs

@@ -41,7 +41,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
             {
 
                 res.code = 500;
-                res.msg = ex.Message;
+                res.msg = "失败:" + ex.Message;
             }
             HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
             return result;

LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs

@@ -27,14 +27,14 @@ namespace LonglslandExhibitionCenter.Controllers.api
             {
                 var data = new List<load_classifcationData>();
                 var sdate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00");
-                var edate = DateTime.Now.ToString("yyyy-MM-dd 23:00:00");
+                var edate = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd 00:00:00");
                 var time = DateTime.Now.ToString("yyyyMM");
                 var a = bll.IsExistsTable(date_base, "electricity_data_" + time);
                 if (a == false)
                 {
                     bll.CreateTable(time);
                 }
-                var list = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<='" + edate + "'", time);
+                var list = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
                 //一级
                 var alist = list.Where(x=>x.Reserve2.Contains("梯")).ToList();
                 decimal? num1 = alist.Sum(x => x.P);

LonglslandExhibitionCenter/Controllers/api/GetOperatingStateController.cs

@@ -17,19 +17,20 @@ namespace LonglslandExhibitionCenter.Controllers.api
     {
         public HttpResponseMessage Get()
         {
+            DataService.BLL.viewing_screen bll = new DataService.BLL.viewing_screen();
             var res = new get_operating_state();
             try
             {
                 var data = new List<operating_stateData>();
                 var now = DateTime.Now;
-                var num = 0;
-                for (int i = 0; i < 10; i++)
+                var time = now.ToString("yyyy-MM-dd HH:00:00");
+                var list = bll.GetModelList(" ");
+                foreach ( var item in list )
                 {
-                    num++;
                     var model = new operating_stateData()
                     {
-                        Name="西大厅"+num,
-                        State="1"
+                        Name = item.ScreenName,
+                        State = item.ScreenState
                     };
                     data.Add(model);
                 }

LonglslandExhibitionCenter/Controllers/api/GetRealLoadController.cs

@@ -29,7 +29,7 @@ namespace LonglslandExhibitionCenter.Controllers
                 var time = DateTime.Now.ToString("yyyyMM");
                 var now = DateTime.Now;
                 var time_count = Convert.ToInt32(DateTime.Now.Hour);
-                for (int i = 0; i < time_count; i++)
+                for (int i = 1; i < time_count; i++)
                 {
                     var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
                     // 只处理今天的数据
@@ -43,7 +43,7 @@ namespace LonglslandExhibitionCenter.Controllers
                     {
                         bll.CreateTable(jtime);
                     }
-                    var jlist = bll.GetModelListDate(" EntireTime='" + jdate + "'", jtime);
+                    var jlist = bll.GetModelListDate(" EntireTime='" + jdate + "' and Reserve1='配电室高压'", jtime);
                     if (jlist.Count == 0)
                     {
                         var model = new real_loadData

LonglslandExhibitionCenter/Controllers/api/GetRealtimeLoadController.cs

@@ -24,7 +24,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 var data = new List<realtime_loadData>();
                 var now = DateTime.Now;
                 var time = DateTime.Now.ToString("yyyyMM");
-                var list = bll.GetModelListDate("", time);
+                var list = bll.GetModelListDate(" Reserve1='配电室高压'", time);
                 var stime = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                 var etime = now.ToString("yyyy-MM-dd 00:00:00");
                 var alist=list.Where(x=>x.EntireTime>=Convert.ToDateTime(etime)&&x.EntireTime<=Convert.ToDateTime(stime)).ToList();

LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs

@@ -37,7 +37,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 {
                     var data = new List<total_energyData>();
                     var now = DateTime.Now;
-                    var list = bll.GetModelListDate("", time);
+                    var list = bll.GetModelListDate(" Reserve1='配电室高压'", time);
                     if (date == "日")
                     {
                         var time_count = Convert.ToInt32(DateTime.Now.Day);
@@ -60,8 +60,12 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var model = new total_energyData()
                             {
                                 time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
-                                EH = num* Convert.ToDecimal(1.229)
+                                EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num* Convert.ToDecimal(1.229)),3))
                             };
+                            if (model.EH < 0)
+                            {
+                                model.EH = 0;
+                            }
                             data.Add(model);
                         }
                     }
@@ -92,14 +96,18 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             {
                                 bll.CreateTable(etime);
                             }
-                            var alist = bll.GetModelListDate(" EntireTime='"+sdate+"'", stime);
-                            var blist = bll.GetModelListDate(" EntireTime='" + edate + "'", etime);
+                            var alist = bll.GetModelListDate(" EntireTime='"+sdate+ "' and Reserve1='配电室高压'", stime);
+                            var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
                             var num = alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
                             var model = new total_energyData()
                             {
                                 time = Convert.ToDateTime(now).AddMonths(-i).ToString("MM月"),
-                                EH = num*Convert.ToDecimal(1.229)
+                                EH =Convert.ToDecimal(Math.Round(Convert.ToDouble(num*Convert.ToDecimal(1.229)),3))
                             };
+                            if (model.EH < 0)
+                            {
+                                model.EH = 0;
+                            }
                             data.Add(model);
                         }
                     }

Security/ServiceSecurity.cs

@@ -276,6 +276,7 @@ namespace Security
                                     model.CreateTime = DateTime.Now;
                                     model.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
                                     model.Reserve1 = "配电室低压";
+                                    model.Reserve2 = GetDeviceName4(Convert.ToInt32(name));
                                     bll.AddDate(model, date);
                                 }
                                 else
@@ -386,6 +387,7 @@ namespace Security
                                     model.CreateTime = DateTime.Now;
                                     model.EntireTime = Convert.ToDateTime(DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"));
                                     model.Reserve1 = svlist.Reserve1;
+                                    model.Reserve2 = svlist.Reserve2;
                                     bll.AddDate(model, date);
                                 }
                             }
@@ -440,6 +442,7 @@ namespace Security
                                     model.CreateTime = DateTime.Now;
                                     model.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
                                     model.Reserve1 = "配电室高压";
+                                    model.Reserve2 = GetDeviceName4(Convert.ToInt32(name));
                                     bll.AddDate(model, date);
                                 }
                                 else
@@ -491,6 +494,7 @@ namespace Security
                                         model.CreateTime = DateTime.Now;
                                         model.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
                                         model.Reserve1 = "配电室高压";
+                                        model.Reserve2 = GetDeviceName4(Convert.ToInt32(name));
                                         bll.AddDate(model, date);
                                     }
                                 }
@@ -547,6 +551,7 @@ namespace Security
                                     model.CreateTime = DateTime.Now;
                                     model.EntireTime = Convert.ToDateTime(DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"));
                                     model.Reserve1 = svlist.Reserve1;
+                                    model.Reserve2 = svlist.Reserve2;
                                     bll.AddDate(model, date);
                                 }
                             }
@@ -601,6 +606,7 @@ namespace Security
                                     model.CreateTime = DateTime.Now;
                                     model.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
                                     model.Reserve1 = "电能-室外箱变";
+                                    model.Reserve2 = GetDeviceName4(Convert.ToInt32(name));
                                     bll.AddDate(model, date);
                                 }
                                 else
@@ -652,6 +658,7 @@ namespace Security
                                         model.CreateTime = DateTime.Now;
                                         model.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
                                         model.Reserve1 = "电能-室外箱变";
+                                        model.Reserve2 = GetDeviceName4(Convert.ToInt32(name));
                                         bll.AddDate(model, date);
                                     }
                                 }

Security/bin/Debug/ServiceSecurity.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>bcXn55NFL8EJhw0A9ivpI+YS2VJCWWH+VGpQA160YR4=</dsig:DigestValue>
+        <dsig:DigestValue>vN1d9Z438ix2PIV0Z6Ot7Mok/tmSTm4rF6TNgjBw/QA=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

Security/bin/Debug/ServiceSecurity.exe.manifest

@@ -42,14 +42,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="118272">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="125440">
       <assemblyIdentity name="DataService" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>XpswRERzQVlk45kN8e/ojbzD5/2lpQtcPSGdMv655N4=</dsig:DigestValue>
+        <dsig:DigestValue>uckRvU/W+ECPkyzCBeU8Ca4l/bzYMuyj1e+6/M8lqPg=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -138,14 +138,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="42464">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="42976">
       <assemblyIdentity name="ServiceSecurity" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>vx0PPghT8a6/XULityhjI65QG+UBPR1c4+nbgpo4Pp0=</dsig:DigestValue>
+        <dsig:DigestValue>/hiQ0uIwo0ndBBAzegW5Kuppjf03K0PXCDIw+PyfuC8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

Security/obj/Debug/ServiceSecurity.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>bcXn55NFL8EJhw0A9ivpI+YS2VJCWWH+VGpQA160YR4=</dsig:DigestValue>
+        <dsig:DigestValue>vN1d9Z438ix2PIV0Z6Ot7Mok/tmSTm4rF6TNgjBw/QA=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

Security/obj/Debug/ServiceSecurity.exe.manifest

@@ -42,14 +42,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="118272">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="125440">
       <assemblyIdentity name="DataService" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>XpswRERzQVlk45kN8e/ojbzD5/2lpQtcPSGdMv655N4=</dsig:DigestValue>
+        <dsig:DigestValue>uckRvU/W+ECPkyzCBeU8Ca4l/bzYMuyj1e+6/M8lqPg=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -138,14 +138,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="42464">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="42976">
       <assemblyIdentity name="ServiceSecurity" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>vx0PPghT8a6/XULityhjI65QG+UBPR1c4+nbgpo4Pp0=</dsig:DigestValue>
+        <dsig:DigestValue>/hiQ0uIwo0ndBBAzegW5Kuppjf03K0PXCDIw+PyfuC8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>