diff --git a/DataServer/BLL/device_info.cs b/DataServer/BLL/device_info.cs new file mode 100644 index 0000000..6591c11 --- /dev/null +++ b/DataServer/BLL/device_info.cs @@ -0,0 +1,179 @@ +/** 版本信息模板在安装目录下，可自行修改。 +* device_info.cs +* +* 功 能： N/A +* 类 名： device_info +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +* V0.01 2024/1/9 13:14:33 N/A 初版 +* +* Copyright (c) 2012 Maticsoft Corporation. All rights reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　版权所有：动软卓越（北京）科技有限公司　　　　　　　　　　　　　　│ +*└──────────────────────────────────┘ +*/ +using System; +using System.Data; +using System.Collections.Generic; +using Maticsoft.Common; +using DataServer.Model; +namespace DataServer.BLL +{ + /// + /// device_info + /// + public partial class device_info + { + private readonly DataServer.DAL.device_info dal=new DataServer.DAL.device_info(); + public device_info() + {} + #region BasicMethod + /// + /// 是否存在该记录 + /// + public bool Exists(string DeviceId) + { + return dal.Exists(DeviceId); + } + + /// + /// 增加一条数据 + /// + public bool Add(DataServer.Model.device_info model) + { + return dal.Add(model); + } + + /// + /// 更新一条数据 + /// + public bool Update(DataServer.Model.device_info model) + { + return dal.Update(model); + } + + /// + /// 删除一条数据 + /// + public bool Delete(string DeviceId) + { + + return dal.Delete(DeviceId); + } + /// + /// 删除一条数据 + /// + public bool DeleteList(string DeviceIdlist ) + { + return dal.DeleteList(DeviceIdlist ); + } + + /// + /// 得到一个对象实体 + /// + public DataServer.Model.device_info GetModel(string DeviceId) + { + + return dal.GetModel(DeviceId); + } + + /// + /// 得到一个对象实体，从缓存中 + /// + public DataServer.Model.device_info GetModelByCache(string DeviceId) + { + + string CacheKey = "device_infoModel-" + DeviceId; + object objModel = Maticsoft.Common.DataCache.GetCache(CacheKey); + if (objModel == null) + { + try + { + objModel = dal.GetModel(DeviceId); + if (objModel != null) + { + int ModelCache = Maticsoft.Common.ConfigHelper.GetConfigInt("ModelCache"); + Maticsoft.Common.DataCache.SetCache(CacheKey, objModel, DateTime.Now.AddMinutes(ModelCache), TimeSpan.Zero); + } + } + catch{} + } + return (DataServer.Model.device_info)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) + { + DataServer.Model.device_info 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/DataServer/DAL/device_info.cs b/DataServer/DAL/device_info.cs new file mode 100644 index 0000000..1651a39 --- /dev/null +++ b/DataServer/DAL/device_info.cs @@ -0,0 +1,337 @@ +/** 版本信息模板在安装目录下，可自行修改。 +* device_info.cs +* +* 功 能： N/A +* 类 名： device_info +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +* V0.01 2024/1/9 13:14:33 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 DataServer.DAL +{ + /// + /// 数据访问类:device_info + /// + public partial class device_info + { + public device_info() + {} + #region BasicMethod + + /// + /// 是否存在该记录 + /// + public bool Exists(string DeviceId) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("select count(1) from device_info"); + strSql.Append(" where DeviceId=@DeviceId "); + MySqlParameter[] parameters = { + new MySqlParameter("@DeviceId", MySqlDbType.VarChar,255) }; + parameters[0].Value = DeviceId; + + return DbHelperMySQL.Exists(strSql.ToString(),parameters); + } + + + /// + /// 增加一条数据 + /// + public bool Add(DataServer.Model.device_info model) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("insert into device_info("); + strSql.Append("DeviceId,FloorName,DeviceName,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5)"); + strSql.Append(" values ("); + strSql.Append("@DeviceId,@FloorName,@DeviceName,@Reserve1,@Reserve2,@Reserve3,@Reserve4,@Reserve5)"); + MySqlParameter[] parameters = { + new MySqlParameter("@DeviceId", MySqlDbType.VarChar,255), + new MySqlParameter("@FloorName", MySqlDbType.VarChar,255), + new MySqlParameter("@DeviceName", MySqlDbType.VarChar,255), + 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.DeviceId; + parameters[1].Value = model.FloorName; + parameters[2].Value = model.DeviceName; + parameters[3].Value = model.Reserve1; + parameters[4].Value = model.Reserve2; + parameters[5].Value = model.Reserve3; + parameters[6].Value = model.Reserve4; + parameters[7].Value = model.Reserve5; + + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + /// + /// 更新一条数据 + /// + public bool Update(DataServer.Model.device_info model) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("update device_info set "); + strSql.Append("FloorName=@FloorName,"); + strSql.Append("DeviceName=@DeviceName,"); + strSql.Append("Reserve1=@Reserve1,"); + strSql.Append("Reserve2=@Reserve2,"); + strSql.Append("Reserve3=@Reserve3,"); + strSql.Append("Reserve4=@Reserve4,"); + strSql.Append("Reserve5=@Reserve5"); + strSql.Append(" where DeviceId=@DeviceId "); + MySqlParameter[] parameters = { + new MySqlParameter("@FloorName", MySqlDbType.VarChar,255), + new MySqlParameter("@DeviceName", MySqlDbType.VarChar,255), + 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("@DeviceId", MySqlDbType.VarChar,255)}; + parameters[0].Value = model.FloorName; + parameters[1].Value = model.DeviceName; + parameters[2].Value = model.Reserve1; + parameters[3].Value = model.Reserve2; + parameters[4].Value = model.Reserve3; + parameters[5].Value = model.Reserve4; + parameters[6].Value = model.Reserve5; + parameters[7].Value = model.DeviceId; + + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + + /// + /// 删除一条数据 + /// + public bool Delete(string DeviceId) + { + + StringBuilder strSql=new StringBuilder(); + strSql.Append("delete from device_info "); + strSql.Append(" where DeviceId=@DeviceId "); + MySqlParameter[] parameters = { + new MySqlParameter("@DeviceId", MySqlDbType.VarChar,255) }; + parameters[0].Value = DeviceId; + + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + /// + /// 批量删除数据 + /// + public bool DeleteList(string DeviceIdlist ) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("delete from device_info "); + strSql.Append(" where DeviceId in ("+DeviceIdlist + ") "); + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString()); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + + + /// + /// 得到一个对象实体 + /// + public DataServer.Model.device_info GetModel(string DeviceId) + { + + StringBuilder strSql=new StringBuilder(); + strSql.Append("select DeviceId,FloorName,DeviceName,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5 from device_info "); + strSql.Append(" where DeviceId=@DeviceId "); + MySqlParameter[] parameters = { + new MySqlParameter("@DeviceId", MySqlDbType.VarChar,255) }; + parameters[0].Value = DeviceId; + + DataServer.Model.device_info model=new DataServer.Model.device_info(); + 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 DataServer.Model.device_info DataRowToModel(DataRow row) + { + DataServer.Model.device_info model=new DataServer.Model.device_info(); + if (row != null) + { + if(row["DeviceId"]!=null) + { + model.DeviceId=row["DeviceId"].ToString(); + } + if(row["FloorName"]!=null) + { + model.FloorName=row["FloorName"].ToString(); + } + if(row["DeviceName"]!=null) + { + model.DeviceName=row["DeviceName"].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 DeviceId,FloorName,DeviceName,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5 "); + strSql.Append(" FROM device_info "); + 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 device_info "); + 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.DeviceId desc"); + } + strSql.Append(")AS Row, T.* from device_info 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 = "device_info"; + parameters[1].Value = "DeviceId"; + 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/DataServer/DataServer.csproj b/DataServer/DataServer.csproj index d371667..fa1e885 100644 --- a/DataServer/DataServer.csproj +++ b/DataServer/DataServer.csproj @@ -78,15 +78,18 @@ + + + diff --git a/DataServer/Model/device_info.cs b/DataServer/Model/device_info.cs new file mode 100644 index 0000000..65b65d5 --- /dev/null +++ b/DataServer/Model/device_info.cs @@ -0,0 +1,105 @@ +/** 版本信息模板在安装目录下，可自行修改。 +* device_info.cs +* +* 功 能： N/A +* 类 名： device_info +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +* V0.01 2024/1/9 13:14:33 N/A 初版 +* +* Copyright (c) 2012 Maticsoft Corporation. All rights reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　版权所有：动软卓越（北京）科技有限公司　　　　　　　　　　　　　　│ +*└──────────────────────────────────┘ +*/ +using System; +namespace DataServer.Model +{ + /// + /// device_info:实体类(属性说明自动提取数据库字段的描述信息) + /// + [Serializable] + public partial class device_info + { + public device_info() + {} + #region Model + private string _deviceid; + private string _floorname; + private string _devicename; + private string _reserve1; + private string _reserve2; + private string _reserve3; + private string _reserve4; + private string _reserve5; + /// + /// + /// + public string DeviceId + { + set{ _deviceid=value;} + get{return _deviceid;} + } + /// + /// + /// + public string FloorName + { + set{ _floorname=value;} + get{return _floorname;} + } + /// + /// + /// + public string DeviceName + { + set{ _devicename=value;} + get{return _devicename;} + } + /// + /// + /// + 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/DataServer/bin/Debug/DataServer.pdb b/DataServer/bin/Debug/DataServer.pdb index 88399fb..82ac209 100644 Binary files a/DataServer/bin/Debug/DataServer.pdb and b/DataServer/bin/Debug/DataServer.pdb differ diff --git a/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache b/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache index 1f76ed4..02f801d 100644 --- a/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache +++ b/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7d79bf438b24b7911c0f400411eb86a062fada60 +15bbb4e196dffff88387fbe73c0b6671cf6e1fc8 diff --git a/DataServer/obj/Debug/DataServer.csproj.FileListAbsolute.txt b/DataServer/obj/Debug/DataServer.csproj.FileListAbsolute.txt index 4538626..7c0a2d1 100644 --- a/DataServer/obj/Debug/DataServer.csproj.FileListAbsolute.txt +++ b/DataServer/obj/Debug/DataServer.csproj.FileListAbsolute.txt @@ -8,3 +8,13 @@ E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DataServer\bin\Debug E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DataServer\bin\Debug\Maticsoft.DBUtility.dll E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DataServer\bin\Debug\MySql.Data.dll E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DataServer\obj\Debug\DataServer.csproj.CopyComplete +E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\bin\Debug\DataServer.dll +E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\bin\Debug\DataServer.pdb +E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\bin\Debug\Maticsoft.Common.dll +E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\bin\Debug\Maticsoft.DBUtility.dll +E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\bin\Debug\MySql.Data.dll +E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\obj\Debug\DataServer.csproj.AssemblyReference.cache +E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\obj\Debug\DataServer.csproj.CoreCompileInputs.cache +E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\obj\Debug\DataServer.csproj.CopyComplete +E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\obj\Debug\DataServer.dll +E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\obj\Debug\DataServer.pdb diff --git a/DataServer/obj/Debug/DataServer.dll b/DataServer/obj/Debug/DataServer.dll index 9496a96..52fa11e 100644 Binary files a/DataServer/obj/Debug/DataServer.dll and b/DataServer/obj/Debug/DataServer.dll differ diff --git a/DataServer/obj/Debug/DataServer.pdb b/DataServer/obj/Debug/DataServer.pdb index 88399fb..82ac209 100644 Binary files a/DataServer/obj/Debug/DataServer.pdb and b/DataServer/obj/Debug/DataServer.pdb differ diff --git a/DongYingAPI/Controllers/api/GetAirConditionerController.cs b/DongYingAPI/Controllers/api/GetAirConditionerController.cs index 634b86f..aa33145 100644 --- a/DongYingAPI/Controllers/api/GetAirConditionerController.cs +++ b/DongYingAPI/Controllers/api/GetAirConditionerController.cs @@ -15,8 +15,8 @@ namespace DongYingAPI.Controllers.api /// public class GetAirConditionerController : ApiController { - DataServer.BLL.device_data bll = new DataServer.BLL.device_data(); - + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info=new DataServer.BLL.device_info(); public HttpResponseMessage Get(string date = "") { var res = new get_air_conditioner(); @@ -25,7 +25,7 @@ namespace DongYingAPI.Controllers.api if (!string.IsNullOrEmpty(date)) { var data = new List(); - var list = bll.GetModelList("").Where(x=>x.DeviceName.Contains("空调")).ToList(); + var list = bll_info.GetModelList("").Where(x=>x.DeviceName.Contains("空调")).ToList(); if (date == "日") { @@ -35,34 +35,28 @@ namespace DongYingAPI.Controllers.api { var model = new air_conditionerData(); - var j = i * 150; + var j = i * 120; b = Convert.ToInt32(a); string now = ""; - if (b < 30) - { - model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); - //b =Convert.ToInt32(DateTime.Now.AddMinutes(-30).ToString("mm")); - a = "31"; - } - else - { - model.time = DateTime.Now.AddMinutes(-j).ToString("HH:30"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:31:00"); - a = "29"; - } + model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); + now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); + a = "31"; var datetime = Convert.ToDateTime(now); - var sdate = datetime.AddMinutes(-(i + 1) * 150); + var sdate = datetime.AddMinutes(-(i + 1) * 120); var edate = datetime.AddMinutes(-j); - var list1 = bll.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.CreateTime >= sdate && x.CreateTime < edate).ToList(); - decimal? num1 = 0; - foreach (var item in list1) + var time = DateTime.Now.ToString("yyyyMM"); + //var list1 = bll_info.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.CreateTime >= sdate && x.CreateTime < edate).ToList(); + foreach (var item in list) { - num1 += item.P; + var list1=bll.GetModelListDate("",time).Where(x=>x.DeviceId== item.DeviceId&&x.CreateTime>=sdate&&x.CreateTime x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); - decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.P; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + decimal? num = 0; + foreach (var aitem in alist) + { + num += aitem.P; + } + model.P = num; } - model.P = num; + data.Add(model); } } @@ -95,13 +94,16 @@ namespace DongYingAPI.Controllers.api var now = DateTime.Now.AddYears(-i); var sdate = now.ToString("yyyy") + "-01-01 00:00:00"; var edate = now.AddYears(+1).ToString("yyyy") + "-01-01 00:00:00"; - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); - decimal? num = 0; - foreach (var item in alist) - { - num += item.P; + foreach (var item in list){ + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + decimal? num = 0; + foreach (var aitem in alist) + { + num += aitem.P; + } + model.P = num; } - model.P = num; data.Add(model); } } diff --git a/DongYingAPI/DongYingAPI.csproj b/DongYingAPI/DongYingAPI.csproj index 823feb2..ebe406f 100644 --- a/DongYingAPI/DongYingAPI.csproj +++ b/DongYingAPI/DongYingAPI.csproj @@ -45,7 +45,8 @@ 4 - + + False ..\DataServer\bin\Debug\DataServer.dll diff --git a/DongYingAPI/bin/DataServer.dll b/DongYingAPI/bin/DataServer.dll index 9496a96..52fa11e 100644 Binary files a/DongYingAPI/bin/DataServer.dll and b/DongYingAPI/bin/DataServer.dll differ diff --git a/DongYingAPI/bin/DataServer.pdb b/DongYingAPI/bin/DataServer.pdb index 88399fb..82ac209 100644 Binary files a/DongYingAPI/bin/DataServer.pdb and b/DongYingAPI/bin/DataServer.pdb differ diff --git a/DongYingAPI/bin/DongYingAPI.dll b/DongYingAPI/bin/DongYingAPI.dll index da8bd9c..778a67a 100644 Binary files a/DongYingAPI/bin/DongYingAPI.dll and b/DongYingAPI/bin/DongYingAPI.dll differ diff --git a/DongYingAPI/bin/DongYingAPI.pdb b/DongYingAPI/bin/DongYingAPI.pdb index e67f11c..cf498aa 100644 Binary files a/DongYingAPI/bin/DongYingAPI.pdb and b/DongYingAPI/bin/DongYingAPI.pdb differ diff --git a/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache b/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache index 9c228b5..68e6464 100644 Binary files a/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache and b/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache differ diff --git a/DongYingAPI/obj/Debug/DongYingAPI.dll b/DongYingAPI/obj/Debug/DongYingAPI.dll index da8bd9c..778a67a 100644 Binary files a/DongYingAPI/obj/Debug/DongYingAPI.dll and b/DongYingAPI/obj/Debug/DongYingAPI.dll differ diff --git a/DongYingAPI/obj/Debug/DongYingAPI.pdb b/DongYingAPI/obj/Debug/DongYingAPI.pdb index e67f11c..cf498aa 100644 Binary files a/DongYingAPI/obj/Debug/DongYingAPI.pdb and b/DongYingAPI/obj/Debug/DongYingAPI.pdb differ diff --git a/Security/bin/Debug/App_Data/Logs_20240109.txt b/Security/bin/Debug/App_Data/Logs_20240109.txt index 8802955..fe6d7c3 100644 --- a/Security/bin/Debug/App_Data/Logs_20240109.txt +++ b/Security/bin/Debug/App_Data/Logs_20240109.txt @@ -200,3 +200,13 @@ 2024-01-09 10:50:07,243 [7] INFO loginfo - 뷽 2024-01-09 10:50:08,636 [7] INFO loginfo - 1data{"devs":[{"d":[{"dq":192,"m":"010400051","ts":1704342327,"v":88.667},{"dq":192,"m":"01040005","ts":1704342327,"v":5.000},{"dq":192,"m":"1040006","ts":1704342327,"v":4.000},{"dq":192,"m":"1040007","ts":1704342327,"v":3.000},{"dq":192,"m":"1040008","ts":1704342327,"v":2.000},{"dq":192,"m":"1040009","ts":1704342327,"v":1.000}],"dev":"310510043001"}],"pKey":"data","sn":"6e352ec4-82fc-4db4-80fd-6699871dd1d2","ts":1704342327,"ver":"2.0.0"} + ------------------------------------------------ + ------------------------------------------------ + ------------------------------------------------ +2024-01-09 13:24:05,861 [3] INFO loginfo - ʼ +2024-01-09 13:24:05,970 [3] INFO loginfo - ʼ +2024-01-09 13:24:06,078 [3] INFO loginfo - ӳɹ + ------------------------------------------------ + ------------------------------------------------ +2024-01-09 13:24:06,082 [3] INFO loginfo - ʼ +2024-01-09 13:24:06,083 [3] INFO loginfo - ӳɹ diff --git a/Security/bin/Debug/DataServer.dll b/Security/bin/Debug/DataServer.dll index 9496a96..52fa11e 100644 Binary files a/Security/bin/Debug/DataServer.dll and b/Security/bin/Debug/DataServer.dll differ diff --git a/Security/bin/Debug/DataServer.pdb b/Security/bin/Debug/DataServer.pdb index 88399fb..82ac209 100644 Binary files a/Security/bin/Debug/DataServer.pdb and b/Security/bin/Debug/DataServer.pdb differ diff --git a/Security/bin/Debug/ServiceSecurity.application b/Security/bin/Debug/ServiceSecurity.application index ff7b9da..82290ee 100644 --- a/Security/bin/Debug/ServiceSecurity.application +++ b/Security/bin/Debug/ServiceSecurity.application @@ -14,7 +14,7 @@ - EBfB7rWH7rhlMMF8pi/rhBpJbTKgP4sBeCT9vVAl6h8= + brRB6Tj3UIh+1hHSCP7cVnP1AJt+M46i6AtPawgLXRE= diff --git a/Security/bin/Debug/ServiceSecurity.exe.manifest b/Security/bin/Debug/ServiceSecurity.exe.manifest index 49869dd..d9f14d1 100644 --- a/Security/bin/Debug/ServiceSecurity.exe.manifest +++ b/Security/bin/Debug/ServiceSecurity.exe.manifest @@ -42,14 +42,14 @@ - + - ixPV+LB7PJDxkCpxkYqydnifOk0LM5ysR4G0127en+0= + pmVu1FdbipTM+/iwPnGrii8WA9GAUkEuZ67Robx/skY= diff --git a/Security/obj/Debug/Security.csproj.AssemblyReference.cache b/Security/obj/Debug/Security.csproj.AssemblyReference.cache index 44218d0..9626c1d 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 ff7b9da..82290ee 100644 --- a/Security/obj/Debug/ServiceSecurity.application +++ b/Security/obj/Debug/ServiceSecurity.application @@ -14,7 +14,7 @@ - EBfB7rWH7rhlMMF8pi/rhBpJbTKgP4sBeCT9vVAl6h8= + brRB6Tj3UIh+1hHSCP7cVnP1AJt+M46i6AtPawgLXRE= diff --git a/Security/obj/Debug/ServiceSecurity.exe.manifest b/Security/obj/Debug/ServiceSecurity.exe.manifest index 49869dd..d9f14d1 100644 --- a/Security/obj/Debug/ServiceSecurity.exe.manifest +++ b/Security/obj/Debug/ServiceSecurity.exe.manifest @@ -42,14 +42,14 @@ - + - ixPV+LB7PJDxkCpxkYqydnifOk0LM5ysR4G0127en+0= + pmVu1FdbipTM+/iwPnGrii8WA9GAUkEuZ67Robx/skY=