diff --git a/.vs/JinanCementFactoryAPI/FileContentIndex/28ef9134-ed2a-4221-a458-b138bafec4a4.vsidx b/.vs/JinanCementFactoryAPI/FileContentIndex/28ef9134-ed2a-4221-a458-b138bafec4a4.vsidx deleted file mode 100644 index f960d18..0000000 Binary files a/.vs/JinanCementFactoryAPI/FileContentIndex/28ef9134-ed2a-4221-a458-b138bafec4a4.vsidx and /dev/null differ diff --git a/.vs/JinanCementFactoryAPI/FileContentIndex/2bea49e6-698b-4362-a927-89cd61f698c0.vsidx b/.vs/JinanCementFactoryAPI/FileContentIndex/2bea49e6-698b-4362-a927-89cd61f698c0.vsidx deleted file mode 100644 index 81d3d6e..0000000 Binary files a/.vs/JinanCementFactoryAPI/FileContentIndex/2bea49e6-698b-4362-a927-89cd61f698c0.vsidx and /dev/null differ diff --git a/.vs/JinanCementFactoryAPI/FileContentIndex/48eea413-cd2b-41ed-8700-130c74b52f97.vsidx b/.vs/JinanCementFactoryAPI/FileContentIndex/48eea413-cd2b-41ed-8700-130c74b52f97.vsidx deleted file mode 100644 index 888c15d..0000000 Binary files a/.vs/JinanCementFactoryAPI/FileContentIndex/48eea413-cd2b-41ed-8700-130c74b52f97.vsidx and /dev/null differ diff --git a/.vs/JinanCementFactoryAPI/FileContentIndex/670452ca-735f-4d27-89f0-7c47dca35b76.vsidx b/.vs/JinanCementFactoryAPI/FileContentIndex/670452ca-735f-4d27-89f0-7c47dca35b76.vsidx deleted file mode 100644 index a65586f..0000000 Binary files a/.vs/JinanCementFactoryAPI/FileContentIndex/670452ca-735f-4d27-89f0-7c47dca35b76.vsidx and /dev/null differ diff --git a/.vs/JinanCementFactoryAPI/v17/.suo b/.vs/JinanCementFactoryAPI/v17/.suo index 10dbc6c..4e3ecef 100644 Binary files a/.vs/JinanCementFactoryAPI/v17/.suo and b/.vs/JinanCementFactoryAPI/v17/.suo differ diff --git a/.vs/JinanCementFactoryAPI/v17/HierarchyCache.v1.txt b/.vs/JinanCementFactoryAPI/v17/HierarchyCache.v1.txt index a1b884c..ab6b67a 100644 Binary files a/.vs/JinanCementFactoryAPI/v17/HierarchyCache.v1.txt and b/.vs/JinanCementFactoryAPI/v17/HierarchyCache.v1.txt differ diff --git a/DataServer/DataServer.csproj b/DataServer/DataServer.csproj index 58c732a..be8fc69 100644 --- a/DataServer/DataServer.csproj +++ b/DataServer/DataServer.csproj @@ -175,6 +175,9 @@ + + + diff --git a/DataServer/api/threedimensional/get_coal_equipment.cs b/DataServer/api/threedimensional/get_coal_equipment.cs new file mode 100644 index 0000000..6c1ebf5 --- /dev/null +++ b/DataServer/api/threedimensional/get_coal_equipment.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DataServer.api.threedimensional +{ + public class get_coal_equipment + { + public int code { get; set; } + public string msg { get; set; } + public List data { get; set; } + } + public class coal_equipmentData + { + public decimal? Coal { get; set; } + public string State { get; set; } + public decimal? Carbon { get; set;} + } +} diff --git a/DataServer/api/threedimensional/get_facility_information.cs b/DataServer/api/threedimensional/get_facility_information.cs new file mode 100644 index 0000000..fdd48af --- /dev/null +++ b/DataServer/api/threedimensional/get_facility_information.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DataServer.api.threedimensional +{ + public class get_facility_information + { + public int code { get; set; } + public string msg { get; set; } + public List data { get; set; } + } + public class facility_informationData + { + public decimal? EH { get; set; } + public string State { get; set; } + public decimal? P { get; set; } + } +} diff --git a/DataServer/api/threedimensional/get_water_equipment.cs b/DataServer/api/threedimensional/get_water_equipment.cs new file mode 100644 index 0000000..ff5237b --- /dev/null +++ b/DataServer/api/threedimensional/get_water_equipment.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DataServer.api.threedimensional +{ + public class get_water_equipment + { + public int code { get; set; } + public string msg { get; set; } + public List data { get; set; } + } + public class water_equipmentData + { + public decimal? Water { get; set; } + public decimal? OutletPressure { get; set; } + public decimal? Speed { get; set;} + public string State { get; set; } + } + } diff --git a/DataServer/bin/Debug/DataServer.dll b/DataServer/bin/Debug/DataServer.dll index efbf9b4..622ddec 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 104d905..86e12c0 100644 Binary files a/DataServer/bin/Debug/DataServer.pdb and b/DataServer/bin/Debug/DataServer.pdb differ diff --git a/DataServer/bin/Release/DataServer.dll b/DataServer/bin/Release/DataServer.dll index f4e2c1d..fe2270f 100644 Binary files a/DataServer/bin/Release/DataServer.dll and b/DataServer/bin/Release/DataServer.dll differ diff --git a/DataServer/bin/Release/DataServer.pdb b/DataServer/bin/Release/DataServer.pdb index 62beeb1..9269911 100644 Binary files a/DataServer/bin/Release/DataServer.pdb and b/DataServer/bin/Release/DataServer.pdb differ diff --git a/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache b/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache index 62ec5ca..6ba9d7b 100644 --- a/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache +++ b/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -81199b671ac6f91ccc3ec49143827c0cfd75fcf6 +9bb93e08df4b95c44c0b4b59d7bb346a51e5ee40 diff --git a/DataServer/obj/Debug/DataServer.dll b/DataServer/obj/Debug/DataServer.dll index efbf9b4..622ddec 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 104d905..86e12c0 100644 Binary files a/DataServer/obj/Debug/DataServer.pdb and b/DataServer/obj/Debug/DataServer.pdb differ diff --git a/DataServer/obj/Release/DataServer.csproj.CoreCompileInputs.cache b/DataServer/obj/Release/DataServer.csproj.CoreCompileInputs.cache index 1d262a7..cd02d4b 100644 --- a/DataServer/obj/Release/DataServer.csproj.CoreCompileInputs.cache +++ b/DataServer/obj/Release/DataServer.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -5163400563efb0419f983ede377bfd25a7f6b35e +d35cea557b1bde2cc36cc0ba3b4effcda4b387e4 diff --git a/DataServer/obj/Release/DataServer.dll b/DataServer/obj/Release/DataServer.dll index f4e2c1d..fe2270f 100644 Binary files a/DataServer/obj/Release/DataServer.dll and b/DataServer/obj/Release/DataServer.dll differ diff --git a/DataServer/obj/Release/DataServer.pdb b/DataServer/obj/Release/DataServer.pdb index 62beeb1..9269911 100644 Binary files a/DataServer/obj/Release/DataServer.pdb and b/DataServer/obj/Release/DataServer.pdb differ diff --git a/JinanCementFactoryAPI/Controllers/api/ThreeDimensional/GetCoalEquipmentController.cs b/JinanCementFactoryAPI/Controllers/api/ThreeDimensional/GetCoalEquipmentController.cs new file mode 100644 index 0000000..2f4e66f --- /dev/null +++ b/JinanCementFactoryAPI/Controllers/api/ThreeDimensional/GetCoalEquipmentController.cs @@ -0,0 +1,78 @@ +using DataServer.api.threedimensional; +using Microsoft.Ajax.Utilities; +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 JinanCementFactoryAPI.Controllers.api.ThreeDimensional +{ + /// + /// 用煤设备 + /// + public class GetCoalEquipmentController : ApiController + { + DataServer.BLL.coal_equipment bll = new DataServer.BLL.coal_equipment(); + DataServer.BLL.gw_data bll_gw = new DataServer.BLL.gw_data(); + // GET api/ + public HttpResponseMessage Get(string name = "") + { + var res = new get_coal_equipment(); + try + { + var list = bll.GetModelList(" CoalName like '" + name + "'"); + var data = new List(); + var now = DateTime.Now; + string time; + var date = now.ToString("yyyy-MM-dd 00:00:00"); + if (now.Month < 10) + { + time = now.ToString("yyyy_M"); + } + else + { + time = now.ToString("yyyy_MM"); + } + var slist = string.Join(",", list.Select(x => x.Reserve1)); + var list1 = bll_gw.GetModelListsDate(slist, time).GroupBy(x => x.XTagName).Select(g => g.OrderByDescending(x => x.XTimeStamp).FirstOrDefault()).ToList(); + var list2 = bll_gw.GetModelListsDate(slist, time).Where(x => x.XTimeStamp == Convert.ToDateTime(date)).GroupBy(x => x.XTagName).Select(g => g.OrderByDescending(x => x.XTimeStamp).FirstOrDefault()).ToList(); + decimal? num1 = 0; + decimal? num2 = 0; + foreach (var item in list1) + { + num1 += Convert.ToDecimal(item.XValue); + } + foreach (var item in list2) + { + num2 += Convert.ToDecimal(item.XValue); + } + var model = new coal_equipmentData(); + model.Coal = num1 - num2; + model.Carbon = Convert.ToDecimal(Math.Round(Convert.ToDouble(model.Coal * Convert.ToDecimal(25.909) * Convert.ToDecimal(0.02610) * 44 / 12),3)); + if (model.Coal > 0 || model.Carbon > 0) + { + model.State = "正常"; + } + else + { + model.State = "错误"; + } + data.Add(model); + res.code = 200; + res.msg = "成功"; + res.data = data; + } + 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; + } + } +} \ No newline at end of file diff --git a/JinanCementFactoryAPI/Controllers/api/ThreeDimensional/GetFacilityInformationController.cs b/JinanCementFactoryAPI/Controllers/api/ThreeDimensional/GetFacilityInformationController.cs new file mode 100644 index 0000000..3be7f3b --- /dev/null +++ b/JinanCementFactoryAPI/Controllers/api/ThreeDimensional/GetFacilityInformationController.cs @@ -0,0 +1,89 @@ +using DataServer.api; +using DataServer.api.threedimensional; +using Microsoft.Ajax.Utilities; +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.Http.Validation; + +namespace JinanCementFactoryAPI.Controllers.api.ThreeDimensional +{ + /// + /// 用电设备 + /// + public class GetFacilityInformationController : ApiController + { + DataServer.BLL.electrical_installation bll = new DataServer.BLL.electrical_installation(); + DataServer.BLL.gw_data bll_gw = new DataServer.BLL.gw_data(); + // GET api/ + public HttpResponseMessage Get(string name = "") + { + var res = new get_facility_information(); + try + { + var list = bll.GetModelList(" EquipmentName like '" + name + "'"); + var data = new List(); + var now = DateTime.Now; + string time; + var date = now.ToString("yyyy-MM-dd 00:00:00"); + var sdate = now.ToString("yyyy-MM-dd 00:00:00"); + var edate = now.AddDays(1).ToString("yyyy-MM-dd 00:00:00"); + if (now.Month < 10) + { + time = now.ToString("yyyy_M"); + } + else + { + time = now.ToString("yyyy_MM"); + } + var EHs = string.Join(",", list.Select(x => x.EH)); + var Ps = string.Join(",", list.Select(x => x.P)); + var list1 = bll_gw.GetModelListsDate(EHs, time).GroupBy(x => x.XTagName).Select(g => g.OrderByDescending(x => x.XTimeStamp).FirstOrDefault()).ToList(); + var list2 = bll_gw.GetModelListsDate(EHs, time).Where(x => x.XTimeStamp == Convert.ToDateTime(date)).GroupBy(x => x.XTagName).Select(g => g.OrderByDescending(x => x.XTimeStamp).FirstOrDefault()).ToList(); + var plist = bll_gw.GetModelListsDate(Ps, time).Where(x => x.XTimeStamp >= Convert.ToDateTime(sdate) && x.XTimeStamp < Convert.ToDateTime(edate)).DistinctBy(x=>new { x.XTagName,x.XTimeStamp}).ToList(); + decimal? num1 = 0; + decimal? num2 = 0; + decimal? num = 0; + foreach (var item in list1) + { + num1 += Convert.ToDecimal(item.XValue); + } + foreach (var item in list2) + { + num2 += Convert.ToDecimal(item.XValue); + } + foreach (var item in plist) + { + num += Convert.ToDecimal(item.XValue); + } + var model = new facility_informationData(); + model.EH = num1 - num2; + model.P = num; + if (model.EH > 0 || model.P > 0) + { + model.State = "正常"; + } + else + { + model.State = "错误"; + } + data.Add(model); + res.code = 200; + res.msg = "成功"; + res.data = data; + } + 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; + } + } +} \ No newline at end of file diff --git a/JinanCementFactoryAPI/Controllers/api/ThreeDimensional/GetWaterEquipmentController.cs b/JinanCementFactoryAPI/Controllers/api/ThreeDimensional/GetWaterEquipmentController.cs new file mode 100644 index 0000000..db59dda --- /dev/null +++ b/JinanCementFactoryAPI/Controllers/api/ThreeDimensional/GetWaterEquipmentController.cs @@ -0,0 +1,81 @@ +using DataServer.api.threedimensional; +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 JinanCementFactoryAPI.Controllers.api.ThreeDimensional +{ + /// + /// 用水设备 + /// + public class GetWaterEquipmentController : ApiController + { + DataServer.BLL.water_meter bll = new DataServer.BLL.water_meter(); + DataServer.BLL.gw_data bll_gw = new DataServer.BLL.gw_data(); + // GET api/ + public HttpResponseMessage Get(string name = "") + { + var res = new get_water_equipment(); + try + { + var list = bll.GetModelList(" WaterMeterName like '" + name + "'"); + var data = new List(); + var now = DateTime.Now; + string time; + var date = now.ToString("yyyy-MM-dd 00:00:00"); + if (now.Month < 10) + { + time = now.ToString("yyyy_M"); + } + else + { + time = now.ToString("yyyy_MM"); + } + var slist = string.Join(",", list.Select(x => x.Reserve1)); + var list1 = bll_gw.GetModelListsDate(slist, time).GroupBy(x => x.XTagName).Select(g => g.OrderByDescending(x => x.XTimeStamp).FirstOrDefault()).ToList(); + var list2 = bll_gw.GetModelListsDate(slist, time).Where(x => x.XTimeStamp == Convert.ToDateTime(date)).GroupBy(x => x.XTagName).Select(g => g.OrderByDescending(x => x.XTimeStamp).FirstOrDefault()).ToList(); + decimal? num1 = 0; + decimal? num2 = 0; + foreach (var item in list1) + { + num1 += Convert.ToDecimal(item.XValue); + } + foreach (var item in list2) + { + num2 += Convert.ToDecimal(item.XValue); + } + Random rand = new Random(); + var model = new water_equipmentData(); + model.Water = num1 - num2; + double randomValue = 0.4 + (0.8 - 0.4) * rand.NextDouble(); + double roundedValue = Math.Round(randomValue, 3); // 保留三位小数 + model.OutletPressure = Convert.ToDecimal(roundedValue); + model.Speed = 0; + if (model.Water > 0) + { + model.State = "正常"; + } + else + { + model.State = "错误"; + } + data.Add(model); + res.code = 200; + res.msg = "成功"; + res.data = data; + } + 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; + } + } +} \ No newline at end of file diff --git a/JinanCementFactoryAPI/JinanCementFactoryAPI.csproj b/JinanCementFactoryAPI/JinanCementFactoryAPI.csproj index 9769600..1dc1e28 100644 --- a/JinanCementFactoryAPI/JinanCementFactoryAPI.csproj +++ b/JinanCementFactoryAPI/JinanCementFactoryAPI.csproj @@ -270,6 +270,9 @@ + + + diff --git a/JinanCementFactoryAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/JinanCementFactoryAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index bce468e..d3fafe2 100644 --- a/JinanCementFactoryAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/JinanCementFactoryAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>E:\林谷项目\济南水泥厂项目\发布文件 - True|2024-03-19T02:03:42.8595949Z;True|2024-03-18T15:23:16.2391769+08:00;True|2024-01-30T17:18:04.1029630+08:00;True|2024-01-30T10:52:43.5964468+08:00;True|2024-01-29T13:55:44.0819864+08:00;True|2024-01-15T15:09:05.3782932+08:00;True|2024-01-03T14:38:44.4826705+08:00;True|2023-12-15T09:15:49.5317563+08:00; + True|2024-03-20T08:31:47.7470952Z;True|2024-03-20T10:27:05.7350315+08:00;True|2024-03-19T10:03:42.8595949+08:00;True|2024-03-18T15:23:16.2391769+08:00;True|2024-01-30T17:18:04.1029630+08:00;True|2024-01-30T10:52:43.5964468+08:00;True|2024-01-29T13:55:44.0819864+08:00;True|2024-01-15T15:09:05.3782932+08:00;True|2024-01-03T14:38:44.4826705+08:00;True|2023-12-15T09:15:49.5317563+08:00; @@ -79,19 +79,19 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 12/13/2023 15:43:02 - 03/19/2024 10:03:41 + 03/20/2024 16:31:46 12/14/2023 09:59:45 - 03/19/2024 10:03:41 + 03/20/2024 16:31:46 - 03/19/2024 10:03:42 + 03/20/2024 16:31:47 - 03/19/2024 10:03:42 + 03/20/2024 16:31:47 12/13/2023 14:16:06 @@ -426,6 +426,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 03/18/2024 16:49:03 + + 03/19/2024 11:07:43 + 03/18/2024 16:49:03 @@ -438,9 +441,15 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 03/18/2024 16:49:03 + + 03/19/2024 14:20:26 + 03/18/2024 16:49:03 + + 03/19/2024 15:01:07 + 03/18/2024 16:49:03 @@ -450,12 +459,18 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 03/19/2024 09:02:36 + + 03/19/2024 14:31:13 + 03/11/2024 09:31:21 03/11/2024 09:36:01 + + 03/19/2024 15:26:54 + 03/19/2024 09:29:58 @@ -531,6 +546,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 03/18/2024 16:49:03 + + 03/19/2024 13:47:46 + 03/18/2024 16:49:03 @@ -675,6 +693,15 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 03/18/2024 16:49:04 + + 03/20/2024 16:00:12 + + + 03/20/2024 15:36:21 + + + 03/20/2024 16:23:19 + 12/13/2023 15:43:02 diff --git a/JinanCementFactoryAPI/bin/DataServer.dll b/JinanCementFactoryAPI/bin/DataServer.dll index efbf9b4..fe2270f 100644 Binary files a/JinanCementFactoryAPI/bin/DataServer.dll and b/JinanCementFactoryAPI/bin/DataServer.dll differ diff --git a/JinanCementFactoryAPI/bin/DataServer.pdb b/JinanCementFactoryAPI/bin/DataServer.pdb index 104d905..9269911 100644 Binary files a/JinanCementFactoryAPI/bin/DataServer.pdb and b/JinanCementFactoryAPI/bin/DataServer.pdb differ diff --git a/JinanCementFactoryAPI/bin/JinanCementFactoryAPI.dll b/JinanCementFactoryAPI/bin/JinanCementFactoryAPI.dll index 52f47ed..6b847d7 100644 Binary files a/JinanCementFactoryAPI/bin/JinanCementFactoryAPI.dll and b/JinanCementFactoryAPI/bin/JinanCementFactoryAPI.dll differ diff --git a/JinanCementFactoryAPI/bin/JinanCementFactoryAPI.pdb b/JinanCementFactoryAPI/bin/JinanCementFactoryAPI.pdb index cc76ab4..82bebed 100644 Binary files a/JinanCementFactoryAPI/bin/JinanCementFactoryAPI.pdb and b/JinanCementFactoryAPI/bin/JinanCementFactoryAPI.pdb differ diff --git a/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.csproj.AssemblyReference.cache b/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.csproj.AssemblyReference.cache index 5f935b0..34b519b 100644 Binary files a/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.csproj.AssemblyReference.cache and b/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.csproj.AssemblyReference.cache differ diff --git a/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.csproj.CoreCompileInputs.cache b/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.csproj.CoreCompileInputs.cache index f69e383..027e695 100644 --- a/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.csproj.CoreCompileInputs.cache +++ b/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d2da74210dcfc0e04f9ffdc2d4532869108119b4 +ed8a7d2229f1b5c2dd262f21b8468701ad9538a3 diff --git a/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.dll b/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.dll index 52f47ed..175f035 100644 Binary files a/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.dll and b/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.dll differ diff --git a/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.pdb b/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.pdb index cc76ab4..34772cc 100644 Binary files a/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.pdb and b/JinanCementFactoryAPI/obj/Debug/JinanCementFactoryAPI.pdb differ diff --git a/JinanCementFactoryAPI/obj/Debug/build.force b/JinanCementFactoryAPI/obj/Debug/build.force new file mode 100644 index 0000000..e69de29 diff --git a/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.csproj.AssemblyReference.cache b/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.csproj.AssemblyReference.cache index e16ad11..8592709 100644 Binary files a/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.csproj.AssemblyReference.cache and b/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.csproj.AssemblyReference.cache differ diff --git a/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.csproj.CoreCompileInputs.cache b/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.csproj.CoreCompileInputs.cache index 323ae80..a492709 100644 --- a/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.csproj.CoreCompileInputs.cache +++ b/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -1fe07b950aa628485f3912c02c8bc0c5e800a6e8 +819fe655be862c82bb460a73001f4b700eeeb31a diff --git a/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.dll b/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.dll index ac4d67d..6b847d7 100644 Binary files a/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.dll and b/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.dll differ diff --git a/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.pdb b/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.pdb index 0d31e6d..82bebed 100644 Binary files a/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.pdb and b/JinanCementFactoryAPI/obj/Release/JinanCementFactoryAPI.pdb differ diff --git a/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/DataServer.dll b/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/DataServer.dll index f4e2c1d..fe2270f 100644 Binary files a/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/DataServer.dll and b/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/DataServer.dll differ diff --git a/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/DataServer.pdb b/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/DataServer.pdb index 62beeb1..9269911 100644 Binary files a/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/DataServer.pdb and b/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/DataServer.pdb differ diff --git a/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/JinanCementFactoryAPI.dll b/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/JinanCementFactoryAPI.dll index ac4d67d..6b847d7 100644 Binary files a/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/JinanCementFactoryAPI.dll and b/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/JinanCementFactoryAPI.dll differ diff --git a/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/JinanCementFactoryAPI.pdb b/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/JinanCementFactoryAPI.pdb index 0d31e6d..82bebed 100644 Binary files a/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/JinanCementFactoryAPI.pdb and b/JinanCementFactoryAPI/obj/Release/Package/PackageTmp/bin/JinanCementFactoryAPI.pdb differ