XKH
/
DongYing
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

提交

This commit is contained in:
xukanghao 2024-01-10 18:42:19 +08:00
parent 3b51457074
commit 181909775b
22 changed files with 278 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
DataServer/bin/Debug/DataServer.pdb
View File

Binary file not shown.

2
DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
bb572a4a47dded79dd8f0675678f3f1a14c498df 0a6ef25d4686ac3e3712960354c42ac78e4d3cdb

BIN
DataServer/obj/Debug/DataServer.dll
View File

Binary file not shown.

BIN
DataServer/obj/Debug/DataServer.pdb
View File

Binary file not shown.

249
DongYingAPI/Controllers/api/GetIlluminationLoadController.cs
View File

@ -8,6 +8,7 @@ using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Text; using System.Text;
using System.Web.Http; using System.Web.Http;
using System.Web.Mvc;
namespace DongYingAPI.Controllers.api namespace DongYingAPI.Controllers.api
{ {
@ -17,10 +18,10 @@ namespace DongYingAPI.Controllers.api
DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info();
public HttpResponseMessage Get(string date = "") public HttpResponseMessage Get(string date = "")
{ {
var res = new get_electrical_condition(); var res = new get_illumination_load();
try try
{ {
var data = new List<electrical_conditionData>(); var data = new List<illumination_loadData>();
var time = DateTime.Now.ToString("yyyyMM"); var time = DateTime.Now.ToString("yyyyMM");
#region 表是否存在 #region 表是否存在
//表名 //表名
@ -61,139 +62,127 @@ namespace DongYingAPI.Controllers.api
bll.CreateTable(qntime); bll.CreateTable(qntime);
} }
#endregion #endregion
#region 判断 var list = bll_info.GetModelList("").Where(x => x.DeviceName.Contains("照明")).ToList();
//if (date == "日") if (date == "日")
//{ {
// //今天
// var sdate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
// //昨天
// var edate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd 00:00:00");
// //前天
// var qdate = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00");
// //今天列表
// var list1 = bll.GetModelListDate("", time).Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList();
// decimal? num1 = 0;
// foreach (var item in list1)
// {
// num1 += item.EH;
// }
// //昨天列表
// var list2 = bll.GetModelListDate("", time).Where(x => x.EntireTime == Convert.ToDateTime(edate)).ToList();
// decimal? num2 = 0;
// foreach (var item in list2)
// {
// num2 += item.EH;
// }
// //前天列表
// var list3 = bll.GetModelListDate("", time).Where(x => x.EntireTime == Convert.ToDateTime(qdate)).ToList();
// decimal? num3 = 0;
// foreach (var item in list3)
// {
// num3 += item.EH;
// }
// var model = new electrical_conditionData();
// model.ToDay = num1 - num2;
// model.YearDay = num2 - num3;
// if (model.YearDay == 0)
// {
// model.TenDency = 100;
// }
// else
// {
// model.TenDency = model.ToDay / model.YearDay * 100;
// }
// data.Add(model);
//}
//else if (date == "月")
//{
// //今月 for (int i = 0; i < 6; i++)
// var sdate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); {
// //昨月 var model = new illumination_loadData();
// var edate = DateTime.Now.AddMonths(-1).ToString("yyyy-MM-31 00:00:00");
// //前月
// var qdate = DateTime.Now.AddMonths(-2).ToString("yyyy-MM-31 00:00:00");
var j = i * 60;
string now = "";
model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00");
now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
var datetime = Convert.ToDateTime(now);
var sdate = datetime.AddHours(-i);
var edate = datetime.AddHours(-i + 1);
var sdate1=datetime.AddDays(-1).AddHours(-i);
var edate1=datetime.AddDays(-2).AddHours(-i+1);
//var list1 = bll_info.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.EntireTime >= sdate && x.EntireTime < edate).ToList();
decimal? num1 = 0;
decimal? num2 = 0;
foreach (var item in list)
{
var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= sdate && x.EntireTime < edate).ToList();
var list2 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= sdate1 && x.EntireTime < edate1).ToList();
// //今天列表 foreach (var aitem in list1)
// var list1 = bll.GetModelListDate("", time).Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList(); {
// decimal? num1 = 0; num1 += aitem.P;
// foreach (var item in list1) }
// { foreach (var aitem in list2)
// num1 += item.EH; {
// } num2 += aitem.P;
// //昨月列表 }
// var list2 = bll.GetModelListDate("", ztime).Where(x => x.EntireTime == Convert.ToDateTime(edate)).ToList(); model.ToDay = num1;
// decimal? num2 = 0; model.YearDay = num2;
// foreach (var item in list2) }
// { data.Add(model);
// num2 += item.EH;
// }
// //前天列表
// var list3 = bll.GetModelListDate("", qtime).Where(x => x.EntireTime == Convert.ToDateTime(qdate)).ToList();
// decimal? num3 = 0;
// foreach (var item in list3)
// {
// num3 += item.EH;
// }
// var model = new electrical_conditionData();
// model.ToDay = num1 - num2;
// model.YearDay = num2 - num3;
// if (model.YearDay == 0)
// {
// model.TenDency = 100;
// }
// else
// {
// model.TenDency = model.ToDay / model.YearDay * 100;
// }
// data.Add(model); }
//} }
//else if (date == "年") else if (date == "月")
//{ {
// //今年 for (int i = 0; i < 6; i++)
// var sdate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); {
// //昨年 var model = new illumination_loadData();
// var edate = DateTime.Now.AddYears(-1).ToString("yyyy-MM-31 00:00:00"); var atime = DateTime.Now.AddDays(-i).ToString("dd号");
// //前年 model.time = atime;
// var qdate = DateTime.Now.AddYears(-2).ToString("yyyy-MM-31 00:00:00"); var now = DateTime.Now.AddDays(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00";
var sdate1 = now.AddMonths(-1).ToString("yyyy-MM-dd") + " 00:00:00";
var edate1 = now.AddMonths(-1).AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00";
decimal? num = 0;
decimal? num2 = 0;
foreach (var item in list)
{
var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList();
var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList();
var blist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate1) && x.EntireTime < Convert.ToDateTime(edate1)).ToList();
foreach (var aitem in alist)
{
num += aitem.P;
}
foreach (var aitem in blist)
{
num2 += aitem.P;
}
model.ToDay = num;
model.YearDay = num2;
// //今天列表 }
// var list1 = bll.GetModelListDate("", time).Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList(); data.Add(model);
// decimal? num1 = 0; }
// foreach (var item in list1) }
// { else if (date == "年")
// num1 += item.EH; {
// } for (int i = 0; i < 6; i++)
// //昨月列表 {
// var list2 = bll.GetModelListDate("", ztime).Where(x => x.EntireTime == Convert.ToDateTime(edate)).ToList(); var model = new illumination_loadData();
// decimal? num2 = 0; var atime = DateTime.Now.AddMonths(-i).ToString("MM月");
// foreach (var item in list2) model.time = atime;
// { var now = DateTime.Now.AddMonths(-i);
// num2 += item.EH; var sdate = now.ToString("yyyy-MM") + "-01 00:00:00";
// } var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00";
// //前天列表 var sdate1 = now.AddYears(-1).ToString("yyyy-MM") + "-01 00:00:00";
// var list3 = bll.GetModelListDate("", qtime).Where(x => x.EntireTime == Convert.ToDateTime(qdate)).ToList(); var edate1= now.AddYears(-1).AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00";
// decimal? num3 = 0; var ctime = now.ToString("yyyMM");
// foreach (var item in list3) var etime = now.AddYears(-1).ToString("yyyyMM");
// { decimal? num = 0;
// num3 += item.EH; foreach (var item in list)
// } {
// var model = new electrical_conditionData(); var q = bll.IsExistsTable(date_base, "electricity_data_" + ctime);
// model.ToDay = num1 - num2; if (!(q== false))
// model.YearDay = num2 - num3; {
// if (model.YearDay == 0) var alist = bll.GetModelListDate("", ctime).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList();
// { foreach (var aitem in alist)
// model.TenDency = 100; {
// } num += aitem.P;
// else }
// { model.ToDay = num;
// model.TenDency = model.ToDay / model.YearDay * 100; }
// } var q1 = bll.IsExistsTable(date_base, "electricity_data_" + etime);
// data.Add(model); if (q1 == false)
//} {
#endregion model.YearDay = 0;
}
else
{
var blist = bll.GetModelListDate("", etime).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= Convert.ToDateTime(sdate1) && x.EntireTime < Convert.ToDateTime(edate1)).ToList();
foreach (var aitem in blist)
{
num += aitem.P;
}
model.YearDay = num;
}
}
data.Add(model);
}
}
res.code = 200; res.code = 200;
res.msg = "成功"; res.msg = "成功";
res.data = data; res.data = data;

2
DongYingAPI/DongYingAPI.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication /> <IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode /> <IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile /> <UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>E:\林谷项目\东营两馆一宫\后端框架\DongYing\DongYingAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>E:\林谷项目\东营两馆一宫\后端框架\DongYing\DongYingAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID> <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath> <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>

156
DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
View File

@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
--> -->
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>E:\林谷项目\东营两馆一宫\后端框架\DongYing\DongYingAPI\bin\app.publish\</_PublishTargetUrl> <_PublishTargetUrl>bin\app.publish\</_PublishTargetUrl>
<History>True|2024-01-10T09:32:39.4867251Z;True|2024-01-10T14:45:12.0400450+08:00;</History> <History>True|2024-01-10T09:34:07.8440850Z;False|2024-01-10T17:33:54.1670007+08:00;True|2024-01-10T17:32:39.4867251+08:00;True|2024-01-10T14:45:12.0400450+08:00;</History>
<LastFailureDetails /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -79,16 +79,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>09/10/2013 16:29:20</publishTime> <publishTime>09/10/2013 16:29:20</publishTime>
</File> </File>
<File Include="bin/DataServer.dll"> <File Include="bin/DataServer.dll">
<publishTime>01/10/2024 17:17:19</publishTime> <publishTime>01/10/2024 17:34:00</publishTime>
</File> </File>
<File Include="bin/DataServer.pdb"> <File Include="bin/DataServer.pdb">
<publishTime>01/10/2024 17:17:19</publishTime> <publishTime>01/10/2024 17:34:00</publishTime>
</File> </File>
<File Include="bin/DongYingAPI.dll"> <File Include="bin/DongYingAPI.dll">
<publishTime>01/10/2024 17:32:38</publishTime> <publishTime>01/10/2024 17:34:07</publishTime>
</File> </File>
<File Include="bin/DongYingAPI.pdb"> <File Include="bin/DongYingAPI.pdb">
<publishTime>01/10/2024 17:32:38</publishTime> <publishTime>01/10/2024 17:34:07</publishTime>
</File> </File>
<File Include="bin/Maticsoft.Common.dll"> <File Include="bin/Maticsoft.Common.dll">
<publishTime>12/13/2023 14:16:06</publishTime> <publishTime>12/13/2023 14:16:06</publishTime>
@ -345,6 +345,150 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<File Include="Content/Site.css"> <File Include="Content/Site.css">
<publishTime>01/02/2024 09:27:24</publishTime> <publishTime>01/02/2024 09:27:24</publishTime>
</File> </File>
<File Include="Controllers/api/.editorconfig">
<publishTime>01/08/2024 15:31:27</publishTime>
</File>
<File Include="Controllers/api/EnergyEfficiency/GetAmountEnergyController.cs">
<publishTime>01/09/2024 13:35:11</publishTime>
</File>
<File Include="Controllers/api/EnergyEfficiency/GetClassifiedEnergyController.cs">
<publishTime>01/10/2024 17:33:29</publishTime>
</File>
<File Include="Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs">
<publishTime>01/09/2024 13:35:11</publishTime>
</File>
<File Include="Controllers/api/EnergyEfficiency/GetElectricityPriceController.cs">
<publishTime>01/09/2024 18:18:37</publishTime>
</File>
<File Include="Controllers/api/EnergyEfficiency/GetEnergyBenchmarkingController.cs">
<publishTime>01/10/2024 17:33:29</publishTime>
</File>
<File Include="Controllers/api/EnergyEfficiency/GetEnergyCalendarController.cs">
<publishTime>01/10/2024 17:33:29</publishTime>
</File>
<File Include="Controllers/api/EnergyEfficiency/GetEnergyConsumptionController.cs">
<publishTime>01/10/2024 17:33:29</publishTime>
</File>
<File Include="Controllers/api/EnergyEfficiency/GetEnergyFlowController.cs">
<publishTime>01/09/2024 18:18:37</publishTime>
</File>
<File Include="Controllers/api/EnergyEfficiency/GetEnergyTrendController.cs">
<publishTime>01/10/2024 17:33:29</publishTime>
</File>
<File Include="Controllers/api/EnergyEfficiency/GetItemizeEnergyController.cs">
<publishTime>01/10/2024 13:26:12</publishTime>
</File>
<File Include="Controllers/api/EnergyEfficiency/GetMultiRateController.cs">
<publishTime>01/09/2024 18:18:38</publishTime>
</File>
<File Include="Controllers/api/EnergyEfficiency/GetUnitConsumptionController.cs">
<publishTime>01/10/2024 13:26:12</publishTime>
</File>
<File Include="Controllers/api/GetAirConditionerController.cs">
<publishTime>01/09/2024 16:43:55</publishTime>
</File>
<File Include="Controllers/api/GetCarbonEmissionController.cs">
<publishTime>01/09/2024 17:35:08</publishTime>
</File>
<File Include="Controllers/api/GetCarbonFluxController.cs">
<publishTime>01/09/2024 18:07:13</publishTime>
</File>
<File Include="Controllers/api/GetCarbonIntensityController.cs">
<publishTime>01/10/2024 11:04:33</publishTime>
</File>
<File Include="Controllers/api/GetCarbonMeasureController.cs">
<publishTime>01/09/2024 18:25:20</publishTime>
</File>
<File Include="Controllers/api/GetCarbonOffsetController.cs">
<publishTime>01/10/2024 13:25:43</publishTime>
</File>
<File Include="Controllers/api/GetCarbonReductionController.cs">
<publishTime>01/10/2024 11:18:51</publishTime>
</File>
<File Include="Controllers/api/GetCellRankingController.cs">
<publishTime>01/09/2024 14:53:59</publishTime>
</File>
<File Include="Controllers/api/GetChamberLoadController.cs">
<publishTime>01/09/2024 16:47:40</publishTime>
</File>
<File Include="Controllers/api/GetCurrentVoltageController.cs">
<publishTime>01/09/2024 15:20:59</publishTime>
</File>
<File Include="Controllers/api/GetDailyElectricityController.cs">
<publishTime>01/10/2024 13:39:52</publishTime>
</File>
<File Include="Controllers/api/GetDeviceDetailsController.cs">
<publishTime>01/10/2024 17:32:32</publishTime>
</File>
<File Include="Controllers/api/GetDeviceParameterController.cs">
<publishTime>01/10/2024 16:35:51</publishTime>
</File>
<File Include="Controllers/api/GetDistributionPowerController.cs">
<publishTime>01/09/2024 15:26:43</publishTime>
</File>
<File Include="Controllers/api/GetElectricalConditionController.cs">
<publishTime>01/10/2024 16:19:04</publishTime>
</File>
<File Include="Controllers/api/GetElectricalRankingController.cs">
<publishTime>01/09/2024 15:36:30</publishTime>
</File>
<File Include="Controllers/api/GetElectricEquipmentController.cs">
<publishTime>01/09/2024 15:40:43</publishTime>
</File>
<File Include="Controllers/api/GetElectricityConsumptionController.cs">
<publishTime>01/09/2024 16:50:09</publishTime>
</File>
<File Include="Controllers/api/GetElectricQuantityController.cs">
<publishTime>01/09/2024 16:51:21</publishTime>
</File>
<File Include="Controllers/api/GetEnergyTrendsController.cs">
<publishTime>01/10/2024 14:14:08</publishTime>
</File>
<File Include="Controllers/api/GetEquipmentMonitoringController.cs">
<publishTime>01/09/2024 16:41:37</publishTime>
</File>
<File Include="Controllers/api/GetEssentialInformationController.cs">
<publishTime>01/08/2024 13:30:31</publishTime>
</File>
<File Include="Controllers/api/GetGeneralCatalogueController.cs">
<publishTime>01/09/2024 16:53:42</publishTime>
</File>
<File Include="Controllers/api/GetIlluminationLoadController.cs">
<publishTime>01/10/2024 17:32:32</publishTime>
</File>
<File Include="Controllers/api/GetLightingLoadController.cs">
<publishTime>01/09/2024 17:02:14</publishTime>
</File>
<File Include="Controllers/api/GetLightingMonitoringController.cs">
<publishTime>01/10/2024 16:58:07</publishTime>
</File>
<File Include="Controllers/api/GetMeteorologicalStationController.cs">
<publishTime>01/10/2024 16:29:26</publishTime>
</File>
<File Include="Controllers/api/GetPowerLoadController.cs">
<publishTime>01/09/2024 17:02:14</publishTime>
</File>
<File Include="Controllers/api/GetRealtimeDataController.cs">
<publishTime>01/09/2024 16:25:24</publishTime>
</File>
<File Include="Controllers/api/GetRealtimeLoadController.cs">
<publishTime>01/09/2024 17:02:14</publishTime>
</File>
<File Include="Controllers/api/GetRoomElectricityController.cs">
<publishTime>01/09/2024 17:08:06</publishTime>
</File>
<File Include="Controllers/api/GetRunningStatusController.cs">
<publishTime>01/10/2024 15:08:35</publishTime>
</File>
<File Include="Controllers/api/loginController.cs">
<publishTime>01/09/2024 10:54:33</publishTime>
</File>
<File Include="Controllers/HomeController.cs">
<publishTime>01/02/2024 09:27:26</publishTime>
</File>
<File Include="Controllers/ValuesController.cs">
<publishTime>01/02/2024 09:27:26</publishTime>
</File>
<File Include="favicon.ico"> <File Include="favicon.ico">
<publishTime>01/02/2024 09:27:24</publishTime> <publishTime>01/02/2024 09:27:24</publishTime>
</File> </File>

BIN
DongYingAPI/bin/DataServer.dll
View File

Binary file not shown.

BIN
DongYingAPI/bin/DataServer.pdb
View File

Binary file not shown.

BIN
DongYingAPI/bin/DongYingAPI.dll
View File

Binary file not shown.

BIN
DongYingAPI/bin/DongYingAPI.pdb
View File

Binary file not shown.

BIN
DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
DongYingAPI/obj/Debug/DongYingAPI.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
822bb773dccd74296c265e3ba7fc7cc85c67e94b a24ef2aacced7d3d3ad212e7cf79b1d293ea4116

BIN
DongYingAPI/obj/Debug/DongYingAPI.dll
View File

Binary file not shown.

BIN
DongYingAPI/obj/Debug/DongYingAPI.pdb
View File

Binary file not shown.

BIN
Security/bin/Debug/DataServer.dll
View File

Binary file not shown.

BIN
Security/bin/Debug/DataServer.pdb
View File

Binary file not shown.

14
Security/bin/Debug/ServiceSecurity.application
View File

@ -14,19 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<<<<<<< HEAD <dsig:DigestValue>rBYrW1dzUjXns5a6z/YrpLNLXugBmeMTyh1H2R8VfoA=</dsig:DigestValue>
<dsig:DigestValue>YDl3zNtJOrDsWH9OgTkhH2nFTuPB9l5c5Gj8UHZF/8U=</dsig:DigestValue>
=======
<<<<<<< HEAD
<dsig:DigestValue>R/fXQ8YNWnYzGAnZOCkkNJLl3mwpgt3uhSTYVgRcrxQ=</dsig:DigestValue>
=======
<<<<<<< HEAD
<dsig:DigestValue>DFDrtnOeo9dpim2EB6ODebG9pNDAOWi8cJsCQmPQWpo=</dsig:DigestValue>
=======
<dsig:DigestValue>5bGkkmasvGwv0JCWHDW7zc72Mkr/5VqC8X+hEudh6w0=</dsig:DigestValue>
>>>>>>> ed1a5636011cbbab43211edc340b78e5091aabc9
>>>>>>> e663b85f3f0c9a8c32fb9527e9c15287ca018238
>>>>>>> 53710abf1cc61565a1c5136966797c66d7a67341
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>

28
Security/bin/Debug/ServiceSecurity.exe.manifest
View File

@ -42,38 +42,14 @@
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
<dependency> <dependency>
<<<<<<< HEAD <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="124928">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="120320">
=======
<<<<<<< HEAD
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="115200">
=======
<<<<<<< HEAD
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="105984">
=======
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="111616">
>>>>>>> ed1a5636011cbbab43211edc340b78e5091aabc9
>>>>>>> e663b85f3f0c9a8c32fb9527e9c15287ca018238
>>>>>>> 53710abf1cc61565a1c5136966797c66d7a67341
<assemblyIdentity name="DataServer" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <assemblyIdentity name="DataServer" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash> <hash>
<dsig:Transforms> <dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<<<<<<< HEAD <dsig:DigestValue>FRgkqKDcmQzR3U+vbgEw7Ukab51o/oiyo7L+lsx9Pok=</dsig:DigestValue>
<dsig:DigestValue>4mMN3zm7d9ErM3wCOV90C/WiVh2brt6Zs7rkAtdDVeU=</dsig:DigestValue>
=======
<<<<<<< HEAD
<dsig:DigestValue>jodAUMsPfpVOtY0heILyPhzqWz09Qb5YaUSWUh49jCU=</dsig:DigestValue>
=======
<<<<<<< HEAD
<dsig:DigestValue>aWndXXAkdQBx2rtrRCdbWDqmcwtd1zO16Sk2hz+kv6w=</dsig:DigestValue>
=======
<dsig:DigestValue>wXbJaoaVkZ4nWsDBuqFZJDHFJELkSuDr//lug4KQing=</dsig:DigestValue>
>>>>>>> ed1a5636011cbbab43211edc340b78e5091aabc9
>>>>>>> e663b85f3f0c9a8c32fb9527e9c15287ca018238
>>>>>>> 53710abf1cc61565a1c5136966797c66d7a67341
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>

BIN
Security/obj/Debug/Security.csproj.AssemblyReference.cache
View File

Binary file not shown.

14
Security/obj/Debug/ServiceSecurity.application
View File

@ -14,19 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<<<<<<< HEAD <dsig:DigestValue>rBYrW1dzUjXns5a6z/YrpLNLXugBmeMTyh1H2R8VfoA=</dsig:DigestValue>
<dsig:DigestValue>YDl3zNtJOrDsWH9OgTkhH2nFTuPB9l5c5Gj8UHZF/8U=</dsig:DigestValue>
=======
<<<<<<< HEAD
<dsig:DigestValue>R/fXQ8YNWnYzGAnZOCkkNJLl3mwpgt3uhSTYVgRcrxQ=</dsig:DigestValue>
=======
<<<<<<< HEAD
<dsig:DigestValue>DFDrtnOeo9dpim2EB6ODebG9pNDAOWi8cJsCQmPQWpo=</dsig:DigestValue>
=======
<dsig:DigestValue>5bGkkmasvGwv0JCWHDW7zc72Mkr/5VqC8X+hEudh6w0=</dsig:DigestValue>
>>>>>>> ed1a5636011cbbab43211edc340b78e5091aabc9
>>>>>>> e663b85f3f0c9a8c32fb9527e9c15287ca018238
>>>>>>> 53710abf1cc61565a1c5136966797c66d7a67341
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>

28
Security/obj/Debug/ServiceSecurity.exe.manifest
View File

@ -42,38 +42,14 @@
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
<dependency> <dependency>
<<<<<<< HEAD <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="124928">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="120320">
=======
<<<<<<< HEAD
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="115200">
=======
<<<<<<< HEAD
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="105984">
=======
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="111616">
>>>>>>> ed1a5636011cbbab43211edc340b78e5091aabc9
>>>>>>> e663b85f3f0c9a8c32fb9527e9c15287ca018238
>>>>>>> 53710abf1cc61565a1c5136966797c66d7a67341
<assemblyIdentity name="DataServer" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <assemblyIdentity name="DataServer" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash> <hash>
<dsig:Transforms> <dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<<<<<<< HEAD <dsig:DigestValue>FRgkqKDcmQzR3U+vbgEw7Ukab51o/oiyo7L+lsx9Pok=</dsig:DigestValue>
<dsig:DigestValue>4mMN3zm7d9ErM3wCOV90C/WiVh2brt6Zs7rkAtdDVeU=</dsig:DigestValue>
=======
<<<<<<< HEAD
<dsig:DigestValue>jodAUMsPfpVOtY0heILyPhzqWz09Qb5YaUSWUh49jCU=</dsig:DigestValue>
=======
<<<<<<< HEAD
<dsig:DigestValue>aWndXXAkdQBx2rtrRCdbWDqmcwtd1zO16Sk2hz+kv6w=</dsig:DigestValue>
=======
<dsig:DigestValue>wXbJaoaVkZ4nWsDBuqFZJDHFJELkSuDr//lug4KQing=</dsig:DigestValue>
>>>>>>> ed1a5636011cbbab43211edc340b78e5091aabc9
>>>>>>> e663b85f3f0c9a8c32fb9527e9c15287ca018238
>>>>>>> 53710abf1cc61565a1c5136966797c66d7a67341
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>