Application/IStation.Application.OpenApi/IStation.Application.OpenApi.csproj
@@ -11,6 +11,7 @@ <ItemGroup> <ProjectReference Include="..\..\Calculation\IStation.Calculation.Dispatch\IStation.Calculation.Dispatch.csproj" /> <ProjectReference Include="..\..\Calculation\IStation.Calculation.Plan\IStation.Calculation.Plan.csproj" /> <ProjectReference Include="..\IStation.Application.Core\IStation.Application.Core.csproj" /> </ItemGroup> Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
Application/IStation.Application.OpenApi/shys/dispatch/dto/DispatchAnaSchemeItemOutput.cs
Application/IStation.Application.OpenApi/shys/dispatch/dto/DispatchAnaSchemeOutput.cs
Application/IStation.Application.OpenApi/shys/dispatch/dto/DispatchBranchDto.cs
Application/IStation.Application.OpenApi/shys/dispatch/dto/DispatchFactoryDto.cs
Application/IStation.Application.OpenApi/shys/dispatch/dto/DispatchScadaDto.cs
Application/IStation.Application.OpenApi/shys/dispatch/dto/FactoryDispatchInput.cs
Application/IStation.Application.OpenApi/shys/dispatch/dto/StationDispatchExInput.cs
Application/IStation.Application.OpenApi/shys/dispatch/dto/StationDispatchInput.cs
Application/IStation.Application.OpenApi/shys/plan/PlanAna_ShysController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,231 @@ using Microsoft.AspNetCore.Mvc; using System.Net; using System.Net.Http.Headers; using Microsoft.Extensions.Hosting.Internal; using Microsoft.AspNetCore.Http.Extensions; using IStation.Untity; using Furion.DynamicApiController; using System.ComponentModel.DataAnnotations; using Mapster; using Microsoft.AspNetCore.Authorization; using IStation.Calculation; using IStation.Calculation.PlanAna; namespace IStation.Application { /// <summary> /// ShysPlanAna /// </summary> [Route("OpenApi/PlanAna/SHYS")] [ApiDescriptionSettings("OpenApi", Name = "䏿µ·å水计ååæ", Order = 1000)] public class PlanAna_ShysController : IDynamicApiController { private const long _corpId = 4; /// <summary> /// è®¡ç® /// </summary> [AllowAnonymous] [NonUnify] [Route("Calculate")] [HttpPost] public List<PlanAnaDto> Calculate([Required] List<PlanAnaInput> inputList) { if (inputList == null || inputList.Count < 1) { LogHelper.Error("䏿µ·åæ°´è½è计ååæè®¡ç®æ¥å£å ¥å为空"); return default; } //debug LogHelper.Debug(JsonHelper.Object2Json(inputList)); var url_sg = Settings.WebApi.OpenApi.SanGaoPlanUrl; var responseText = HttpRequestHelper.Post(url_sg, JsonHelper.Object2Json(inputList)); //debug LogHelper.Debug(responseText); var planDataList = JsonHelper.Json2Object<List<PlanAnaData>>(responseText); if (planDataList == null||planDataList.Count<1) { LogHelper.Error("䏿µ·åæ°´è½è计ååæè®¡ç®ä¸é«è¿åæ¥å£åºå为空"); return default; } if (planDataList.Exists(x => x.datas == null || x.datas.Count < 1)) { LogHelper.Error("䏿µ·åæ°´è½è计ååæè®¡ç®ä¸é«è¿åæ¥å£åºåæ ¼å¼é误"); return default; } var factoryIds = planDataList.SelectMany(x=>x.datas).Select(x => x.factory).Distinct().ToList(); var vmList = new List<PlanAnaDto>(); foreach (var factoryId in factoryIds) { //æé 计ç®å ¥å var sumRecordList = new List<MonthSumRecord>(); foreach (var planData in planDataList) { var sumRecord = new MonthSumRecord(); sumRecord.Month = planData.timeflag; sumRecord.HourRecords = new List<HourSumRecord>(); var factoryData = planData.datas.Find(t=>t.factory==factoryId); for (int i = 0; i <= 23; i++) { var hourSumRecord = new HourSumRecord(); hourSumRecord.Hour = i; hourSumRecord.Records = new List<Calculation.PlanAna.MonitorRecord>(); if (factoryData.scada != null && factoryData.scada.Count > 0) { foreach (var scadaItem in factoryData.scada) { var scadaRecord = new Calculation.PlanAna.MonitorRecord(); scadaRecord.MonitorId = PlanAnaConstant.MonitorDict[scadaItem.tagname]; scadaRecord.RecordValue = scadaItem.values.Find(t => t.datetime.Trim() == PlanAnaConstant.HourDict[i]).value; hourSumRecord.Records.Add(scadaRecord); } } if (factoryData.result != null && factoryData.result.Count > 0) { foreach (var resultItem in factoryData.result) { var resultRecord = new Calculation.PlanAna.MonitorRecord(); resultRecord.MonitorId = PlanAnaConstant.MonitorDict[resultItem.tagname]; resultRecord.RecordValue = resultItem.values.Find(t => t.datetime.Trim() == PlanAnaConstant.HourDict[i]).value; hourSumRecord.Records.Add(resultRecord); } } sumRecord.HourRecords.Add(hourSumRecord); } sumRecordList.Add(sumRecord); } //æ¾å°ç¸å ³æ³µç«ï¼å¹¶è¿è¡è®¡ç® var stationId = PlanAnaConstant.FactoryDict[factoryId]; var station = new Service.Station().GetByID(_corpId, stationId); var calculator = PlanAnaCalculatorFactory.CreateCalculator(_corpId, ObjectType.Station, stationId); var resultList = calculator.Calculate(sumRecordList); if (resultList == null || resultList.Count < 1) { LogHelper.Error($"䏿µ·åæ°´è½è计ååæè®¡ç®ä¸ï¼æ³µç«åç§°:{station.Name} æ³µç«id:{stationId},计ç®é误"); continue; } //çæè¿åç»æ var vmItem = new PlanAnaDto(); vmItem.factory = factoryId; vmItem.name = station.Name; vmItem.values = new List<List<double>>(); for (int i = 1; i <= 12; i++) { var result = resultList.Find(t => t.Month == i); if (result == null) { vmItem.values.Add(new List<double>() { 0, 0, 0 }); } else { vmItem.values.Add(new List<double>() {result.Qt,result.Dt,result.WP}); } } vmList.Add(vmItem); } return vmList; } /// <summary> /// 计ç®-è°è¯ /// </summary> [AllowAnonymous] [NonUnify] [Route("Calculate@Debug")] [HttpPost] public List<PlanAnaDto> Calculate_debug() { var responseText = System.IO.File.ReadAllText(@"D:\result.txt");//(æµè¯ç¨ç) var planDataList = JsonHelper.Json2Object<List<PlanAnaData>>(responseText); var factoryIds = planDataList.SelectMany(x => x.datas).Select(x => x.factory).Distinct().ToList(); var vmList = new List<PlanAnaDto>(); foreach (var factoryId in factoryIds) { //æé 计ç®å ¥å var sumRecordList = new List<MonthSumRecord>(); foreach (var planData in planDataList) { var sumRecord = new MonthSumRecord(); sumRecord.Month = planData.timeflag; sumRecord.HourRecords = new List<HourSumRecord>(); var factoryData = planData.datas.Find(t => t.factory == factoryId); for (int i = 0; i <= 23; i++) { var hourSumRecord = new HourSumRecord(); hourSumRecord.Hour = i; hourSumRecord.Records = new List<Calculation.PlanAna.MonitorRecord>(); if (factoryData.scada != null && factoryData.scada.Count > 0) { foreach (var scadaItem in factoryData.scada) { var scadaRecord = new Calculation.PlanAna.MonitorRecord(); scadaRecord.MonitorId = PlanAnaConstant.MonitorDict[scadaItem.tagname]; scadaRecord.RecordValue = scadaItem.values.Find(t => t.datetime.Trim() == PlanAnaConstant.HourDict[i]).value; hourSumRecord.Records.Add(scadaRecord); } } if (factoryData.result != null && factoryData.result.Count > 0) { foreach (var resultItem in factoryData.result) { var resultRecord = new Calculation.PlanAna.MonitorRecord(); resultRecord.MonitorId = PlanAnaConstant.MonitorDict[resultItem.tagname]; resultRecord.RecordValue = resultItem.values.Find(t => t.datetime.Trim() == PlanAnaConstant.HourDict[i]).value; hourSumRecord.Records.Add(resultRecord); } } sumRecord.HourRecords.Add(hourSumRecord); } sumRecordList.Add(sumRecord); } //æ¾å°ç¸å ³æ³µç«ï¼å¹¶è¿è¡è®¡ç® var stationId = PlanAnaConstant.FactoryDict[factoryId]; var station = new Service.Station().GetByID(_corpId, stationId); var calculator = PlanAnaCalculatorFactory.CreateCalculator(_corpId, ObjectType.Station, stationId); var resultList = calculator.Calculate(sumRecordList); if (resultList == null || resultList.Count < 1) { LogHelper.Error($"䏿µ·åæ°´è½è计ååæè®¡ç®ä¸ï¼æ³µç«åç§°:{station.Name} æ³µç«id:{stationId},计ç®é误"); continue; } //çæè¿åç»æ var vmItem = new PlanAnaDto(); vmItem.factory = factoryId; vmItem.name = station.Name; vmItem.values = new List<List<double>>(); for (int i = 1; i <= 12; i++) { var result = resultList.Find(t => t.Month == i); if (result == null) { vmItem.values.Add(new List<double>() { 0, 0, 0 }); } else { vmItem.values.Add(new List<double>() { result.Qt, result.Dt, result.WP }); } } vmList.Add(vmItem); } return vmList; } } } Application/IStation.Application.OpenApi/shys/plan/dto/PlanAnaConstant.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,84 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace IStation.Application { /// <summary> /// 计ååæå¸¸é /// </summary> public class PlanAnaConstant { /// <summary> /// ç«ç¹åå ¸ /// </summary> public static Dictionary<int, long> FactoryDict = new Dictionary<int, long>() { {1,2},//é¿å ´æ³µç« {2,12},//äºå·æ²åæ¡¥æ¹å {3,9},//äºå·æ²éæµ·æ¹å {4,3},//äºå·æ²ä¸¥æ¡¥æ¹å1 {5,5},//äºå·æ²ä¸¥æ¡¥æ¹å2 {6,4},//ä¸¥æ¡¥æ³µç« {7,6},//临æ±1#æ³µç« {8,7},//临æ±2#æ³µç« {9,8},//徿³¾æ³µç« {10,10},//éæµ·æ³µç« {11,11},//忱忳µç« {12,15},//éè¡ä¸è¾ {13,16},//éè¡äºè¾ {14,17},//æ³°åæ³µç« {15,19},//éæ³½æ³µç« {16,20},//æ¾æ±æ³µç« {17,21},//å¤§æ¡¥æ³µç« }; /// <summary> /// æµç¹åå ¸ /// </summary> public static Dictionary<string, long> MonitorDict = new Dictionary<string, long>() { {"_0402010403030103001",69},//éèæ²æ°´åºæ¶²ä½ {"_0402010404030103001",70},//éèæ²æ°´åºå¸æ°´äºæ¶²ä½-é¿å ´æ³µç«åæ± æ¶²ä½ {"_0402010403030002001",73},//é¿å ´æ³µç«è¾æ°´æ³µåºæ°´ç®¡é1æµé {"_0402010403030002005",72},//é¿å ´æ³µç«è¾æ°´ç®¡é1#åå {"_0402010403030002002",77},//é¿å ´æ³µç«è¾æ°´æ³µåºæ°´ç®¡é2æµé {"_0402010403030002006",76},//é¿å ´æ³µç«è¾æ°´ç®¡é2#åå }; /// <summary> /// æ¶åå ¸ /// </summary> public static Dictionary<int,string> HourDict = new Dictionary<int,string>() { { 0,"00:00"}, { 1,"01:00"}, { 2,"02:00"}, { 3,"03:00"}, { 4,"04:00"}, { 5,"05:00"}, { 6,"06:00"}, { 7,"07:00"}, { 8,"08:00"}, { 9,"09:00"}, { 10,"10:00"}, { 11,"11:00"}, { 12,"12:00"}, { 13,"13:00"}, { 14,"14:00"}, { 15,"15:00"}, { 16,"16:00"}, { 17,"17:00"}, { 18,"18:00"}, { 19,"19:00"}, { 20,"20:00"}, { 21,"21:00"}, { 22,"22:00"}, { 23,"23:00"} }; } } Application/IStation.Application.OpenApi/shys/plan/dto/PlanAnaDto.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,30 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace IStation.Application { /// <summary> /// 计ååædto /// </summary> public class PlanAnaDto { /// <summary> /// ç«ç¹ /// </summary> public int factory { get; set; } /// <summary> /// åç§° /// </summary> public string name { get; set; } /// <summary> /// 12ä¸ªææ°æ®æ°ç»[便°´é,èçµé,å卿°´è½è] /// </summary> public List<List<double>> values { get; set; } } } Application/IStation.Application.OpenApi/shys/plan/dto/PlanAnaInput.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,27 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace IStation.Application { /// <summary> /// è½èè®¡åæ°´éè¾å ¥ /// </summary> public class PlanAnaInput { /// <summary> /// ç«ç¹ /// </summary> public int factory { get; set; } /// <summary> /// æä»½å表 /// </summary> public List<int> value { get; set; } } } Application/IStation.Application.OpenApi/shys/plan/dto/PlanAnaTransfer.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,84 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace IStation.Application { /// <summary> /// æ¶å¼ /// </summary> public class PlanAnaHourValue { /// <summary> /// 00:00-23:00 /// </summary> public string datetime { get; set; } /// <summary> /// å¼ /// </summary> public double value { get; set; } } /// <summary> /// æ ç¾æ¶å¼å表 /// </summary> public class PlanAnaTagHourValues { /// <summary> /// æ ç¾åç§° /// </summary> public string tagname { get; set; } /// <summary> /// å¼å表 /// </summary> public List<PlanAnaHourValue> values { get; set; } } /// <summary> /// ç«ç¹æ°æ® /// </summary> public class PlanAnaFactoryData { /// <summary> /// ç«ç¹ /// </summary> public int factory { get; set; } /// <summary> /// ç»æ /// </summary> public List<PlanAnaTagHourValues> result { get; set; } /// <summary> /// 宿¶ /// </summary> public List<PlanAnaTagHourValues> scada { get; set; } } /// <summary> /// æ°æ® /// </summary> public class PlanAnaData { /// <summary> /// æä»½æ å¿ 1-12 /// </summary> public int timeflag { get; set; } /// <summary> /// æ°æ® /// </summary> public List<PlanAnaFactoryData> datas { get; set; } } } Calculation/IStation.Calculation.Plan/IPlanAnaCalculator.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,30 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using IStation.Calculation.PlanAna; namespace IStation.Calculation { /// <summary> /// 计ååæè®¡ç®å¨æ¥å£ /// </summary> public interface IPlanAnaCalculator { /// <summary> /// /// </summary> List<MonthCalcuResult> Calculate(List<MonthSumRecord> monthRecordList); } } Calculation/IStation.Calculation.Plan/IStation.Calculation.Plan.csproj
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,15 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net6.0</TargetFramework> <ImplicitUsings>enable</ImplicitUsings> <Nullable>disable</Nullable> <AssemblyName>IStation.Calculation.Plan</AssemblyName> <RootNamespace>IStation.Calculation.PlanAna</RootNamespace> </PropertyGroup> <ItemGroup> <ProjectReference Include="..\..\Core\IStation.Core\IStation.Core.csproj" /> </ItemGroup> </Project> Calculation/IStation.Calculation.Plan/PlanAnaCalculatorFactory.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,45 @@ using IStation.Calculation.PlanAna; namespace IStation.Calculation { public class PlanAnaCalculatorFactory { /// <summary> /// å建计ç®å¨ /// </summary> public static IPlanAnaCalculator CreateCalculator(long corpId, string objectType, long objectId) { IPlanAnaCalculator calculator = null; switch (objectType) { case ObjectType.Station: { switch (corpId) { case 4: { switch (objectId) { case 2: //é¿å ´æ³µç« { calculator = new Calculator4ShysCxbz(); } break; default:break; } } break; default:break; } } break; default:break; } return calculator; } } } Calculation/IStation.Calculation.Plan/custom/shys/station/Cxbz.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,22 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace IStation.Calculation.PlanAna { /// <summary> /// é¿å ´å²è®¡ç® /// </summary> public class Calculator4ShysCxbz : IPlanAnaCalculator { /// <summary> /// è®¡ç® /// </summary> public List<MonthCalcuResult> Calculate(List<MonthSumRecord> monthRecordList) { throw new NotImplementedException(); } } } Calculation/IStation.Calculation.Plan/input/HourSumRecord.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,24 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace IStation.Calculation.PlanAna { /// <summary> /// æ¶æ±æ»è®°å½ /// </summary> public class HourSumRecord { /// <summary> /// 0-23 /// </summary> public int Hour { get; set; } /// <summary> /// è®°å½ /// </summary> public List<MonitorRecord> Records { get; set; } } } Calculation/IStation.Calculation.Plan/input/MonitorRecord.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,24 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace IStation.Calculation.PlanAna { /// <summary> /// çæµå¼ /// </summary> public class MonitorRecord { /// <summary> /// çæµid /// </summary> public long MonitorId { get; set; } /// <summary> /// è®°å½å¼ /// </summary> public double RecordValue { get; set; } } } Calculation/IStation.Calculation.Plan/input/MonthSumRecord.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,26 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace IStation.Calculation.PlanAna { /// <summary> /// ææ±æ»è®°å½ /// </summary> public class MonthSumRecord { /// <summary> /// æä»½ 1-12 /// </summary> public int Month { get; set; } /// <summary> /// è®°å½å表 /// </summary> public List<HourSumRecord> HourRecords { get; set; } } } Calculation/IStation.Calculation.Plan/output/MonthCalcuResult.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,36 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace IStation.Calculation.PlanAna { /// <summary> /// æè®¡ç®ç»æ /// </summary> public class MonthCalcuResult { /// <summary> /// æä»½ 1-12 /// </summary> public int Month { get; set; } /// <summary> /// 便°´é m³ /// </summary> public double Qt { get; set; } /// <summary> /// èçµé kw /// </summary> public double Dt { get; set; } /// <summary> /// åå¨è½è /// </summary> public double WP { get; set; } } } IStation.sln
@@ -401,19 +401,21 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Application.LinuxTest", "Application\IStation.Application.LinuxTest\IStation.Application.LinuxTest.csproj", "{2E7985B8-1910-48B8-BCED-DB10966CA879}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IStation.Entity.LinuxTest", "Entity\IStation.Entity.LinuxTest\IStation.Entity.LinuxTest.csproj", "{AFB25410-75EF-4A8A-B7EF-AFF59F9FAAE1}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Entity.LinuxTest", "Entity\IStation.Entity.LinuxTest\IStation.Entity.LinuxTest.csproj", "{AFB25410-75EF-4A8A-B7EF-AFF59F9FAAE1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IStation.Model.LinuxTest", "Model\IStation.Model.LinuxTest\IStation.Model.LinuxTest.csproj", "{43C56FAB-C917-49C9-977E-9E8B3F899EB9}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Model.LinuxTest", "Model\IStation.Model.LinuxTest\IStation.Model.LinuxTest.csproj", "{43C56FAB-C917-49C9-977E-9E8B3F899EB9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IStation.DAL.LinuxTest", "DAL\IStation.DAL.LinuxTest\IStation.DAL.LinuxTest.csproj", "{7B78DCFE-A596-4F69-8DEE-53E0B22A9C4B}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.DAL.LinuxTest", "DAL\IStation.DAL.LinuxTest\IStation.DAL.LinuxTest.csproj", "{7B78DCFE-A596-4F69-8DEE-53E0B22A9C4B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IStation.Service.LinuxTest", "Service\IStation.Service.LinuxTest\IStation.Service.LinuxTest.csproj", "{CFE5081A-568C-440A-9691-A01342D5EC3F}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Service.LinuxTest", "Service\IStation.Service.LinuxTest\IStation.Service.LinuxTest.csproj", "{CFE5081A-568C-440A-9691-A01342D5EC3F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.RedisCache.LinuxTest", "RedisCache\IStation.RedisCache.LinuxTest\IStation.RedisCache.LinuxTest.csproj", "{73F2DCB8-32F2-47F2-B48D-A88463FFCCCE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.WebApi.Entry.LinuxTest", "Entry\IStation.WebApi.Entry.LinuxTest\IStation.WebApi.Entry.LinuxTest.csproj", "{2FF6544D-390E-47A5-88D0-54C022E7A9E7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Server.LinuxTest", "Server\IStation.Server.LinuxTest\IStation.Server.LinuxTest.csproj", "{806A79E4-0546-45F2-82A0-550F316B331E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IStation.Calculation.Plan", "Calculation\IStation.Calculation.Plan\IStation.Calculation.Plan.csproj", "{F0F2A953-B00C-4B1C-8A3E-A866F0AA55B5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -1161,6 +1163,10 @@ {806A79E4-0546-45F2-82A0-550F316B331E}.Debug|Any CPU.Build.0 = Debug|Any CPU {806A79E4-0546-45F2-82A0-550F316B331E}.Release|Any CPU.ActiveCfg = Release|Any CPU {806A79E4-0546-45F2-82A0-550F316B331E}.Release|Any CPU.Build.0 = Release|Any CPU {F0F2A953-B00C-4B1C-8A3E-A866F0AA55B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F0F2A953-B00C-4B1C-8A3E-A866F0AA55B5}.Debug|Any CPU.Build.0 = Debug|Any CPU {F0F2A953-B00C-4B1C-8A3E-A866F0AA55B5}.Release|Any CPU.ActiveCfg = Release|Any CPU {F0F2A953-B00C-4B1C-8A3E-A866F0AA55B5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1351,6 +1357,7 @@ {73F2DCB8-32F2-47F2-B48D-A88463FFCCCE} = {318306D9-A6F4-456C-9019-8E7EDA4F2066} {2FF6544D-390E-47A5-88D0-54C022E7A9E7} = {A942D1DC-1312-4316-8E0B-9D22A0AFE03D} {806A79E4-0546-45F2-82A0-550F316B331E} = {B419D1AA-F88B-4780-9018-30D5669C48DC} {F0F2A953-B00C-4B1C-8A3E-A866F0AA55B5} = {B1548C2C-C3C2-47C0-8F6E-B265D0603099} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {18D1EA07-81E5-4443-8512-F303BC79DCF4} Settings/IStation.Settings/models/webapi/Paras_WebApi_OpenApi.cs
@@ -15,5 +15,10 @@ /// ä¸é«è°åº¦æ¥å£ /// </summary> public string SanGaoDispatchUrl { get; set; } /// <summary> /// ä¸é«è°åº¦æ¥å£ /// </summary> public string SanGaoPlanUrl { get; set; } } } Settings/IStation.Settings/paras_settings.json
@@ -229,7 +229,8 @@ "WebApi": { "EnableJwt": false, "OpenApi": { "SanGaoDispatchUrl": "http://192.168.60.228:8821/Api/wsmp/v1/Chengtou/factoryCalc" "SanGaoDispatchUrl": "http://192.168.60.228:8821/Api/wsmp/v1/Chengtou/factoryCalc", "SanGaoPlanUrl": "http://192.168.60.228:8821/Api/wsmp/v1/Chengtou/factoryCalc_New" } },