diff --git a/.vs/DongYingAPI/FileContentIndex/231d8966-ad58-48e0-84e1-27edad717de5.vsidx b/.vs/DongYingAPI/FileContentIndex/231d8966-ad58-48e0-84e1-27edad717de5.vsidx deleted file mode 100644 index 67346bb..0000000 Binary files a/.vs/DongYingAPI/FileContentIndex/231d8966-ad58-48e0-84e1-27edad717de5.vsidx and /dev/null differ diff --git a/.vs/DongYingAPI/FileContentIndex/510c5b28-479b-41ad-b93a-980603f80677.vsidx b/.vs/DongYingAPI/FileContentIndex/510c5b28-479b-41ad-b93a-980603f80677.vsidx new file mode 100644 index 0000000..3b58e82 Binary files /dev/null and b/.vs/DongYingAPI/FileContentIndex/510c5b28-479b-41ad-b93a-980603f80677.vsidx differ diff --git a/.vs/DongYingAPI/FileContentIndex/9ff740fc-f05b-4e72-acd5-36b4744db63f.vsidx b/.vs/DongYingAPI/FileContentIndex/9ff740fc-f05b-4e72-acd5-36b4744db63f.vsidx new file mode 100644 index 0000000..53cd987 Binary files /dev/null and b/.vs/DongYingAPI/FileContentIndex/9ff740fc-f05b-4e72-acd5-36b4744db63f.vsidx differ diff --git a/.vs/DongYingAPI/FileContentIndex/b16d4c82-5c70-4566-9397-97d42fd6cb06.vsidx b/.vs/DongYingAPI/FileContentIndex/b16d4c82-5c70-4566-9397-97d42fd6cb06.vsidx deleted file mode 100644 index b909402..0000000 Binary files a/.vs/DongYingAPI/FileContentIndex/b16d4c82-5c70-4566-9397-97d42fd6cb06.vsidx and /dev/null differ diff --git a/.vs/DongYingAPI/FileContentIndex/be206bc9-9d4d-4455-b935-78f69f01d931.vsidx b/.vs/DongYingAPI/FileContentIndex/be206bc9-9d4d-4455-b935-78f69f01d931.vsidx new file mode 100644 index 0000000..c49316e Binary files /dev/null and b/.vs/DongYingAPI/FileContentIndex/be206bc9-9d4d-4455-b935-78f69f01d931.vsidx differ diff --git a/.vs/DongYingAPI/FileContentIndex/d4e6f3be-d5d8-4da3-9662-6f1811d2f5f8.vsidx b/.vs/DongYingAPI/FileContentIndex/d4e6f3be-d5d8-4da3-9662-6f1811d2f5f8.vsidx deleted file mode 100644 index adc01d6..0000000 Binary files a/.vs/DongYingAPI/FileContentIndex/d4e6f3be-d5d8-4da3-9662-6f1811d2f5f8.vsidx and /dev/null differ diff --git a/.vs/DongYingAPI/FileContentIndex/ecdea1e6-945d-405f-a3d7-1d9ccda411a4.vsidx b/.vs/DongYingAPI/FileContentIndex/ecdea1e6-945d-405f-a3d7-1d9ccda411a4.vsidx deleted file mode 100644 index c0058c8..0000000 Binary files a/.vs/DongYingAPI/FileContentIndex/ecdea1e6-945d-405f-a3d7-1d9ccda411a4.vsidx and /dev/null differ diff --git a/.vs/DongYingAPI/FileContentIndex/f6555af1-e2db-41b4-88e5-930a996246a3.vsidx b/.vs/DongYingAPI/FileContentIndex/f6555af1-e2db-41b4-88e5-930a996246a3.vsidx new file mode 100644 index 0000000..66b992b Binary files /dev/null and b/.vs/DongYingAPI/FileContentIndex/f6555af1-e2db-41b4-88e5-930a996246a3.vsidx differ diff --git a/.vs/DongYingAPI/config/applicationhost.config b/.vs/DongYingAPI/config/applicationhost.config index 9900f5c..3ac8b41 100644 --- a/.vs/DongYingAPI/config/applicationhost.config +++ b/.vs/DongYingAPI/config/applicationhost.config @@ -155,12 +155,21 @@ - + + + + + + + + + + diff --git a/.vs/DongYingAPI/v17/.suo b/.vs/DongYingAPI/v17/.suo index 16c5a66..6e3b5e5 100644 Binary files a/.vs/DongYingAPI/v17/.suo and b/.vs/DongYingAPI/v17/.suo differ diff --git a/DataServer/BLL/device_operation.cs b/DataServer/BLL/device_operation.cs new file mode 100644 index 0000000..1899c8b --- /dev/null +++ b/DataServer/BLL/device_operation.cs @@ -0,0 +1,179 @@ +/** 版本信息模板在安装目录下，可自行修改。 +* device_operation.cs +* +* 功 能： N/A +* 类 名： device_operation +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +* V0.01 2024/1/9 10:06:19 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 +{ + /// + /// device_operation + /// + public partial class device_operation + { + private readonly DataService.DAL.device_operation dal=new DataService.DAL.device_operation(); + public device_operation() + {} + #region BasicMethod + /// + /// 是否存在该记录 + /// + public bool Exists(string OperationId) + { + return dal.Exists(OperationId); + } + + /// + /// 增加一条数据 + /// + public bool Add(DataService.Model.device_operation model) + { + return dal.Add(model); + } + + /// + /// 更新一条数据 + /// + public bool Update(DataService.Model.device_operation model) + { + return dal.Update(model); + } + + /// + /// 删除一条数据 + /// + public bool Delete(string OperationId) + { + + return dal.Delete(OperationId); + } + /// + /// 删除一条数据 + /// + public bool DeleteList(string OperationIdlist ) + { + return dal.DeleteList(OperationIdlist ); + } + + /// + /// 得到一个对象实体 + /// + public DataService.Model.device_operation GetModel(string OperationId) + { + + return dal.GetModel(OperationId); + } + + /// + /// 得到一个对象实体，从缓存中 + /// + public DataService.Model.device_operation GetModelByCache(string OperationId) + { + + string CacheKey = "device_operationModel-" + OperationId; + object objModel = Maticsoft.Common.DataCache.GetCache(CacheKey); + if (objModel == null) + { + try + { + objModel = dal.GetModel(OperationId); + 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.device_operation)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.device_operation 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/BLL/electricity_price.cs b/DataServer/BLL/electricity_price.cs new file mode 100644 index 0000000..f242666 --- /dev/null +++ b/DataServer/BLL/electricity_price.cs @@ -0,0 +1,179 @@ +/** 版本信息模板在安装目录下，可自行修改。 +* electricity_price.cs +* +* 功 能： N/A +* 类 名： electricity_price +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +* V0.01 2024/1/9 10:06:20 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 +{ + /// + /// electricity_price + /// + public partial class electricity_price + { + private readonly DataService.DAL.electricity_price dal=new DataService.DAL.electricity_price(); + public electricity_price() + {} + #region BasicMethod + /// + /// 是否存在该记录 + /// + public bool Exists(string PriceId) + { + return dal.Exists(PriceId); + } + + /// + /// 增加一条数据 + /// + public bool Add(DataService.Model.electricity_price model) + { + return dal.Add(model); + } + + /// + /// 更新一条数据 + /// + public bool Update(DataService.Model.electricity_price model) + { + return dal.Update(model); + } + + /// + /// 删除一条数据 + /// + public bool Delete(string PriceId) + { + + return dal.Delete(PriceId); + } + /// + /// 删除一条数据 + /// + public bool DeleteList(string PriceIdlist ) + { + return dal.DeleteList(PriceIdlist ); + } + + /// + /// 得到一个对象实体 + /// + public DataService.Model.electricity_price GetModel(string PriceId) + { + + return dal.GetModel(PriceId); + } + + /// + /// 得到一个对象实体，从缓存中 + /// + public DataService.Model.electricity_price GetModelByCache(string PriceId) + { + + string CacheKey = "electricity_priceModel-" + PriceId; + object objModel = Maticsoft.Common.DataCache.GetCache(CacheKey); + if (objModel == null) + { + try + { + objModel = dal.GetModel(PriceId); + 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.electricity_price)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.electricity_price 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_operation.cs b/DataServer/DAL/device_operation.cs new file mode 100644 index 0000000..20911fd --- /dev/null +++ b/DataServer/DAL/device_operation.cs @@ -0,0 +1,355 @@ +/** 版本信息模板在安装目录下，可自行修改。 +* device_operation.cs +* +* 功 能： N/A +* 类 名： device_operation +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +* V0.01 2024/1/9 10:06:19 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 +{ + /// + /// 数据访问类:device_operation + /// + public partial class device_operation + { + public device_operation() + {} + #region BasicMethod + + /// + /// 是否存在该记录 + /// + public bool Exists(string OperationId) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("select count(1) from device_operation"); + strSql.Append(" where OperationId=@OperationId "); + MySqlParameter[] parameters = { + new MySqlParameter("@OperationId", MySqlDbType.VarChar,50) }; + parameters[0].Value = OperationId; + + return DbHelperMySQL.Exists(strSql.ToString(),parameters); + } + + + /// + /// 增加一条数据 + /// + public bool Add(DataService.Model.device_operation model) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("insert into device_operation("); + strSql.Append("OperationId,EntryName,Status,InstrumentAddress,EquipmentClassification,Remark1,Remark2,Remark3,Remark4,Remark5)"); + strSql.Append(" values ("); + strSql.Append("@OperationId,@EntryName,@Status,@InstrumentAddress,@EquipmentClassification,@Remark1,@Remark2,@Remark3,@Remark4,@Remark5)"); + MySqlParameter[] parameters = { + new MySqlParameter("@OperationId", MySqlDbType.VarChar,50), + new MySqlParameter("@EntryName", MySqlDbType.VarChar,255), + new MySqlParameter("@Status", MySqlDbType.VarChar,255), + new MySqlParameter("@InstrumentAddress", MySqlDbType.VarChar,255), + new MySqlParameter("@EquipmentClassification", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark1", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark2", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark3", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark4", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark5", MySqlDbType.VarChar,255)}; + parameters[0].Value = model.OperationId; + parameters[1].Value = model.EntryName; + parameters[2].Value = model.Status; + parameters[3].Value = model.InstrumentAddress; + parameters[4].Value = model.EquipmentClassification; + parameters[5].Value = model.Remark1; + parameters[6].Value = model.Remark2; + parameters[7].Value = model.Remark3; + parameters[8].Value = model.Remark4; + parameters[9].Value = model.Remark5; + + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + /// + /// 更新一条数据 + /// + public bool Update(DataService.Model.device_operation model) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("update device_operation set "); + strSql.Append("EntryName=@EntryName,"); + strSql.Append("Status=@Status,"); + strSql.Append("InstrumentAddress=@InstrumentAddress,"); + strSql.Append("EquipmentClassification=@EquipmentClassification,"); + strSql.Append("Remark1=@Remark1,"); + strSql.Append("Remark2=@Remark2,"); + strSql.Append("Remark3=@Remark3,"); + strSql.Append("Remark4=@Remark4,"); + strSql.Append("Remark5=@Remark5"); + strSql.Append(" where OperationId=@OperationId "); + MySqlParameter[] parameters = { + new MySqlParameter("@EntryName", MySqlDbType.VarChar,255), + new MySqlParameter("@Status", MySqlDbType.VarChar,255), + new MySqlParameter("@InstrumentAddress", MySqlDbType.VarChar,255), + new MySqlParameter("@EquipmentClassification", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark1", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark2", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark3", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark4", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark5", MySqlDbType.VarChar,255), + new MySqlParameter("@OperationId", MySqlDbType.VarChar,50)}; + parameters[0].Value = model.EntryName; + parameters[1].Value = model.Status; + parameters[2].Value = model.InstrumentAddress; + parameters[3].Value = model.EquipmentClassification; + parameters[4].Value = model.Remark1; + parameters[5].Value = model.Remark2; + parameters[6].Value = model.Remark3; + parameters[7].Value = model.Remark4; + parameters[8].Value = model.Remark5; + parameters[9].Value = model.OperationId; + + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + + /// + /// 删除一条数据 + /// + public bool Delete(string OperationId) + { + + StringBuilder strSql=new StringBuilder(); + strSql.Append("delete from device_operation "); + strSql.Append(" where OperationId=@OperationId "); + MySqlParameter[] parameters = { + new MySqlParameter("@OperationId", MySqlDbType.VarChar,50) }; + parameters[0].Value = OperationId; + + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + /// + /// 批量删除数据 + /// + public bool DeleteList(string OperationIdlist ) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("delete from device_operation "); + strSql.Append(" where OperationId in ("+OperationIdlist + ") "); + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString()); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + + + /// + /// 得到一个对象实体 + /// + public DataService.Model.device_operation GetModel(string OperationId) + { + + StringBuilder strSql=new StringBuilder(); + strSql.Append("select OperationId,EntryName,Status,InstrumentAddress,EquipmentClassification,Remark1,Remark2,Remark3,Remark4,Remark5 from device_operation "); + strSql.Append(" where OperationId=@OperationId "); + MySqlParameter[] parameters = { + new MySqlParameter("@OperationId", MySqlDbType.VarChar,50) }; + parameters[0].Value = OperationId; + + DataService.Model.device_operation model=new DataService.Model.device_operation(); + 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.device_operation DataRowToModel(DataRow row) + { + DataService.Model.device_operation model=new DataService.Model.device_operation(); + if (row != null) + { + if(row["OperationId"]!=null) + { + model.OperationId=row["OperationId"].ToString(); + } + if(row["EntryName"]!=null) + { + model.EntryName=row["EntryName"].ToString(); + } + if(row["Status"]!=null) + { + model.Status=row["Status"].ToString(); + } + if(row["InstrumentAddress"]!=null) + { + model.InstrumentAddress=row["InstrumentAddress"].ToString(); + } + if(row["EquipmentClassification"]!=null) + { + model.EquipmentClassification=row["EquipmentClassification"].ToString(); + } + if(row["Remark1"]!=null) + { + model.Remark1=row["Remark1"].ToString(); + } + if(row["Remark2"]!=null) + { + model.Remark2=row["Remark2"].ToString(); + } + if(row["Remark3"]!=null) + { + model.Remark3=row["Remark3"].ToString(); + } + if(row["Remark4"]!=null) + { + model.Remark4=row["Remark4"].ToString(); + } + if(row["Remark5"]!=null) + { + model.Remark5=row["Remark5"].ToString(); + } + } + return model; + } + + /// + /// 获得数据列表 + /// + public DataSet GetList(string strWhere) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("select OperationId,EntryName,Status,InstrumentAddress,EquipmentClassification,Remark1,Remark2,Remark3,Remark4,Remark5 "); + strSql.Append(" FROM device_operation "); + 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_operation "); + if(strWhere.Trim()!="") + { + strSql.Append(" where "+strWhere); + } + object obj = DbHelperMySQL.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.OperationId desc"); + } + strSql.Append(")AS Row, T.* from device_operation 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_operation"; + parameters[1].Value = "OperationId"; + 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/DAL/electricity_price.cs b/DataServer/DAL/electricity_price.cs new file mode 100644 index 0000000..5db2491 --- /dev/null +++ b/DataServer/DAL/electricity_price.cs @@ -0,0 +1,346 @@ +/** 版本信息模板在安装目录下，可自行修改。 +* electricity_price.cs +* +* 功 能： N/A +* 类 名： electricity_price +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +* V0.01 2024/1/9 10:06:20 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 +{ + /// + /// 数据访问类:electricity_price + /// + public partial class electricity_price + { + public electricity_price() + {} + #region BasicMethod + + /// + /// 是否存在该记录 + /// + public bool Exists(string PriceId) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("select count(1) from electricity_price"); + strSql.Append(" where PriceId=@PriceId "); + MySqlParameter[] parameters = { + new MySqlParameter("@PriceId", MySqlDbType.VarChar,50) }; + parameters[0].Value = PriceId; + + return DbHelperMySQL.Exists(strSql.ToString(),parameters); + } + + + /// + /// 增加一条数据 + /// + public bool Add(DataService.Model.electricity_price model) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("insert into electricity_price("); + strSql.Append("PriceId,Cost,UnitPrice,AcquisitionTime,Remark1,Remark2,Remark3,Remark4,Remark5)"); + strSql.Append(" values ("); + strSql.Append("@PriceId,@Cost,@UnitPrice,@AcquisitionTime,@Remark1,@Remark2,@Remark3,@Remark4,@Remark5)"); + MySqlParameter[] parameters = { + new MySqlParameter("@PriceId", MySqlDbType.VarChar,50), + new MySqlParameter("@Cost", MySqlDbType.Decimal,10), + new MySqlParameter("@UnitPrice", MySqlDbType.Decimal,10), + new MySqlParameter("@AcquisitionTime", MySqlDbType.DateTime), + new MySqlParameter("@Remark1", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark2", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark3", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark4", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark5", MySqlDbType.VarChar,255)}; + parameters[0].Value = model.PriceId; + parameters[1].Value = model.Cost; + parameters[2].Value = model.UnitPrice; + parameters[3].Value = model.AcquisitionTime; + parameters[4].Value = model.Remark1; + parameters[5].Value = model.Remark2; + parameters[6].Value = model.Remark3; + parameters[7].Value = model.Remark4; + parameters[8].Value = model.Remark5; + + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + /// + /// 更新一条数据 + /// + public bool Update(DataService.Model.electricity_price model) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("update electricity_price set "); + strSql.Append("Cost=@Cost,"); + strSql.Append("UnitPrice=@UnitPrice,"); + strSql.Append("AcquisitionTime=@AcquisitionTime,"); + strSql.Append("Remark1=@Remark1,"); + strSql.Append("Remark2=@Remark2,"); + strSql.Append("Remark3=@Remark3,"); + strSql.Append("Remark4=@Remark4,"); + strSql.Append("Remark5=@Remark5"); + strSql.Append(" where PriceId=@PriceId "); + MySqlParameter[] parameters = { + new MySqlParameter("@Cost", MySqlDbType.Decimal,10), + new MySqlParameter("@UnitPrice", MySqlDbType.Decimal,10), + new MySqlParameter("@AcquisitionTime", MySqlDbType.DateTime), + new MySqlParameter("@Remark1", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark2", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark3", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark4", MySqlDbType.VarChar,255), + new MySqlParameter("@Remark5", MySqlDbType.VarChar,255), + new MySqlParameter("@PriceId", MySqlDbType.VarChar,50)}; + parameters[0].Value = model.Cost; + parameters[1].Value = model.UnitPrice; + parameters[2].Value = model.AcquisitionTime; + parameters[3].Value = model.Remark1; + parameters[4].Value = model.Remark2; + parameters[5].Value = model.Remark3; + parameters[6].Value = model.Remark4; + parameters[7].Value = model.Remark5; + parameters[8].Value = model.PriceId; + + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + + /// + /// 删除一条数据 + /// + public bool Delete(string PriceId) + { + + StringBuilder strSql=new StringBuilder(); + strSql.Append("delete from electricity_price "); + strSql.Append(" where PriceId=@PriceId "); + MySqlParameter[] parameters = { + new MySqlParameter("@PriceId", MySqlDbType.VarChar,50) }; + parameters[0].Value = PriceId; + + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + /// + /// 批量删除数据 + /// + public bool DeleteList(string PriceIdlist ) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("delete from electricity_price "); + strSql.Append(" where PriceId in ("+PriceIdlist + ") "); + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString()); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + + + /// + /// 得到一个对象实体 + /// + public DataService.Model.electricity_price GetModel(string PriceId) + { + + StringBuilder strSql=new StringBuilder(); + strSql.Append("select PriceId,Cost,UnitPrice,AcquisitionTime,Remark1,Remark2,Remark3,Remark4,Remark5 from electricity_price "); + strSql.Append(" where PriceId=@PriceId "); + MySqlParameter[] parameters = { + new MySqlParameter("@PriceId", MySqlDbType.VarChar,50) }; + parameters[0].Value = PriceId; + + DataService.Model.electricity_price model=new DataService.Model.electricity_price(); + 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.electricity_price DataRowToModel(DataRow row) + { + DataService.Model.electricity_price model=new DataService.Model.electricity_price(); + if (row != null) + { + if(row["PriceId"]!=null) + { + model.PriceId=row["PriceId"].ToString(); + } + if(row["Cost"]!=null && row["Cost"].ToString()!="") + { + model.Cost=decimal.Parse(row["Cost"].ToString()); + } + if(row["UnitPrice"]!=null && row["UnitPrice"].ToString()!="") + { + model.UnitPrice=decimal.Parse(row["UnitPrice"].ToString()); + } + if(row["AcquisitionTime"]!=null && row["AcquisitionTime"].ToString()!="") + { + model.AcquisitionTime=DateTime.Parse(row["AcquisitionTime"].ToString()); + } + if(row["Remark1"]!=null) + { + model.Remark1=row["Remark1"].ToString(); + } + if(row["Remark2"]!=null) + { + model.Remark2=row["Remark2"].ToString(); + } + if(row["Remark3"]!=null) + { + model.Remark3=row["Remark3"].ToString(); + } + if(row["Remark4"]!=null) + { + model.Remark4=row["Remark4"].ToString(); + } + if(row["Remark5"]!=null) + { + model.Remark5=row["Remark5"].ToString(); + } + } + return model; + } + + /// + /// 获得数据列表 + /// + public DataSet GetList(string strWhere) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("select PriceId,Cost,UnitPrice,AcquisitionTime,Remark1,Remark2,Remark3,Remark4,Remark5 "); + strSql.Append(" FROM electricity_price "); + 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 electricity_price "); + if(strWhere.Trim()!="") + { + strSql.Append(" where "+strWhere); + } + object obj = DbHelperMySQL.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.PriceId desc"); + } + strSql.Append(")AS Row, T.* from electricity_price 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 = "electricity_price"; + parameters[1].Value = "PriceId"; + 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 1d01cd6..cc75d55 100644 --- a/DataServer/DataServer.csproj +++ b/DataServer/DataServer.csproj @@ -50,6 +50,10 @@ + + + + @@ -72,10 +76,17 @@ + + + + + + + diff --git a/DataServer/Model/device_operation.cs b/DataServer/Model/device_operation.cs new file mode 100644 index 0000000..ea9e3a2 --- /dev/null +++ b/DataServer/Model/device_operation.cs @@ -0,0 +1,123 @@ +/** 版本信息模板在安装目录下，可自行修改。 +* device_operation.cs +* +* 功 能： N/A +* 类 名： device_operation +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +* V0.01 2024/1/9 10:06:19 N/A 初版 +* +* Copyright (c) 2012 Maticsoft Corporation. All rights reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　版权所有：动软卓越（北京）科技有限公司　　　　　　　　　　　　　　│ +*└──────────────────────────────────┘ +*/ +using System; +namespace DataService.Model +{ + /// + /// device_operation:实体类(属性说明自动提取数据库字段的描述信息) + /// + [Serializable] + public partial class device_operation + { + public device_operation() + {} + #region Model + private string _operationid; + private string _entryname; + private string _status; + private string _instrumentaddress; + private string _equipmentclassification; + private string _remark1; + private string _remark2; + private string _remark3; + private string _remark4; + private string _remark5; + /// + /// + /// + public string OperationId + { + set{ _operationid=value;} + get{return _operationid;} + } + /// + /// + /// + public string EntryName + { + set{ _entryname=value;} + get{return _entryname;} + } + /// + /// + /// + public string Status + { + set{ _status=value;} + get{return _status;} + } + /// + /// + /// + public string InstrumentAddress + { + set{ _instrumentaddress=value;} + get{return _instrumentaddress;} + } + /// + /// + /// + public string EquipmentClassification + { + set{ _equipmentclassification=value;} + get{return _equipmentclassification;} + } + /// + /// + /// + public string Remark1 + { + set{ _remark1=value;} + get{return _remark1;} + } + /// + /// + /// + public string Remark2 + { + set{ _remark2=value;} + get{return _remark2;} + } + /// + /// + /// + public string Remark3 + { + set{ _remark3=value;} + get{return _remark3;} + } + /// + /// + /// + public string Remark4 + { + set{ _remark4=value;} + get{return _remark4;} + } + /// + /// + /// + public string Remark5 + { + set{ _remark5=value;} + get{return _remark5;} + } + #endregion Model + + } +} + diff --git a/DataServer/Model/electricity_price.cs b/DataServer/Model/electricity_price.cs new file mode 100644 index 0000000..bd81331 --- /dev/null +++ b/DataServer/Model/electricity_price.cs @@ -0,0 +1,114 @@ +/** 版本信息模板在安装目录下，可自行修改。 +* electricity_price.cs +* +* 功 能： N/A +* 类 名： electricity_price +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +* V0.01 2024/1/9 10:06:20 N/A 初版 +* +* Copyright (c) 2012 Maticsoft Corporation. All rights reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　版权所有：动软卓越（北京）科技有限公司　　　　　　　　　　　　　　│ +*└──────────────────────────────────┘ +*/ +using System; +namespace DataService.Model +{ + /// + /// electricity_price:实体类(属性说明自动提取数据库字段的描述信息) + /// + [Serializable] + public partial class electricity_price + { + public electricity_price() + {} + #region Model + private string _priceid; + private decimal? _cost; + private decimal? _unitprice; + private DateTime? _acquisitiontime; + private string _remark1; + private string _remark2; + private string _remark3; + private string _remark4; + private string _remark5; + /// + /// + /// + public string PriceId + { + set{ _priceid=value;} + get{return _priceid;} + } + /// + /// + /// + public decimal? Cost + { + set{ _cost=value;} + get{return _cost;} + } + /// + /// + /// + public decimal? UnitPrice + { + set{ _unitprice=value;} + get{return _unitprice;} + } + /// + /// + /// + public DateTime? AcquisitionTime + { + set{ _acquisitiontime=value;} + get{return _acquisitiontime;} + } + /// + /// + /// + public string Remark1 + { + set{ _remark1=value;} + get{return _remark1;} + } + /// + /// + /// + public string Remark2 + { + set{ _remark2=value;} + get{return _remark2;} + } + /// + /// + /// + public string Remark3 + { + set{ _remark3=value;} + get{return _remark3;} + } + /// + /// + /// + public string Remark4 + { + set{ _remark4=value;} + get{return _remark4;} + } + /// + /// + /// + public string Remark5 + { + set{ _remark5=value;} + get{return _remark5;} + } + #endregion Model + + } +} + diff --git a/DataServer/api/EnergyEfficiency/get_amount_energy_response.cs b/DataServer/api/EnergyEfficiency/get_amount_energy_response.cs new file mode 100644 index 0000000..67060df --- /dev/null +++ b/DataServer/api/EnergyEfficiency/get_amount_energy_response.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DataServer.api.EnergyEfficiency +{ + /// + /// 获取节能量（节电率）接口响应实体 + /// + public class get_amount_energy_response + { + } +} diff --git a/DataServer/api/EnergyEfficiency/get_device_operation_response.cs b/DataServer/api/EnergyEfficiency/get_device_operation_response.cs new file mode 100644 index 0000000..3f12ab6 --- /dev/null +++ b/DataServer/api/EnergyEfficiency/get_device_operation_response.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DataServer.api.EnergyEfficiency +{ + /// + /// 获取设备运行情况接口响应实体 + /// + public class get_device_operation_response + { + } +} diff --git a/DataServer/api/EnergyEfficiency/get_electricity_price_response.cs b/DataServer/api/EnergyEfficiency/get_electricity_price_response.cs new file mode 100644 index 0000000..b2dd36e --- /dev/null +++ b/DataServer/api/EnergyEfficiency/get_electricity_price_response.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DataServer.api.EnergyEfficiency +{ + /// + /// 获取电费电价接口响应实体 + /// + public class get_electricity_price_response + { + } +} diff --git a/DataServer/api/EnergyEfficiency/get_unit_consumption_response.cs b/DataServer/api/EnergyEfficiency/get_unit_consumption_response.cs new file mode 100644 index 0000000..db33b84 --- /dev/null +++ b/DataServer/api/EnergyEfficiency/get_unit_consumption_response.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DataServer.api.EnergyEfficiency +{ + /// + /// 获取单耗接口相应实体 + /// + public class get_unit_consumption_response + { + /// + /// 返回码 + /// + public int code { get; set; } + + /// + /// 返回说明 + /// + public string msg { get; set; } + + public unit_consumption data { get; set; } + } + + public class unit_consumption + { + /// + /// 人均用水量 + /// + public decimal avg_water_consumption { get; set; } + + /// + /// 人均综合能耗 + /// + public decimal avg_energy_consumption { get; set; } + + /// + /// 单位建筑面积综合能耗 + /// + public decimal unit_building_area { get; set; } + } +} diff --git a/DataServer/api/Test.cs b/DataServer/api/Test.cs new file mode 100644 index 0000000..15da664 --- /dev/null +++ b/DataServer/api/Test.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DataServer.api +{ + public class Test + { + public string username { get; set; } + + public string password { get; set; } + } +} diff --git a/DataServer/bin/Debug/DataServer.dll b/DataServer/bin/Debug/DataServer.dll index c39a649..cd6959e 100644 Binary files a/DataServer/bin/Debug/DataServer.dll and b/DataServer/bin/Debug/DataServer.dll differ diff --git a/DataServer/bin/Debug/DataServer.pdb b/DataServer/bin/Debug/DataServer.pdb index d94d545..eeb356a 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.AssemblyReference.cache b/DataServer/obj/Debug/DataServer.csproj.AssemblyReference.cache index 2a3dc6a..5d41262 100644 Binary files a/DataServer/obj/Debug/DataServer.csproj.AssemblyReference.cache and b/DataServer/obj/Debug/DataServer.csproj.AssemblyReference.cache differ diff --git a/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache b/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache index b61b7a6..ac5b59d 100644 --- a/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache +++ b/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -79c32f87fb0acba6d359a5e1073537ed069eb160 +3863e3bbe6893fb04bc348f8625f89315ddb71af diff --git a/DataServer/obj/Debug/DataServer.csproj.FileListAbsolute.txt b/DataServer/obj/Debug/DataServer.csproj.FileListAbsolute.txt index 4538626..df58395 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 +F:\项目\东营两馆一宫项目\DongYing\DataServer\bin\Debug\DataServer.dll +F:\项目\东营两馆一宫项目\DongYing\DataServer\bin\Debug\DataServer.pdb +F:\项目\东营两馆一宫项目\DongYing\DataServer\bin\Debug\Maticsoft.Common.dll +F:\项目\东营两馆一宫项目\DongYing\DataServer\bin\Debug\Maticsoft.DBUtility.dll +F:\项目\东营两馆一宫项目\DongYing\DataServer\bin\Debug\MySql.Data.dll +F:\项目\东营两馆一宫项目\DongYing\DataServer\obj\Debug\DataServer.csproj.AssemblyReference.cache +F:\项目\东营两馆一宫项目\DongYing\DataServer\obj\Debug\DataServer.csproj.CoreCompileInputs.cache +F:\项目\东营两馆一宫项目\DongYing\DataServer\obj\Debug\DataServer.csproj.CopyComplete +F:\项目\东营两馆一宫项目\DongYing\DataServer\obj\Debug\DataServer.dll +F:\项目\东营两馆一宫项目\DongYing\DataServer\obj\Debug\DataServer.pdb diff --git a/DataServer/obj/Debug/DataServer.dll b/DataServer/obj/Debug/DataServer.dll index c39a649..cd6959e 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 d94d545..eeb356a 100644 Binary files a/DataServer/obj/Debug/DataServer.pdb and b/DataServer/obj/Debug/DataServer.pdb differ diff --git a/DataServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/DataServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 695dc4b..df3b5db 100644 Binary files a/DataServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/DataServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/DongYingAPI/Controllers/api/EnergyEfficiency/GetAmountEnergyController.cs b/DongYingAPI/Controllers/api/EnergyEfficiency/GetAmountEnergyController.cs new file mode 100644 index 0000000..62700f0 --- /dev/null +++ b/DongYingAPI/Controllers/api/EnergyEfficiency/GetAmountEnergyController.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Web.Http; + +namespace DongYingAPI.Controllers.api.EnergyEfficiency +{ + /// + /// 获取节能量（节电率）接口 + /// + public class GetAmountEnergyController : ApiController + { + } +} diff --git a/DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs b/DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs new file mode 100644 index 0000000..54eed3b --- /dev/null +++ b/DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Web.Http; + +namespace DongYingAPI.Controllers.api.EnergyEfficiency +{ + /// + /// 获取设备运行情况接口 + /// + public class GetDeviceOperationController : ApiController + { + } +} diff --git a/DongYingAPI/Controllers/api/EnergyEfficiency/GetElectricityPriceController.cs b/DongYingAPI/Controllers/api/EnergyEfficiency/GetElectricityPriceController.cs new file mode 100644 index 0000000..edb8154 --- /dev/null +++ b/DongYingAPI/Controllers/api/EnergyEfficiency/GetElectricityPriceController.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Web.Http; + +namespace DongYingAPI.Controllers.api.EnergyEfficiency +{ + /// + /// 获取电费电价接口 + /// + public class GetElectricityPriceController : ApiController + { + } +} diff --git a/DongYingAPI/Controllers/api/EnergyEfficiency/GetUnitConsumptionController.cs b/DongYingAPI/Controllers/api/EnergyEfficiency/GetUnitConsumptionController.cs new file mode 100644 index 0000000..98c0eca --- /dev/null +++ b/DongYingAPI/Controllers/api/EnergyEfficiency/GetUnitConsumptionController.cs @@ -0,0 +1,43 @@ +using DataServer.api; +using DataServer.api.EnergyEfficiency; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Text; +using System.Web.Http; + +namespace DongYingAPI.Controllers.api.EnergyEfficiency +{ + [Route("api/[controller]")] + public class GetUnitConsumptionController : ApiController + { + DataServer.BLL.device_data bll = new DataServer.BLL.device_data(); + + /// + /// 获取单耗接口 + /// + /// + public HttpResponseMessage Get() + { + var res = new get_unit_consumption_response(); + try + { + var now = DateTime.Now; + var start_time = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var end_time = now.ToString("yyyy-MM-dd HH") + ":00:00"; + + //根据事件查询两条数据，然后值相减为用水量 + } + catch (Exception ex) + { + 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/DongYingAPI/Controllers/api/loginController.cs b/DongYingAPI/Controllers/api/loginController.cs new file mode 100644 index 0000000..d149e35 --- /dev/null +++ b/DongYingAPI/Controllers/api/loginController.cs @@ -0,0 +1,22 @@ +using DataServer.api; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Text; +using System.Web.Http; + +namespace DongYingAPI.Controllers.api +{ + [Route("api/[controller]")] + public class loginController : ApiController + { + public HttpResponseMessage Post([FromBody] Test test) + { + HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(test), Encoding.GetEncoding("UTF-8"), "application/json") }; + return result; + } + } +} diff --git a/DongYingAPI/DongYingAPI.csproj b/DongYingAPI/DongYingAPI.csproj index 29da78a..823feb2 100644 --- a/DongYingAPI/DongYingAPI.csproj +++ b/DongYingAPI/DongYingAPI.csproj @@ -159,6 +159,10 @@ + + + + @@ -178,6 +182,7 @@ + @@ -288,7 +293,7 @@ True 53875 / - https://localhost:44319/ + http://localhost:44319/ False False diff --git a/DongYingAPI/DongYingAPI.csproj.user b/DongYingAPI/DongYingAPI.csproj.user index 7dea718..35a1024 100644 --- a/DongYingAPI/DongYingAPI.csproj.user +++ b/DongYingAPI/DongYingAPI.csproj.user @@ -10,6 +10,14 @@ Debug|Any CPU E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DongYingAPI\Properties\PublishProfiles\FolderProfile.pubxml + ApiControllerEmptyScaffolder + root/Common/Web API + 600 + True + False + True + + False diff --git a/DongYingAPI/bin/DataServer.dll b/DongYingAPI/bin/DataServer.dll index c39a649..cd6959e 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 3c4fd98..eeb356a 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 9b340b2..659a843 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 df46745..8de2cf6 100644 Binary files a/DongYingAPI/bin/DongYingAPI.pdb and b/DongYingAPI/bin/DongYingAPI.pdb differ diff --git a/DongYingAPI/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/DongYingAPI/obj/Debug/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 0000000..8499c13 Binary files /dev/null and b/DongYingAPI/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/DongYingAPI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/DongYingAPI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5b89704..d4ededd 100644 Binary files a/DongYingAPI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/DongYingAPI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache b/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache index cddc2d3..61fd812 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.csproj.CoreCompileInputs.cache b/DongYingAPI/obj/Debug/DongYingAPI.csproj.CoreCompileInputs.cache index 7d22727..a4b7f29 100644 --- a/DongYingAPI/obj/Debug/DongYingAPI.csproj.CoreCompileInputs.cache +++ b/DongYingAPI/obj/Debug/DongYingAPI.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d18cef7fac424a3532ac4631b487947fb1318071 +1aa84be803425da884eb41ed9f10be0159b1b291 diff --git a/DongYingAPI/obj/Debug/DongYingAPI.csproj.FileListAbsolute.txt b/DongYingAPI/obj/Debug/DongYingAPI.csproj.FileListAbsolute.txt index 427902d..5b70572 100644 --- a/DongYingAPI/obj/Debug/DongYingAPI.csproj.FileListAbsolute.txt +++ b/DongYingAPI/obj/Debug/DongYingAPI.csproj.FileListAbsolute.txt @@ -98,3 +98,103 @@ E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DongYingAPI\bin\MySq E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DongYingAPI\bin\Maticsoft.DBUtility.dll E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DongYingAPI\bin\Maticsoft.Common.dll E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DongYingAPI\bin\DataServer.pdb +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\obj\Debug\DongYingAPI.csproj.AssemblyReference.cache +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\obj\Debug\DongYingAPI.csproj.CoreCompileInputs.cache +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\obj\Debug\DongYingAPI.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\obj\Debug\DongYingAPI.pdb +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\DongYingAPI.dll.config +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\DongYingAPI.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\DongYingAPI.pdb +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\csc.exe +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\csc.exe.config +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\csc.rsp +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\csi.exe +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\csi.exe.config +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\csi.rsp +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\Microsoft.Build.Tasks.CodeAnalysis.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\Microsoft.CodeAnalysis.CSharp.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\Microsoft.CodeAnalysis.CSharp.Scripting.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\Microsoft.CodeAnalysis.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\Microsoft.CodeAnalysis.Scripting.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\Microsoft.CodeAnalysis.VisualBasic.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\Microsoft.CSharp.Core.targets +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\Microsoft.DiaSymReader.Native.amd64.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\Microsoft.DiaSymReader.Native.x86.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\Microsoft.Managed.Core.targets +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\Microsoft.VisualBasic.Core.targets +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\Microsoft.Win32.Primitives.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.AppContext.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Collections.Immutable.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Console.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Diagnostics.DiagnosticSource.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Diagnostics.FileVersionInfo.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Diagnostics.StackTrace.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Globalization.Calendars.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.IO.Compression.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.IO.Compression.ZipFile.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.IO.FileSystem.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.IO.FileSystem.Primitives.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Net.Http.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Net.Sockets.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Reflection.Metadata.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Runtime.InteropServices.RuntimeInformation.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Security.Cryptography.Algorithms.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Security.Cryptography.Encoding.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Security.Cryptography.Primitives.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Security.Cryptography.X509Certificates.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Text.Encoding.CodePages.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Threading.Tasks.Extensions.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.ValueTuple.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Xml.ReaderWriter.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Xml.XmlDocument.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Xml.XPath.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\System.Xml.XPath.XDocument.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\vbc.exe +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\vbc.exe.config +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\vbc.rsp +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\VBCSCompiler.exe +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\roslyn\VBCSCompiler.exe.config +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\Antlr3.Runtime.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\DataServer.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\Microsoft.Web.Infrastructure.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\Newtonsoft.Json.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Net.Http.Formatting.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.Helpers.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.Http.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.Http.WebHost.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.Mvc.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.Optimization.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.Razor.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.WebPages.Deployment.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.WebPages.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.WebPages.Razor.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\WebGrease.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\MySql.Data.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\Maticsoft.DBUtility.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\Maticsoft.Common.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\DataServer.pdb +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\Newtonsoft.Json.xml +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Net.Http.Formatting.xml +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.Helpers.xml +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.Http.xml +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.Http.WebHost.xml +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.Mvc.xml +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.Optimization.xml +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.Razor.xml +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.WebPages.xml +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.WebPages.Deployment.xml +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\System.Web.WebPages.Razor.xml +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\Antlr3.Runtime.pdb +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.xml +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\zh-Hans\System.Net.Http.Formatting.resources.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\zh-Hans\System.Web.Helpers.resources.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\zh-Hans\System.Web.Http.resources.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\zh-Hans\System.Web.Http.WebHost.resources.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\zh-Hans\System.Web.Mvc.resources.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\zh-Hans\System.Web.Optimization.resources.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\zh-Hans\System.Web.Razor.resources.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\zh-Hans\System.Web.WebPages.resources.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll +F:\项目\东营两馆一宫项目\DongYing\DongYingAPI\obj\Debug\DongYingAPI.csproj.CopyComplete diff --git a/DongYingAPI/obj/Debug/DongYingAPI.dll b/DongYingAPI/obj/Debug/DongYingAPI.dll index 9b340b2..659a843 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 df46745..8de2cf6 100644 Binary files a/DongYingAPI/obj/Debug/DongYingAPI.pdb and b/DongYingAPI/obj/Debug/DongYingAPI.pdb differ diff --git a/Security/bin/Debug/DataServer.dll b/Security/bin/Debug/DataServer.dll index c39a649..cd6959e 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 d94d545..eeb356a 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 691e16c..d6e0cdf 100644 --- a/Security/bin/Debug/ServiceSecurity.application +++ b/Security/bin/Debug/ServiceSecurity.application @@ -14,7 +14,7 @@ - J0tTq3mxGG7wonr3/aIYzgMap5+sS1Z+uD0hKIVt6YY= + 0Bzf0QXnUv78JdIB7agIcUqLmezQ9UfyonTDxI8XHJY= diff --git a/Security/bin/Debug/ServiceSecurity.exe b/Security/bin/Debug/ServiceSecurity.exe index d3d42ce..b7da700 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 9310757..c1ced34 100644 --- a/Security/bin/Debug/ServiceSecurity.exe.manifest +++ b/Security/bin/Debug/ServiceSecurity.exe.manifest @@ -49,7 +49,7 @@ - 5ys3FX0GwC5HbQQsJ01Um+KJ1sFYZimJviQ4EsvPty0= + K0l3fAkvd0Oo21R0laeDmEZKSLEecfuMxzULFmU9Dl4= @@ -145,7 +145,7 @@ - AbKS0+JSVPlZR8uzUbbRI1ytNc4cHXFjp0FGtyZNKoM= + bBGXjzsUdez/4fBFf3aPgSq18+Y27v71pIMwhYseNKg= diff --git a/Security/bin/Debug/ServiceSecurity.pdb b/Security/bin/Debug/ServiceSecurity.pdb index 180ec2a..d2747ca 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 efe73c4..f412f74 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/DesignTimeResolveAssemblyReferencesInput.cache b/Security/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 7047644..4108052 100644 Binary files a/Security/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Security/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Security/obj/Debug/Security.csproj.AssemblyReference.cache b/Security/obj/Debug/Security.csproj.AssemblyReference.cache index 1e86bbd..11df349 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/Security.csproj.CoreCompileInputs.cache b/Security/obj/Debug/Security.csproj.CoreCompileInputs.cache index 64b9994..c69f0c7 100644 --- a/Security/obj/Debug/Security.csproj.CoreCompileInputs.cache +++ b/Security/obj/Debug/Security.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a042ae5e10c88f431d83088528db5952b0a78fa9 +cc564066d33e4a8809c3c565190fcf15db34768f diff --git a/Security/obj/Debug/Security.csproj.FileListAbsolute.txt b/Security/obj/Debug/Security.csproj.FileListAbsolute.txt index bc52abb..9de0976 100644 --- a/Security/obj/Debug/Security.csproj.FileListAbsolute.txt +++ b/Security/obj/Debug/Security.csproj.FileListAbsolute.txt @@ -25,3 +25,30 @@ E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\Security\obj\Debug\S E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\Security\bin\Debug\MySql.Data.dll E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\Security\bin\Debug\Maticsoft.DBUtility.dll E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\Security\bin\Debug\Maticsoft.Common.dll +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\ServiceSecurity.exe.config +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\ServiceSecurity.exe.manifest +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\ServiceSecurity.application +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\ServiceSecurity.exe +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\ServiceSecurity.pdb +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\DataServer.dll +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\HslCommunication.dll +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\LitJSON.dll +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\log4net.dll +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\Newtonsoft.Json.dll +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\MySql.Data.dll +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\Maticsoft.DBUtility.dll +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\Maticsoft.Common.dll +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\DataServer.pdb +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\HslCommunication.xml +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\log4net.xml +F:\项目\东营两馆一宫项目\DongYing\Security\bin\Debug\Newtonsoft.Json.xml +F:\项目\东营两馆一宫项目\DongYing\Security\obj\Debug\Security.csproj.AssemblyReference.cache +F:\项目\东营两馆一宫项目\DongYing\Security\obj\Debug\Security.csproj.SuggestedBindingRedirects.cache +F:\项目\东营两馆一宫项目\DongYing\Security\obj\Debug\Security.ProjectInstaller.resources +F:\项目\东营两馆一宫项目\DongYing\Security\obj\Debug\Security.csproj.GenerateResource.cache +F:\项目\东营两馆一宫项目\DongYing\Security\obj\Debug\Security.csproj.CoreCompileInputs.cache +F:\项目\东营两馆一宫项目\DongYing\Security\obj\Debug\ServiceSecurity.exe.manifest +F:\项目\东营两馆一宫项目\DongYing\Security\obj\Debug\ServiceSecurity.application +F:\项目\东营两馆一宫项目\DongYing\Security\obj\Debug\Security.csproj.CopyComplete +F:\项目\东营两馆一宫项目\DongYing\Security\obj\Debug\ServiceSecurity.exe +F:\项目\东营两馆一宫项目\DongYing\Security\obj\Debug\ServiceSecurity.pdb diff --git a/Security/obj/Debug/Security.csproj.GenerateResource.cache b/Security/obj/Debug/Security.csproj.GenerateResource.cache index 93f4112..cd2bf34 100644 Binary files a/Security/obj/Debug/Security.csproj.GenerateResource.cache and b/Security/obj/Debug/Security.csproj.GenerateResource.cache differ diff --git a/Security/obj/Debug/ServiceSecurity.application b/Security/obj/Debug/ServiceSecurity.application index 691e16c..d6e0cdf 100644 --- a/Security/obj/Debug/ServiceSecurity.application +++ b/Security/obj/Debug/ServiceSecurity.application @@ -14,7 +14,7 @@ - J0tTq3mxGG7wonr3/aIYzgMap5+sS1Z+uD0hKIVt6YY= + 0Bzf0QXnUv78JdIB7agIcUqLmezQ9UfyonTDxI8XHJY= diff --git a/Security/obj/Debug/ServiceSecurity.exe b/Security/obj/Debug/ServiceSecurity.exe index d3d42ce..b7da700 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 9310757..c1ced34 100644 --- a/Security/obj/Debug/ServiceSecurity.exe.manifest +++ b/Security/obj/Debug/ServiceSecurity.exe.manifest @@ -49,7 +49,7 @@ - 5ys3FX0GwC5HbQQsJ01Um+KJ1sFYZimJviQ4EsvPty0= + K0l3fAkvd0Oo21R0laeDmEZKSLEecfuMxzULFmU9Dl4= @@ -145,7 +145,7 @@ - AbKS0+JSVPlZR8uzUbbRI1ytNc4cHXFjp0FGtyZNKoM= + bBGXjzsUdez/4fBFf3aPgSq18+Y27v71pIMwhYseNKg= diff --git a/Security/obj/Debug/ServiceSecurity.pdb b/Security/obj/Debug/ServiceSecurity.pdb index 180ec2a..d2747ca 100644 Binary files a/Security/obj/Debug/ServiceSecurity.pdb and b/Security/obj/Debug/ServiceSecurity.pdb differ