版本1.3

DataService/BLL/unit_list.cs

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

DataService/DAL/unit_list.cs

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

DataService/DataService.csproj

@@ -71,6 +71,7 @@
     <Compile Include="api\get_energy_indexing.cs" />
     <Compile Include="api\get_failure_warning.cs" />
     <Compile Include="api\get_fault_condition.cs" />
+    <Compile Include="api\get_full_switch.cs" />
     <Compile Include="api\get_general_situation.cs" />
     <Compile Include="api\get_lighting_control.cs" />
     <Compile Include="api\get_lighting_detail.cs" />
@@ -83,6 +84,7 @@
     <Compile Include="api\get_multi_rate.cs" />
     <Compile Include="api\get_operating_state.cs" />
     <Compile Include="api\get_pavilion_lighting.cs" />
+    <Compile Include="api\get_policy_editing.cs" />
     <Compile Include="api\get_realtime_load.cs" />
     <Compile Include="api\get_real_load.cs" />
     <Compile Include="api\get_single_control.cs" />
@@ -101,6 +103,7 @@
     <Compile Include="BLL\meteorological_station.cs" />
     <Compile Include="BLL\multi_rate.cs" />
     <Compile Include="BLL\pollution_discharge.cs" />
+    <Compile Include="BLL\unit_list.cs" />
     <Compile Include="DAL\boot_strategy.cs" />
     <Compile Include="DAL\device_info.cs" />
     <Compile Include="DAL\electricity_data.cs" />
@@ -109,6 +112,7 @@
     <Compile Include="DAL\meteorological_station.cs" />
     <Compile Include="DAL\multi_rate.cs" />
     <Compile Include="DAL\pollution_discharge.cs" />
+    <Compile Include="DAL\unit_list.cs" />
     <Compile Include="Model\boot_strategy.cs" />
     <Compile Include="Model\device_info.cs" />
     <Compile Include="Model\electricity_data.cs" />
@@ -117,6 +121,7 @@
     <Compile Include="Model\meteorological_station.cs" />
     <Compile Include="Model\multi_rate.cs" />
     <Compile Include="Model\pollution_discharge.cs" />
+    <Compile Include="Model\unit_list.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup />

DataService/Model/unit_list.cs

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

DataService/api/get_full_switch.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DataService.api
+{
+    public class get_full_switch
+    {
+        public int code { get; set; }
+        public string msg { get; set; }
+        public List<data> data { get; set; }
+    }
+}

DataService/api/get_policy_editing.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DataService.api
+{
+    public class get_policy_editing
+    {
+        public int code { get; set; }
+        public string msg { get; set; }
+        public List<policy_editingData> data { get; set; }
+    }
+    public class policy_editingData
+    {
+        /// <summary>
+        /// 策略名称
+        /// </summary>
+        public string PolicyName {get; set; }
+        public List<policy_editing> data { get; set; }
+    }
+    public class policy_editing
+    {
+        /// <summary>
+        /// 全部设备
+        /// </summary>
+        public string DeviceName { get; set; }
+        public List<policy_editinglist> list { get; set; }
+    }
+    public class policy_editinglist
+    {
+        /// <summary>
+        /// 可选设备
+        /// </summary>
+        public string OptionalName { get; set; }
+    }
+
+}

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

@@ -1 +1 @@
-91e682ba9c8e4f7b2e87b62e68d2cf330fdbfe98
+b71e33957bcf55aa762eabbacd9ebc7eeb582c01

LonglslandExhibitionCenter/Controllers/api/GetAirconditioningLoadController.cs

@@ -37,7 +37,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 var data=new List<airconditioning_loadData>();
                 var list = bll.GetModelListDate(" DeviceName like '%空调%'", time);
                 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 date = DateTime.Now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
                     var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(date)).ToList();

LonglslandExhibitionCenter/Controllers/api/GetCarbonOverviewController.cs

@@ -29,7 +29,6 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 {
                     if (date == "月")
                     {
-
                             var stime = now.ToString("yyyyMM");
                             var a = bll.IsExistsTable("changdao_zhanlanguang", "electricity_data_" + stime);
                             if (a == false)

LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs

@@ -60,7 +60,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     decimal? bnum = 0;
                     if (time_day < 1)
                     {
-                        eedate = edate + ":00";
+                        eedate = edate + " 00:00:00";
                     }
                     else
                     {
@@ -93,7 +93,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     bnum = 0;
                     if (time_day < 1)
                     {
-                        eedate = edate + ":00";
+                        eedate = edate + " 00:00:00";
                     }
                     else
                     {
@@ -121,7 +121,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     bnum = 0;
                     if (time_day < 1)
                     {
-                        eedate = edate + ":00";
+                        eedate = edate + " 00:00:00";
                     }
                     else
                     {
@@ -149,7 +149,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     bnum = 0;
                     if (time_day < 1)
                     {
-                        eedate = edate + ":00";
+                        eedate = edate + " 00:00:00";
                     }
                     else
                     {

LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs

@@ -70,7 +70,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var num = alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
                             var model = new energy_indexingData()
                             {
-                                time = Convert.ToDateTime(sdate).AddMonths(-i).ToString("MM月"),
+                                time = now.AddMonths(-i).ToString("MM月"),
                                 EnergyIndexing=num
                             };
                             data.Add(model);
@@ -108,7 +108,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var num=alist.Sum(x=>x.EH)-blist.Sum(x=>x.EH);
                             var model = new energy_indexingData()
                             {
-                                time = Convert.ToDateTime(sdate).AddYears(-i).ToString("yyyy"),
+                                time = now.AddYears(-i).ToString("yyyy"),
                                 EnergyIndexing = num
                             };
                             data.Add(model);

LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs

@@ -42,8 +42,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 var blist = list.Where(x => x.Reserve1 == "配电室高压").ToList();
                 decimal? num2 = blist.Sum(x => x.P);
                 //三级
-                var clIst = list.Where(x => x.Reserve1 == "电能-室外箱变").ToList();
+                var clist = list.Where(x => x.Reserve1 == "电能-室外箱变").ToList();
-                decimal? num3 = clIst.Sum(x => x.P);
+                decimal? num3 = clist.Sum(x => x.P);
                 var model = new load_classifcationData()
                 {
                     Amount = num1 + num2 + num3

LonglslandExhibitionCenter/Controllers/api/GetLoopRankingController.cs

@@ -39,8 +39,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 var list = bll.GetModelListDate("", time);
                 foreach (var item in list)
                 {
-                    var alist = list.Where(x =>x.DeviceName==item.DeviceName&& x.EntireTime == Convert.ToDateTime(jdate)).ToList();
+                    var alist = list.Where(x =>x.DeviceName==item.DeviceName&& x.EntireTime == Convert.ToDateTime(jdate)&&x.ElectricityId==item.ElectricityId).ToList();
-                    var blist = list.Where(x =>x.DeviceName==item.DeviceName&& x.EntireTime == Convert.ToDateTime(sdate)).ToList();
+                    var blist = list.Where(x =>x.DeviceName==item.DeviceName&& x.EntireTime == Convert.ToDateTime(sdate)&&x.ElectricityId==item.ElectricityId).ToList();
                     decimal? num = alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
                     var model = new loop_rankingData()
                     {
@@ -49,7 +49,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     };
                     data.Add(model);
                 }
-               var adata=data.OrderBy(x=>x.EH).ToList();
+               var adata=data.OrderByDescending(x=>x.EH).ToList();
                 var count = 0;
                 var bdata=new List<loop_rankingData>();
                 foreach (var item in adata)

LonglslandExhibitionCenter/Controllers/api/GetPolicyEditingController.cs

@@ -0,0 +1,73 @@
+using DataService.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;
+using System.Web.Mvc.Html;
+
+namespace LonglslandExhibitionCenter.Controllers.api
+{
+    /// <summary>
+    /// 空调-策略编辑
+    /// </summary>
+    public class GetPolicyEditingController : ApiController
+    {
+        DataService.BLL.boot_strategy bll = new DataService.BLL.boot_strategy();
+        DataService.BLL.unit_list bll_unit = new DataService.BLL.unit_list();
+        public HttpResponseMessage Get(string name="",string value="")
+        {
+            var res = new get_policy_editing();
+            try
+            {
+                var adata = new List<policy_editingData>();
+                var bdata = new List<policy_editing>();
+                var cdata=new List<policy_editinglist>();
+                if (!string.IsNullOrEmpty(name)&&!string.IsNullOrEmpty(value))
+                {
+                    var blist = bll.GetModelList(" StrategyName='" + name + "'").FirstOrDefault();
+                    var modellist = new DataService.Model.boot_strategy();
+                    modellist.StrategyId = blist.StrategyId;
+                    modellist.StrategyName = name;
+                    modellist.StrategyState= blist.StrategyState;
+                    modellist.Reserve1 = value;
+                    bll.Update(modellist);
+                    var list= bll.GetModelList(" StrategyName='" + name + "'").FirstOrDefault();
+                    var alist = bll_unit.GetModelList("");
+                    var model = new policy_editingData();
+                    model.PolicyName= name;
+                    var bmodel = new policy_editinglist();
+                    bmodel.OptionalName = list.Reserve1;
+                    cdata.Add(bmodel);
+                    var amodel = new policy_editing();
+                    var aname =alist.Select(x => x.UnitName);
+                    var bname=string.Join(",", aname);
+                    amodel.DeviceName = bname;
+                    amodel.list = cdata;
+                    bdata.Add(amodel);
+                    model.data = bdata;
+                    adata.Add(model);
+                    res.code = 200;
+                    res.msg = "成功";
+                    res.data =adata;
+                }
+                else
+                {
+                    res.code = 201;
+                    res.msg = "参数不能为空";
+                }
+            
+            }
+            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;
+        }
+    }
+}

LonglslandExhibitionCenter/Controllers/api/GetSystemEnergyController.cs

@@ -392,7 +392,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                         #region 月
                         var jdate2 = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                         var sdate2 = now.ToString("yyyy-MM-01 00:00:00");
-                        var qdate2 = now.AddMonths(-1).ToString("yyyy-01-01 00:00:00");
+                        var qdate2 = now.AddMonths(-1).ToString("yyyy-MM-01 00:00:00");
                         var jtime2 = Convert.ToDateTime(jdate2).ToString("yyyyMM");
                         var stime2 = Convert.ToDateTime(sdate2).ToString("yyyyMM");
                         var qtime2 = Convert.ToDateTime(qdate2).ToString("yyyyMM");

LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs

@@ -59,7 +59,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var num=alist.Sum(x=>x.EH)-blist.Sum(x=>x.EH);
                             var model = new total_energyData()
                             {
-                                time = DateTime.Now.AddDays(-i).ToString("HH-dd"),
+                                time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
                                 EH = num
                             };
                             data.Add(model);
@@ -97,7 +97,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var num = alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
                             var model = new total_energyData()
                             {
-                                time = Convert.ToDateTime(sdate).AddMonths(-i).ToString("MM月"),
+                                time = Convert.ToDateTime(now).AddMonths(-i).ToString("MM月"),
                                 EH = num
                             };
                             data.Add(model);

LonglslandExhibitionCenter/Controllers/api/SetFullSwitchController.cs

@@ -0,0 +1,125 @@
+using DataService.api;
+using Microsoft.Ajax.Utilities;
+using Newtonsoft.Json;
+using QingHaiVisualizationAPI.Utils;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Web.Http;
+
+namespace LonglslandExhibitionCenter.Controllers.api
+{
+    /// <summary>
+    /// 照明-全控全开全关
+    /// </summary>
+    public class SetFullSwitchController : ApiController
+    {
+        static log4net.ILog log;
+        DataService.BLL.lighting_info bll = new DataService.BLL.lighting_info();
+        public HttpResponseMessage Get(string name = "")
+        {
+            var res = new get_full_switch();
+            try
+            {
+                var data = new List<data>();
+                if (!string.IsNullOrEmpty(name))
+                {
+                    var list = bll.GetModelList("");
+                    var alist = list.DistinctBy(x => x.LightingType).ToList();
+                    foreach (var item in alist)
+                    {
+                        var Type = item.LightingType;
+                        var Number = item.LightingNumber;
+                        var Id = item.ClientId;
+                        var clist = bll.GetModelList("").Where(x => x.LightingNumber == Number && x.LightingType == Type && x.ClientId == Id).ToList();
+                        if (name == "全开")
+                        {
+                            foreach (var aitem in clist)
+                            {
+                                var model = new DataService.Model.lighting_info()
+                                {
+                                    LightingId = aitem.LightingId,
+                                    LightingNumber = aitem.LightingNumber,
+                                    LightingName = aitem.LightingName,
+                                    LightingType = aitem.LightingType,
+                                    LightingState = "255",
+                                    LightingMalfunction = aitem.LightingMalfunction,
+                                    PointerCode = aitem.PointerCode,
+                                    ClientId = aitem.ClientId,
+                                    Reserve1 = aitem.Reserve1,
+                                    Reserve2 = aitem.Reserve2,
+                                    Reserve3 = aitem.Reserve3,
+                                    Reserve4 = aitem.Reserve4,
+                                    Reserve5 = aitem.Reserve5,
+                                };
+                                bll.Update(model);
+                            }
+                        }
+                        if (name == "全关")
+                        {
+                            foreach (var aitem in clist)
+                            {
+                                var model = new DataService.Model.lighting_info()
+                                {
+                                    LightingId = aitem.LightingId,
+                                    LightingNumber = aitem.LightingNumber,
+                                    LightingName = aitem.LightingName,
+                                    LightingType = aitem.LightingType,
+                                    LightingState = "0",
+                                    LightingMalfunction = aitem.LightingMalfunction,
+                                    PointerCode = aitem.PointerCode,
+                                    ClientId = aitem.ClientId,
+                                    Reserve1 = aitem.Reserve1,
+                                    Reserve2 = aitem.Reserve2,
+                                    Reserve3 = aitem.Reserve3,
+                                    Reserve4 = aitem.Reserve4,
+                                    Reserve5 = aitem.Reserve5,
+                                };
+                                bll.Update(model);
+                            }
+                        }
+                        var dlist = bll.GetModelList("").Where(x => x.LightingNumber == Number && x.LightingType == Type && x.ClientId == Id).ToList();
+                        log4net.Config.XmlConfigurator.Configure();
+                        log = log4net.LogManager.GetLogger("loginfo");
+                        var mqqt = new MqttClientService();
+                        data controlData = new data();
+                        controlData.h = new HeaderData();
+                        controlData.h.rt = Number;
+
+                        // 如果需要同时设置多个数据项，可以使用字典
+                        controlData.b = new BodyData();
+                        controlData.b.dl = new Dictionary<string, string>();
+                        foreach (var citem in dlist)
+                        {
+                            controlData.b.dl["" + citem.PointerCode + ""] = "" + citem.LightingState + "";
+                        }
+                        data.Add(controlData);
+                        mqqt.MqttClientStart();
+                        mqqt.Publish("/gc/data/" + Id, "J" + JsonConvert.SerializeObject(controlData));
+                    }
+                    res.code = 200;
+                    res.msg = "成功";
+                    res.data = data;
+
+                }
+                else
+                {
+                    res.code = 201;
+                    res.msg = "参数不能为空";
+                }
+
+            }
+            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;
+        }
+    }
+}

LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj

@@ -185,6 +185,8 @@
     <Compile Include="Controllers\api\GetEnergyIndexingController.cs" />
     <Compile Include="Controllers\api\GetFailureWarningController.cs" />
     <Compile Include="Controllers\api\GetFaultConditionController.cs" />
+    <Compile Include="Controllers\api\GetPolicyEditingController.cs" />
+    <Compile Include="Controllers\api\SetFullSwitchController.cs" />
     <Compile Include="Controllers\api\GetGeneralSituationController.cs" />
     <Compile Include="Controllers\api\GetLightingControlController.cs" />
     <Compile Include="Controllers\api\GetLightingLoadController.cs" />

LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>E:\林谷项目\长岛展览馆项目\发布文件</_PublishTargetUrl>
-    <History>True|2024-02-28T03:11:35.8506164Z;</History>
+    <History>True|2024-03-04T06:37:08.7040845Z;True|2024-02-28T11:11:35.8506164+08:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
@@ -79,19 +79,19 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>09/10/2013 16:29:20</publishTime>
     </File>
     <File Include="bin/DataService.dll">
-      <publishTime>02/27/2024 17:36:50</publishTime>
+      <publishTime>03/04/2024 10:39:01</publishTime>
     </File>
     <File Include="bin/DataService.pdb">
-      <publishTime>02/27/2024 17:36:50</publishTime>
+      <publishTime>03/04/2024 10:39:01</publishTime>
     </File>
     <File Include="bin/log4net.dll">
       <publishTime>12/13/2023 14:16:07</publishTime>
     </File>
     <File Include="bin/LonglslandExhibitionCenter.dll">
-      <publishTime>02/28/2024 11:11:34</publishTime>
+      <publishTime>03/04/2024 14:37:07</publishTime>
     </File>
     <File Include="bin/LonglslandExhibitionCenter.pdb">
-      <publishTime>02/28/2024 11:11:34</publishTime>
+      <publishTime>03/04/2024 14:37:07</publishTime>
     </File>
     <File Include="bin/Maticsoft.Common.dll">
       <publishTime>12/13/2023 14:16:06</publishTime>
@@ -351,6 +351,144 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <File Include="Content/Site.css">
       <publishTime>01/30/2024 18:21:25</publishTime>
     </File>
+    <File Include="Controllers/api/GetAirconditioningLoadController.cs">
+      <publishTime>02/28/2024 17:09:42</publishTime>
+    </File>
+    <File Include="Controllers/api/GetBigScreenController.cs">
+      <publishTime>02/27/2024 17:31:07</publishTime>
+    </File>
+    <File Include="Controllers/api/GetBootStrategyController.cs">
+      <publishTime>02/27/2024 14:47:28</publishTime>
+    </File>
+    <File Include="Controllers/api/GetCarbonEmissionController.cs">
+      <publishTime>02/27/2024 15:21:00</publishTime>
+    </File>
+    <File Include="Controllers/api/GetCarbonFluxController.cs">
+      <publishTime>02/22/2024 16:42:41</publishTime>
+    </File>
+    <File Include="Controllers/api/GetCarbonIntensityController.cs">
+      <publishTime>02/26/2024 11:22:29</publishTime>
+    </File>
+    <File Include="Controllers/api/GetCarbonNeutralController.cs">
+      <publishTime>02/23/2024 09:59:26</publishTime>
+    </File>
+    <File Include="Controllers/api/GetCarbonOverviewController.cs">
+      <publishTime>02/28/2024 16:53:55</publishTime>
+    </File>
+    <File Include="Controllers/api/GetCarbonTrendController.cs">
+      <publishTime>02/26/2024 11:04:14</publishTime>
+    </File>
+    <File Include="Controllers/api/GetDailyElectricityController.cs">
+      <publishTime>02/21/2024 15:39:54</publishTime>
+    </File>
+    <File Include="Controllers/api/GetDisplayLoadController.cs">
+      <publishTime>02/21/2024 15:39:54</publishTime>
+    </File>
+    <File Include="Controllers/api/GetDrainHeadingController.cs">
+      <publishTime>02/28/2024 13:58:15</publishTime>
+    </File>
+    <File Include="Controllers/api/GetElctricityConsumptionController.cs">
+      <publishTime>02/27/2024 15:21:00</publishTime>
+    </File>
+    <File Include="Controllers/api/GetElectricalConditionController.cs">
+      <publishTime>02/27/2024 13:58:07</publishTime>
+    </File>
+    <File Include="Controllers/api/GetElectricityRateController.cs">
+      <publishTime>02/27/2024 13:21:21</publishTime>
+    </File>
+    <File Include="Controllers/api/GetEnergyCalendarController.cs">
+      <publishTime>02/27/2024 15:13:42</publishTime>
+    </File>
+    <File Include="Controllers/api/GetEnergyFlowController.cs">
+      <publishTime>02/26/2024 16:21:14</publishTime>
+    </File>
+    <File Include="Controllers/api/GetEnergyIndexingController.cs">
+      <publishTime>02/26/2024 14:08:58</publishTime>
+    </File>
+    <File Include="Controllers/api/GetFailureWarningController.cs">
+      <publishTime>02/28/2024 10:43:17</publishTime>
+    </File>
+    <File Include="Controllers/api/GetFaultConditionController.cs">
+      <publishTime>02/23/2024 16:11:21</publishTime>
+    </File>
+    <File Include="Controllers/api/GetGeneralSituationController.cs">
+      <publishTime>02/27/2024 13:18:39</publishTime>
+    </File>
+    <File Include="Controllers/api/GetLightingControlController.cs">
+      <publishTime>02/23/2024 15:48:03</publishTime>
+    </File>
+    <File Include="Controllers/api/GetLightingDetailController.cs">
+      <publishTime>02/28/2024 16:02:46</publishTime>
+    </File>
+    <File Include="Controllers/api/GetLightingLoadController.cs">
+      <publishTime>02/23/2024 15:22:26</publishTime>
+    </File>
+    <File Include="Controllers/api/GetLightingMonitoringController.cs">
+      <publishTime>02/23/2024 13:50:31</publishTime>
+    </File>
+    <File Include="Controllers/api/GetLoadClassificationController.cs">
+      <publishTime>02/28/2024 17:06:12</publishTime>
+    </File>
+    <File Include="Controllers/api/GetLoopRankingController.cs">
+      <publishTime>03/04/2024 14:14:25</publishTime>
+    </File>
+    <File Include="Controllers/api/GetMaintenanceReminderController.cs">
+      <publishTime>02/28/2024 10:45:48</publishTime>
+    </File>
+    <File Include="Controllers/api/GetMeteorologicalStationController.cs">
+      <publishTime>02/22/2024 14:32:32</publishTime>
+    </File>
+    <File Include="Controllers/api/GetMultiRateController.cs">
+      <publishTime>02/27/2024 10:46:37</publishTime>
+    </File>
+    <File Include="Controllers/api/GetOperatingStateController.cs">
+      <publishTime>02/27/2024 17:42:23</publishTime>
+    </File>
+    <File Include="Controllers/api/GetPavilionLightingController.cs">
+      <publishTime>02/23/2024 15:35:10</publishTime>
+    </File>
+    <File Include="Controllers/api/GetPolicyEditingController.cs">
+      <publishTime>03/04/2024 11:29:09</publishTime>
+    </File>
+    <File Include="Controllers/api/GetRealLoadController.cs">
+      <publishTime>02/05/2024 13:40:46</publishTime>
+    </File>
+    <File Include="Controllers/api/GetRealtimeLoadController.cs">
+      <publishTime>02/28/2024 10:41:48</publishTime>
+    </File>
+    <File Include="Controllers/api/GetSingleControlController.cs">
+      <publishTime>02/23/2024 16:36:55</publishTime>
+    </File>
+    <File Include="Controllers/api/GetSystemEnergyController.cs">
+      <publishTime>02/27/2024 09:56:27</publishTime>
+    </File>
+    <File Include="Controllers/api/GetSystemPurgeController.cs">
+      <publishTime>02/23/2024 09:50:29</publishTime>
+    </File>
+    <File Include="Controllers/api/GetSystemRankingController.cs">
+      <publishTime>02/22/2024 15:26:42</publishTime>
+    </File>
+    <File Include="Controllers/api/GetTotalEnergyController.cs">
+      <publishTime>02/26/2024 13:44:56</publishTime>
+    </File>
+    <File Include="Controllers/api/GetWaterDrainingController.cs">
+      <publishTime>02/27/2024 16:42:49</publishTime>
+    </File>
+    <File Include="Controllers/api/SetFullSwitchController.cs">
+      <publishTime>02/29/2024 10:29:47</publishTime>
+    </File>
+    <File Include="Controllers/api/SetLightingController.cs">
+      <publishTime>02/28/2024 14:48:12</publishTime>
+    </File>
+    <File Include="Controllers/api/SetSingleSwitchController.cs">
+      <publishTime>02/28/2024 16:40:29</publishTime>
+    </File>
+    <File Include="Controllers/HomeController.cs">
+      <publishTime>01/30/2024 18:21:28</publishTime>
+    </File>
+    <File Include="Controllers/ValuesController.cs">
+      <publishTime>01/30/2024 18:21:28</publishTime>
+    </File>
     <File Include="favicon.ico">
       <publishTime>01/30/2024 18:21:25</publishTime>
     </File>

LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-927c2e9499cdb0b79ff34aa6eda4f4fe7e296d33
+c7a2e736946fd38475aa805ed8a0929fcf1ad549

LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-f1dc468fd7182e986b25e22cd5e23e8f8d5eb4a0
+5e09c650feb6b30b4cef77487d691557cc5a57b4

Security/bin/Debug/ServiceSecurity.application

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

Security/bin/Debug/ServiceSecurity.exe.manifest

@@ -42,14 +42,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="109568">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="117248">
       <assemblyIdentity name="DataService" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>AqWfWKK0WoNVklFqzN6P9mv8olXbMvyGqPvt/Nmp+Bw=</dsig:DigestValue>
+        <dsig:DigestValue>/0gk9TivMCAYEfdiZbuFKZwfpgn1r6q9t3fB0uGtgy0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

Security/obj/Debug/ServiceSecurity.application

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

Security/obj/Debug/ServiceSecurity.exe.manifest

@@ -42,14 +42,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="109568">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="117248">
       <assemblyIdentity name="DataService" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>AqWfWKK0WoNVklFqzN6P9mv8olXbMvyGqPvt/Nmp+Bw=</dsig:DigestValue>
+        <dsig:DigestValue>/0gk9TivMCAYEfdiZbuFKZwfpgn1r6q9t3fB0uGtgy0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>