diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/069eee4f-8eda-4a0d-ab81-a2284fb559cd.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/069eee4f-8eda-4a0d-ab81-a2284fb559cd.vsidx new file mode 100644 index 0000000..05f547c Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/069eee4f-8eda-4a0d-ab81-a2284fb559cd.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/21068f43-bbc5-41bd-a65b-b91ba71e36b3.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/21068f43-bbc5-41bd-a65b-b91ba71e36b3.vsidx deleted file mode 100644 index be2ce3a..0000000 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/21068f43-bbc5-41bd-a65b-b91ba71e36b3.vsidx and /dev/null differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/27156f7a-e998-4a12-a216-0045703eb311.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/27156f7a-e998-4a12-a216-0045703eb311.vsidx new file mode 100644 index 0000000..63e4393 Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/27156f7a-e998-4a12-a216-0045703eb311.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/86b7b8e7-fe71-4dad-89d7-368eaaab63bd.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/4a2cbbcf-36a2-49b8-86ba-99a23f5637b3.vsidx similarity index 99% rename from .vs/LonglslandExhibitionCenterAPI/FileContentIndex/86b7b8e7-fe71-4dad-89d7-368eaaab63bd.vsidx rename to .vs/LonglslandExhibitionCenterAPI/FileContentIndex/4a2cbbcf-36a2-49b8-86ba-99a23f5637b3.vsidx index f84c75b..8c87818 100644 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/86b7b8e7-fe71-4dad-89d7-368eaaab63bd.vsidx and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/4a2cbbcf-36a2-49b8-86ba-99a23f5637b3.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/600ecd04-49cc-48f9-986b-697dad1df939.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/600ecd04-49cc-48f9-986b-697dad1df939.vsidx deleted file mode 100644 index 1e197a3..0000000 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/600ecd04-49cc-48f9-986b-697dad1df939.vsidx and /dev/null differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/909f3f6c-1cc9-4d4c-aa9e-65d953024b76.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/909f3f6c-1cc9-4d4c-aa9e-65d953024b76.vsidx new file mode 100644 index 0000000..19618b1 Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/909f3f6c-1cc9-4d4c-aa9e-65d953024b76.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/a5d893dc-d49b-4308-8bb2-34441496440a.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/a5d893dc-d49b-4308-8bb2-34441496440a.vsidx deleted file mode 100644 index 71650af..0000000 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/a5d893dc-d49b-4308-8bb2-34441496440a.vsidx and /dev/null differ diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/.suo b/.vs/LonglslandExhibitionCenterAPI/v17/.suo index ce9ae6f..8bd8797 100644 Binary files a/.vs/LonglslandExhibitionCenterAPI/v17/.suo and b/.vs/LonglslandExhibitionCenterAPI/v17/.suo differ diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt b/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt index d67fcb5..8bde2a6 100644 Binary files a/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt and b/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt differ diff --git a/DataService/BLL/viewing_screen.cs b/DataService/BLL/viewing_screen.cs new file mode 100644 index 0000000..f0c6663 --- /dev/null +++ b/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 +{ + /// + /// viewing_screen + /// + public partial class viewing_screen + { + private readonly DataService.DAL.viewing_screen dal=new DataService.DAL.viewing_screen(); + public viewing_screen() + {} + #region BasicMethod + /// + /// 是否存在该记录 + /// + public bool Exists(string ScreenId) + { + return dal.Exists(ScreenId); + } + + /// + /// 增加一条数据 + /// + public bool Add(DataService.Model.viewing_screen model) + { + return dal.Add(model); + } + + /// + /// 更新一条数据 + /// + public bool Update(DataService.Model.viewing_screen model) + { + return dal.Update(model); + } + + /// + /// 删除一条数据 + /// + public bool Delete(string ScreenId) + { + + return dal.Delete(ScreenId); + } + /// + /// 删除一条数据 + /// + public bool DeleteList(string ScreenIdlist ) + { + return dal.DeleteList(ScreenIdlist ); + } + + /// + /// 得到一个对象实体 + /// + public DataService.Model.viewing_screen GetModel(string ScreenId) + { + + return dal.GetModel(ScreenId); + } + + /// + /// 得到一个对象实体，从缓存中 + /// + 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; + } + + /// + /// 获得数据列表 + /// + public DataSet GetList(string strWhere) + { + return dal.GetList(strWhere); + } + /// + /// 获得数据列表 + /// + public List GetModelList(string strWhere) + { + DataSet ds = dal.GetList(strWhere); + return DataTableToList(ds.Tables[0]); + } + /// + /// 获得数据列表 + /// + public List DataTableToList(DataTable dt) + { + List modelList = new List(); + 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; + } + + /// + /// 获得数据列表 + /// + public DataSet GetAllList() + { + return GetList(""); + } + + /// + /// 分页获取数据列表 + /// + public int GetRecordCount(string strWhere) + { + return dal.GetRecordCount(strWhere); + } + /// + /// 分页获取数据列表 + /// + public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex) + { + return dal.GetListByPage( strWhere, orderby, startIndex, endIndex); + } + /// + /// 分页获取数据列表 + /// + //public DataSet GetList(int PageSize,int PageIndex,string strWhere) + //{ + //return dal.GetList(PageSize,PageIndex,strWhere); + //} + + #endregion BasicMethod + #region ExtensionMethod + + #endregion ExtensionMethod + } +} + diff --git a/DataService/DAL/viewing_screen.cs b/DataService/DAL/viewing_screen.cs new file mode 100644 index 0000000..c4ec86b --- /dev/null +++ b/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 +{ + /// + /// 数据访问类:viewing_screen + /// + public partial class viewing_screen + { + public viewing_screen() + {} + #region BasicMethod + + /// + /// 是否存在该记录 + /// + 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); + } + + + /// + /// 增加一条数据 + /// + 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; + } + } + /// + /// 更新一条数据 + /// + 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; + } + } + + /// + /// 删除一条数据 + /// + 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; + } + } + /// + /// 批量删除数据 + /// + 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; + } + } + + + /// + /// 得到一个对象实体 + /// + 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; + } + } + + + /// + /// 得到一个对象实体 + /// + 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; + } + + /// + /// 获得数据列表 + /// + 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()); + } + + /// + /// 获取记录总数 + /// + 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); + } + } + /// + /// 分页获取数据列表 + /// + 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()); + } + + /* + /// + /// 分页获取数据列表 + /// + 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 + } +} + diff --git a/DataService/DataService.csproj b/DataService/DataService.csproj index 27d5c44..5c2d5e2 100644 --- a/DataService/DataService.csproj +++ b/DataService/DataService.csproj @@ -105,6 +105,7 @@ + @@ -114,6 +115,7 @@ + @@ -123,6 +125,7 @@ + diff --git a/DataService/Model/viewing_screen.cs b/DataService/Model/viewing_screen.cs new file mode 100644 index 0000000..673da08 --- /dev/null +++ b/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 +{ + /// + /// viewing_screen:实体类(属性说明自动提取数据库字段的描述信息) + /// + [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; + /// + /// + /// + public string ScreenId + { + set{ _screenid=value;} + get{return _screenid;} + } + /// + /// + /// + public string ScreenName + { + set{ _screenname=value;} + get{return _screenname;} + } + /// + /// + /// + public string ScreenAlarm + { + set{ _screenalarm=value;} + get{return _screenalarm;} + } + /// + /// + /// + public string ScreenState + { + set{ _screenstate=value;} + get{return _screenstate;} + } + /// + /// + /// + public DateTime? CreateTime + { + set{ _createtime=value;} + get{return _createtime;} + } + /// + /// + /// + public DateTime? EntireTime + { + set{ _entiretime=value;} + get{return _entiretime;} + } + /// + /// + /// + public string Reserve1 + { + set{ _reserve1=value;} + get{return _reserve1;} + } + /// + /// + /// + public string Reserve2 + { + set{ _reserve2=value;} + get{return _reserve2;} + } + /// + /// + /// + public string Reserve3 + { + set{ _reserve3=value;} + get{return _reserve3;} + } + /// + /// + /// + public string Reserve4 + { + set{ _reserve4=value;} + get{return _reserve4;} + } + /// + /// + /// + public string Reserve5 + { + set{ _reserve5=value;} + get{return _reserve5;} + } + #endregion Model + + } +} + diff --git a/DataService/bin/Debug/DataService.dll b/DataService/bin/Debug/DataService.dll index cfef322..060d869 100644 Binary files a/DataService/bin/Debug/DataService.dll and b/DataService/bin/Debug/DataService.dll differ diff --git a/DataService/bin/Debug/DataService.pdb b/DataService/bin/Debug/DataService.pdb index 73e68c0..2a0fd50 100644 Binary files a/DataService/bin/Debug/DataService.pdb and b/DataService/bin/Debug/DataService.pdb differ diff --git a/DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache b/DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache index ff664b7..c71e612 100644 --- a/DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache +++ b/DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -3d7b754a8e6bef93a538695d1bf4b7d4c716a7b3 +3293909a0dc8db44a592efac06c1049f33aa95ca diff --git a/DataService/obj/Debug/DataService.dll b/DataService/obj/Debug/DataService.dll index cfef322..060d869 100644 Binary files a/DataService/obj/Debug/DataService.dll and b/DataService/obj/Debug/DataService.dll differ diff --git a/DataService/obj/Debug/DataService.pdb b/DataService/obj/Debug/DataService.pdb index 73e68c0..2a0fd50 100644 Binary files a/DataService/obj/Debug/DataService.pdb and b/DataService/obj/Debug/DataService.pdb differ diff --git a/LonglslandExhibitionCenter/Controllers/api/GetAirconditioningLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetAirconditioningLoadController.cs index 96e347a..88f7a7e 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetAirconditioningLoadController.cs +++ b/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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetBigScreenController.cs b/LonglslandExhibitionCenter/Controllers/api/GetBigScreenController.cs index 5ddc006..2c85451 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetBigScreenController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetBigScreenController.cs @@ -16,6 +16,7 @@ namespace LonglslandExhibitionCenter.Controllers.api /// 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(); 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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetBootStrategyController.cs b/LonglslandExhibitionCenter/Controllers/api/GetBootStrategyController.cs index 3d0722e..91fb16b 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetBootStrategyController.cs +++ b/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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs index d2f9ecb..2aacfee 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs @@ -24,12 +24,10 @@ namespace LonglslandExhibitionCenter.Controllers.api { var data = new List(); 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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs index ce42f38..26cf653 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs @@ -35,7 +35,7 @@ namespace LonglslandExhibitionCenter.Controllers.api try { var data = new List(); - 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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs index 6eb3933..d52ee2c 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs @@ -34,7 +34,7 @@ namespace LonglslandExhibitionCenter.Controllers.api try { var data = new List(); - 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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonNeutralController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonNeutralController.cs index e26a004..55396e1 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonNeutralController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonNeutralController.cs @@ -16,7 +16,6 @@ namespace LonglslandExhibitionCenter.Controllers.api /// public class GetCarbonNeutralController : ApiController { - ///DataService.BLL.electricity_data bll = new DataService.BLL.electricity_data(); // GET api/ 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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonOverviewController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonOverviewController.cs index fc4cf1b..992d96b 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonOverviewController.cs +++ b/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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonTrendController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonTrendController.cs index c7792d9..14640fe 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonTrendController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonTrendController.cs @@ -34,7 +34,7 @@ namespace LonglslandExhibitionCenter.Controllers.api try { var data = new List(); - 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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs b/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs index 5ffcde8..b6deb5d 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs +++ b/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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs index f043ee4..48984ae 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs +++ b/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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetDrainHeadingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetDrainHeadingController.cs index ad83f69..2ac8d15 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetDrainHeadingController.cs +++ b/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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs b/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs index 7684dfb..4f5c12f 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs @@ -25,17 +25,26 @@ namespace LonglslandExhibitionCenter.Controllers.api { var data = new List(); 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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetElectricalConditionController.cs b/LonglslandExhibitionCenter/Controllers/api/GetElectricalConditionController.cs index 69c128b..0a4abd7 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetElectricalConditionController.cs +++ b/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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetElectricityRateController.cs b/LonglslandExhibitionCenter/Controllers/api/GetElectricityRateController.cs index 681d323..25cf9e5 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetElectricityRateController.cs +++ b/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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs b/LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs index 9a6ee93..99a403c 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs +++ b/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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs b/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs index 1627f52..56a60ce 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs @@ -21,23 +21,10 @@ namespace LonglslandExhibitionCenter.Controllers.api // GET api/ 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(); 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(); 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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs index cc12729..1648846 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs +++ b/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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetFailureWarningController.cs b/LonglslandExhibitionCenter/Controllers/api/GetFailureWarningController.cs index b90c186..d92c2e5 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetFailureWarningController.cs +++ b/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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetFaultConditionController.cs b/LonglslandExhibitionCenter/Controllers/api/GetFaultConditionController.cs index 9b81a0c..006af92 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetFaultConditionController.cs +++ b/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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetGeneralSituationController.cs b/LonglslandExhibitionCenter/Controllers/api/GetGeneralSituationController.cs index 3b5d593..63438d4 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetGeneralSituationController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetGeneralSituationController.cs @@ -23,14 +23,14 @@ namespace LonglslandExhibitionCenter.Controllers.api var data = new List(); 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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetLightingControlController.cs b/LonglslandExhibitionCenter/Controllers/api/GetLightingControlController.cs index 897d5c3..fe3299e 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetLightingControlController.cs +++ b/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; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs b/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs index bfee148..3eb6c9d 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs @@ -27,14 +27,14 @@ namespace LonglslandExhibitionCenter.Controllers.api { var data = new List(); 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); diff --git a/LonglslandExhibitionCenter/Controllers/api/GetOperatingStateController.cs b/LonglslandExhibitionCenter/Controllers/api/GetOperatingStateController.cs index d71df92..58fc1d0 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetOperatingStateController.cs +++ b/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(); 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); } diff --git a/LonglslandExhibitionCenter/Controllers/api/GetRealLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetRealLoadController.cs index 885976e..e7e2e2e 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetRealLoadController.cs +++ b/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 diff --git a/LonglslandExhibitionCenter/Controllers/api/GetRealtimeLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetRealtimeLoadController.cs index 149014a..cfa2ecc 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetRealtimeLoadController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetRealtimeLoadController.cs @@ -24,7 +24,7 @@ namespace LonglslandExhibitionCenter.Controllers.api var data = new List(); 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(); diff --git a/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs b/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs index eef8115..09cafc0 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs @@ -37,7 +37,7 @@ namespace LonglslandExhibitionCenter.Controllers.api { var data = new List(); 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); } } diff --git a/LonglslandExhibitionCenter/bin/DataService.dll b/LonglslandExhibitionCenter/bin/DataService.dll index cfef322..060d869 100644 Binary files a/LonglslandExhibitionCenter/bin/DataService.dll and b/LonglslandExhibitionCenter/bin/DataService.dll differ diff --git a/LonglslandExhibitionCenter/bin/DataService.pdb b/LonglslandExhibitionCenter/bin/DataService.pdb index 73e68c0..2a0fd50 100644 Binary files a/LonglslandExhibitionCenter/bin/DataService.pdb and b/LonglslandExhibitionCenter/bin/DataService.pdb differ diff --git a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll index 47fd97b..83c36b2 100644 Binary files a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll differ diff --git a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb index f27891f..d8349d7 100644 Binary files a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb differ diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache index c8376c0..26c05e2 100644 Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache differ diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll index 47fd97b..83c36b2 100644 Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll differ diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb index f27891f..d8349d7 100644 Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb differ diff --git a/Security/ServiceSecurity.cs b/Security/ServiceSecurity.cs index 7e97b46..74a7f9d 100644 --- a/Security/ServiceSecurity.cs +++ b/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); } } diff --git a/Security/bin/Debug/DataService.dll b/Security/bin/Debug/DataService.dll index cfef322..060d869 100644 Binary files a/Security/bin/Debug/DataService.dll and b/Security/bin/Debug/DataService.dll differ diff --git a/Security/bin/Debug/DataService.pdb b/Security/bin/Debug/DataService.pdb index 73e68c0..2a0fd50 100644 Binary files a/Security/bin/Debug/DataService.pdb and b/Security/bin/Debug/DataService.pdb differ diff --git a/Security/bin/Debug/ServiceSecurity.application b/Security/bin/Debug/ServiceSecurity.application index c3e849d..7c465d0 100644 --- a/Security/bin/Debug/ServiceSecurity.application +++ b/Security/bin/Debug/ServiceSecurity.application @@ -14,7 +14,7 @@ - bcXn55NFL8EJhw0A9ivpI+YS2VJCWWH+VGpQA160YR4= + vN1d9Z438ix2PIV0Z6Ot7Mok/tmSTm4rF6TNgjBw/QA= diff --git a/Security/bin/Debug/ServiceSecurity.exe b/Security/bin/Debug/ServiceSecurity.exe index 87efebc..8b3165b 100644 Binary files a/Security/bin/Debug/ServiceSecurity.exe and b/Security/bin/Debug/ServiceSecurity.exe differ diff --git a/Security/bin/Debug/ServiceSecurity.exe.manifest b/Security/bin/Debug/ServiceSecurity.exe.manifest index 6d48dc0..bf0877b 100644 --- a/Security/bin/Debug/ServiceSecurity.exe.manifest +++ b/Security/bin/Debug/ServiceSecurity.exe.manifest @@ -42,14 +42,14 @@ - + - XpswRERzQVlk45kN8e/ojbzD5/2lpQtcPSGdMv655N4= + uckRvU/W+ECPkyzCBeU8Ca4l/bzYMuyj1e+6/M8lqPg= @@ -138,14 +138,14 @@ - + - vx0PPghT8a6/XULityhjI65QG+UBPR1c4+nbgpo4Pp0= + /hiQ0uIwo0ndBBAzegW5Kuppjf03K0PXCDIw+PyfuC8= diff --git a/Security/bin/Debug/ServiceSecurity.pdb b/Security/bin/Debug/ServiceSecurity.pdb index d337ef9..f94de4f 100644 Binary files a/Security/bin/Debug/ServiceSecurity.pdb and b/Security/bin/Debug/ServiceSecurity.pdb differ diff --git a/Security/bin/Debug/app.publish/ServiceSecurity.exe b/Security/bin/Debug/app.publish/ServiceSecurity.exe index 61b45e6..dc3235d 100644 Binary files a/Security/bin/Debug/app.publish/ServiceSecurity.exe and b/Security/bin/Debug/app.publish/ServiceSecurity.exe differ diff --git a/Security/obj/Debug/Security.csproj.AssemblyReference.cache b/Security/obj/Debug/Security.csproj.AssemblyReference.cache index b88c83f..f9375a1 100644 Binary files a/Security/obj/Debug/Security.csproj.AssemblyReference.cache and b/Security/obj/Debug/Security.csproj.AssemblyReference.cache differ diff --git a/Security/obj/Debug/ServiceSecurity.application b/Security/obj/Debug/ServiceSecurity.application index c3e849d..7c465d0 100644 --- a/Security/obj/Debug/ServiceSecurity.application +++ b/Security/obj/Debug/ServiceSecurity.application @@ -14,7 +14,7 @@ - bcXn55NFL8EJhw0A9ivpI+YS2VJCWWH+VGpQA160YR4= + vN1d9Z438ix2PIV0Z6Ot7Mok/tmSTm4rF6TNgjBw/QA= diff --git a/Security/obj/Debug/ServiceSecurity.exe b/Security/obj/Debug/ServiceSecurity.exe index 87efebc..8b3165b 100644 Binary files a/Security/obj/Debug/ServiceSecurity.exe and b/Security/obj/Debug/ServiceSecurity.exe differ diff --git a/Security/obj/Debug/ServiceSecurity.exe.manifest b/Security/obj/Debug/ServiceSecurity.exe.manifest index 6d48dc0..bf0877b 100644 --- a/Security/obj/Debug/ServiceSecurity.exe.manifest +++ b/Security/obj/Debug/ServiceSecurity.exe.manifest @@ -42,14 +42,14 @@ - + - XpswRERzQVlk45kN8e/ojbzD5/2lpQtcPSGdMv655N4= + uckRvU/W+ECPkyzCBeU8Ca4l/bzYMuyj1e+6/M8lqPg= @@ -138,14 +138,14 @@ - + - vx0PPghT8a6/XULityhjI65QG+UBPR1c4+nbgpo4Pp0= + /hiQ0uIwo0ndBBAzegW5Kuppjf03K0PXCDIw+PyfuC8= diff --git a/Security/obj/Debug/ServiceSecurity.pdb b/Security/obj/Debug/ServiceSecurity.pdb index d337ef9..f94de4f 100644 Binary files a/Security/obj/Debug/ServiceSecurity.pdb and b/Security/obj/Debug/ServiceSecurity.pdb differ