WebApi 整理

ningshuxia

2024-04-25 769413fc5ff52240f001fb4bcfcca21728fb275a

WebApi 整理

 IStation.WebApi.sln

@@ -3,17 +3,17 @@
# Visual Studio Version 17
VisualStudioVersion = 17.1.32328.378
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Application.Core", "IStation.Application.Core\IStation.Application.Core.csproj", "{8A244138-73AE-4AAE-840A-3301CECADE2A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Application.Core", "WebApi\IStation.Application.Core\IStation.Application.Core.csproj", "{0359554E-B0F0-4C88-BCBA-673E8226F814}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Entry.Core", "IStation.Entry.Core\IStation.Entry.Core.csproj", "{55552F4C-DD2B-4E97-95DA-16B549736604}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Entry.Core", "WebApi\IStation.Entry.Core\IStation.Entry.Core.csproj", "{90317C62-4850-4657-9E6A-642E0584FDFF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Server", "IStation.Server\IStation.Server.csproj", "{863868E2-8A14-4B9B-A2FA-047D60FC5736}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Server", "WebApi\IStation.Server\IStation.Server.csproj", "{15B903FB-8E85-4226-9045-390AD31564F6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Service.Core", "IStation.Service.Core\IStation.Service.Core.csproj", "{DA274F11-5585-4C3F-B9DB-491A738CE91C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Service.Core", "WebApi\IStation.Service.Core\IStation.Service.Core.csproj", "{F1B05574-2A26-49BC-9D53-C8BE9B2B176E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.TopShelf", "IStation.TopShelf\IStation.TopShelf.csproj", "{0C4F3895-704A-418B-B0E5-B493EB1DB04D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.TopShelf", "WebApi\IStation.TopShelf\IStation.TopShelf.csproj", "{00D70EB8-C8FF-46BA-8DB0-FB9361E046BF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.WebApi.Core", "IStation.WebApi.Core\IStation.WebApi.Core.csproj", "{B603D7A0-E024-46E7-9B67-22A9BAFECB57}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.WebApi.Core", "WebApi\IStation.WebApi.Core\IStation.WebApi.Core.csproj", "{8077F0D3-3FCC-44BF-8AB3-DF1A105CC798}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,30 +21,30 @@
        Release|Any CPU = Release|Any CPU
    EndGlobalSection
    GlobalSection(ProjectConfigurationPlatforms) = postSolution
        {8A244138-73AE-4AAE-840A-3301CECADE2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {8A244138-73AE-4AAE-840A-3301CECADE2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {8A244138-73AE-4AAE-840A-3301CECADE2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {8A244138-73AE-4AAE-840A-3301CECADE2A}.Release|Any CPU.Build.0 = Release|Any CPU
        {55552F4C-DD2B-4E97-95DA-16B549736604}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {55552F4C-DD2B-4E97-95DA-16B549736604}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {55552F4C-DD2B-4E97-95DA-16B549736604}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {55552F4C-DD2B-4E97-95DA-16B549736604}.Release|Any CPU.Build.0 = Release|Any CPU
        {863868E2-8A14-4B9B-A2FA-047D60FC5736}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {863868E2-8A14-4B9B-A2FA-047D60FC5736}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {863868E2-8A14-4B9B-A2FA-047D60FC5736}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {863868E2-8A14-4B9B-A2FA-047D60FC5736}.Release|Any CPU.Build.0 = Release|Any CPU
        {DA274F11-5585-4C3F-B9DB-491A738CE91C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {DA274F11-5585-4C3F-B9DB-491A738CE91C}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {DA274F11-5585-4C3F-B9DB-491A738CE91C}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {DA274F11-5585-4C3F-B9DB-491A738CE91C}.Release|Any CPU.Build.0 = Release|Any CPU
        {0C4F3895-704A-418B-B0E5-B493EB1DB04D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {0C4F3895-704A-418B-B0E5-B493EB1DB04D}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {0C4F3895-704A-418B-B0E5-B493EB1DB04D}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {0C4F3895-704A-418B-B0E5-B493EB1DB04D}.Release|Any CPU.Build.0 = Release|Any CPU
        {B603D7A0-E024-46E7-9B67-22A9BAFECB57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {B603D7A0-E024-46E7-9B67-22A9BAFECB57}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {B603D7A0-E024-46E7-9B67-22A9BAFECB57}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {B603D7A0-E024-46E7-9B67-22A9BAFECB57}.Release|Any CPU.Build.0 = Release|Any CPU
        {0359554E-B0F0-4C88-BCBA-673E8226F814}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {0359554E-B0F0-4C88-BCBA-673E8226F814}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {0359554E-B0F0-4C88-BCBA-673E8226F814}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {0359554E-B0F0-4C88-BCBA-673E8226F814}.Release|Any CPU.Build.0 = Release|Any CPU
        {90317C62-4850-4657-9E6A-642E0584FDFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {90317C62-4850-4657-9E6A-642E0584FDFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {90317C62-4850-4657-9E6A-642E0584FDFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {90317C62-4850-4657-9E6A-642E0584FDFF}.Release|Any CPU.Build.0 = Release|Any CPU
        {15B903FB-8E85-4226-9045-390AD31564F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {15B903FB-8E85-4226-9045-390AD31564F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {15B903FB-8E85-4226-9045-390AD31564F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {15B903FB-8E85-4226-9045-390AD31564F6}.Release|Any CPU.Build.0 = Release|Any CPU
        {F1B05574-2A26-49BC-9D53-C8BE9B2B176E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {F1B05574-2A26-49BC-9D53-C8BE9B2B176E}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {F1B05574-2A26-49BC-9D53-C8BE9B2B176E}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {F1B05574-2A26-49BC-9D53-C8BE9B2B176E}.Release|Any CPU.Build.0 = Release|Any CPU
        {00D70EB8-C8FF-46BA-8DB0-FB9361E046BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {00D70EB8-C8FF-46BA-8DB0-FB9361E046BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {00D70EB8-C8FF-46BA-8DB0-FB9361E046BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {00D70EB8-C8FF-46BA-8DB0-FB9361E046BF}.Release|Any CPU.Build.0 = Release|Any CPU
        {8077F0D3-3FCC-44BF-8AB3-DF1A105CC798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {8077F0D3-3FCC-44BF-8AB3-DF1A105CC798}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {8077F0D3-3FCC-44BF-8AB3-DF1A105CC798}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {8077F0D3-3FCC-44BF-8AB3-DF1A105CC798}.Release|Any CPU.Build.0 = Release|Any CPU
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE

 WebApi/IStation.Application.Core/1-dispatch/1-solution/DispatchSolution_Controller.cs

@@ -1,10 +1,4 @@
using Microsoft.AspNetCore.Authorization;
using System.Net.WebSockets;
using System.Text;
using Yw.Application;
using Yw.Newtonsoft;

namespace IStation.Application
namespace IStation.Application
{
    /// <summary>
    /// è°ƒåº¦æ–¹æ¡ˆ
@@ -33,7 +27,7 @@
            if (scadaOutput == null || scadaOutput.Scadas == null)
            {
                Log.Info(flowId, "Scada:数据获取失败，调度终止!");
                throw YOops.Oh(eResultCode.Error, ErrorCodes.L001, "Scada:数据获取失败，调度终止!");
                throw YOops.Oh(eResultCode.Error, InternalErrorCodes.L001, "Scada:数据获取失败，调度终止!");
            }

            return TempOutHelper.GetDispatchSolutionOutput(input.FlowId);

 WebApi/IStation.Application.Core/GlobalUsings.cs

@@ -1,4 +1,11 @@
global using Furion.DynamicApiController;
global using Mapster;
global using Microsoft.AspNetCore.Authorization;
global using Microsoft.AspNetCore.Mvc;
global using System.ComponentModel.DataAnnotations;
global using System.Net.WebSockets;
global using System.Text;
global using Yw;
global using Yw.Application;
global using Yw.Dto;


 WebApi/IStation.Application.Core/IStation.Application.Core.csproj

@@ -47,7 +47,7 @@
    </ItemGroup>

    <ItemGroup>
        <PackageReference Include="Yw.Application.Core" Version="1.3.8" />
        <PackageReference Include="Yw.Application.Core" Version="3.0.5" />
        <PackageReference Include="Yw.Quartz.Core" Version="1.0.0" />
    </ItemGroup>


 WebApi/IStation.Server/Program.cs

@@ -1,8 +1,8 @@
// See https://aka.ms/new-console-template for more information


using Yw;
using IStation.Server;
using Yw;




 WebApi/IStation.Service.Core/2-model/2-product/paras/1-ji_beng/EnginePump.cs

@@ -1,6 +1,4 @@
using Yw.Model;

namespace IStation.Model
namespace IStation.Model
{
    /// <summary>
    /// æœºæ³µ

 WebApi/IStation.Service.Core/2-model/2-product/paras/2-dian_ji/Motor.cs

@@ -1,6 +1,4 @@
using Yw.Model;

namespace IStation.Model
namespace IStation.Model
{
    /// <summary>
    /// ç”µæœº

 WebApi/IStation.Service.Core/2-model/2-product/paras/3-beng/Pump.cs

@@ -1,6 +1,4 @@
using Yw.Model;

namespace IStation.Model
namespace IStation.Model
{
    /// <summary>
    /// æ³µ

 WebApi/IStation.Service.Core/2-model/4-signal_type/SignalType_Model.cs

@@ -1,6 +1,4 @@
using Yw.Model;

namespace IStation.Model
namespace IStation.Model
{
    public partial class SignalType
    {

 WebApi/IStation.Service.Core/2-model/5-monitor/partial/Signal_Model.cs

@@ -1,6 +1,4 @@
using Yw.Model;

namespace IStation.Model
namespace IStation.Model
{
    public partial class Signal
    {

 WebApi/IStation.Service.Core/4-dal/0-core/base/BaseDAL.cs

@@ -1,4 +1,4 @@
using Yw.AutoMapper;
using Yw;
using Yw.Entity;

namespace IStation.DAL

 WebApi/IStation.Service.Core/6-service/1-station/Cache/StationCacheHelper.cs

@@ -1,5 +1,4 @@
using IStation.Service;
using Yw;
using Yw;

namespace IStation.Service
{

 WebApi/IStation.Service.Core/6-service/2-product/1-group/Cache/ProductGroupCacheHelper.cs

@@ -1,10 +1,9 @@
using IStation.Service;
using Yw;
using Yw;

namespace IStation.Service
{
    /// <summary>
    /// ProductGroup缓存辅助类
    /// ProductGroup缓存辅助类
    /// </summary>
    internal class ProductGroupCacheHelper
    {
@@ -17,7 +16,7 @@
        }

        /// <summary>
        /// è®¾ç½®ç¼“å­˜
        /// è®¾ç½®ç¼“å­˜
        /// </summary>
        public static void Set(List<Model.ProductGroup> list, int Minites = 30, int RandomSeconds = 0)
        {
@@ -26,7 +25,7 @@
        }

        /// <summary>
        /// æŸ¥è¯¢ç¼“å­˜
        /// æŸ¥è¯¢ç¼“å­˜
        /// </summary>
        public static List<Model.ProductGroup> Get()
        {
@@ -35,7 +34,7 @@
        }

        /// <summary>
        /// æŸ¥è¯¢è®¾ç½®ç¼“å­˜
        /// æŸ¥è¯¢è®¾ç½®ç¼“å­˜
        /// </summary>
        public static List<Model.ProductGroup> GetSet(Func<List<Model.ProductGroup>> func, int Minites = 30, int RandomSeconds = 0)
        {
@@ -44,7 +43,7 @@
        }

        /// <summary>
        /// ç§»é™¤ç¼“å­˜
        /// ç§»é™¤ç¼“å­˜
        /// </summary>
        public static void Remove()
        {
@@ -53,7 +52,7 @@
        }

        /// <summary>
        /// å…¨éƒ¨ç§»é™¤
        /// å…¨éƒ¨ç§»é™¤
        /// </summary>
        public static void RemoveAll()
        {

 WebApi/IStation.Service.Core/6-service/2-product/2-product/Cache/ProductCacheHelper.cs

@@ -1,10 +1,9 @@
using IStation.Service;
using Yw;
using Yw;

namespace IStation.Service
{
    /// <summary>
    /// Product缓存辅助类
    /// Product缓存辅助类
    /// </summary>
    internal class ProductCacheHelper
    {
@@ -17,7 +16,7 @@
        }

        /// <summary>
        /// è®¾ç½®ç¼“å­˜
        /// è®¾ç½®ç¼“å­˜
        /// </summary>
        public static void Set(List<Model.Product> list, int Minites = 30, int RandomSeconds = 0)
        {
@@ -26,7 +25,7 @@
        }

        /// <summary>
        /// æŸ¥è¯¢ç¼“å­˜
        /// æŸ¥è¯¢ç¼“å­˜
        /// </summary>
        public static List<Model.Product> Get()
        {
@@ -35,7 +34,7 @@
        }

        /// <summary>
        /// æŸ¥è¯¢è®¾ç½®ç¼“å­˜
        /// æŸ¥è¯¢è®¾ç½®ç¼“å­˜
        /// </summary>
        public static List<Model.Product> GetSet(Func<List<Model.Product>> func, int Minites = 30, int RandomSeconds = 0)
        {
@@ -44,7 +43,7 @@
        }

        /// <summary>
        /// ç§»é™¤ç¼“å­˜
        /// ç§»é™¤ç¼“å­˜
        /// </summary>
        public static void Remove()
        {
@@ -53,7 +52,7 @@
        }

        /// <summary>
        /// å…¨éƒ¨ç§»é™¤
        /// å…¨éƒ¨ç§»é™¤
        /// </summary>
        public static void RemoveAll()
        {

 WebApi/IStation.Service.Core/6-service/3-pump_curve/1-curve/Cache/PumpCurveCacheHelper.cs

@@ -1,5 +1,4 @@
using IStation.Service;
using Yw;
using Yw;

namespace IStation.Service
{

 WebApi/IStation.Service.Core/6-service/3-pump_curve/2-mapping/Cache/PumpCurveMappingCacheHelper.cs

@@ -1,5 +1,4 @@
using IStation.Service;
using Yw;
using Yw;

namespace IStation.Service
{

 WebApi/IStation.Service.Core/6-service/4-signal_type/1-group/Cache/SignalTypeGroupCacheHelper.cs

@@ -1,5 +1,4 @@
using IStation.Service;
using Yw;
using Yw;

namespace IStation.Service
{

 WebApi/IStation.Service.Core/6-service/4-signal_type/2-type/Cache/SignalTypeCacheHelper.cs

@@ -1,5 +1,4 @@
using IStation.Service;
using Yw;
using Yw;

namespace IStation.Service
{

 WebApi/IStation.Service.Core/6-service/5-monitor/1-group/Cache/MonitorPointGroupCacheHelper.cs

@@ -1,5 +1,4 @@
using IStation.Service;
using Yw;
using Yw;

namespace IStation.Service
{

 WebApi/IStation.Service.Core/6-service/5-monitor/2-point/Cache/MonitorPointCacheHelper.cs

@@ -1,5 +1,4 @@
using IStation.Service;
using Yw;
using Yw;

namespace IStation.Service
{

 WebApi/IStation.Service.Core/6-service/5-monitor/3-signal/Cache/SignalCacheHelper.cs

@@ -1,5 +1,4 @@
using IStation.Service;
using Yw;
using Yw;

namespace IStation.Service
{

 WebApi/IStation.Service.Core/6-service/5-monitor/4-mapping/Cache/MonitorPointMappingCacheHelper.cs

@@ -1,5 +1,4 @@
using IStation.Service;
using Yw;
using Yw;

namespace IStation.Service
{

 WebApi/IStation.Service.Core/7-utils/2-curve/ÎÞÁ¿¸ÙÇúÏß/DimensionlessCurvesHelper.cs

@@ -117,7 +117,7 @@


        //计算(带修正 )
        static public bool CalcPoints(IStation.Model.GroupPoint ratedParas, double n,
        public static bool CalcPoints(IStation.Model.GroupPoint ratedParas, double n,
           ref List<IStation.Model.CurvePoint> pointsQH,
           ref List<IStation.Model.CurvePoint> pointsQE,
           ref List<IStation.Model.CurvePoint> pointsQP,
@@ -194,7 +194,7 @@
            return true;
        }

        static private List<IStation.Model.CurvePoint> GetMoveBSP(double maxEtaQ_old, double maxEtaQ_new, List<IStation.Model.CurvePoint> points_curve_old)
        private static List<IStation.Model.CurvePoint> GetMoveBSP(double maxEtaQ_old, double maxEtaQ_new, List<IStation.Model.CurvePoint> points_curve_old)
        {
            List<IStation.Model.CurvePoint> points_new = new List<IStation.Model.CurvePoint>();

@@ -238,7 +238,7 @@
        }


        static public bool CalcPoints(IStation.Model.GroupPoint ratedParas, double n,
        public static bool CalcPoints(IStation.Model.GroupPoint ratedParas, double n,
            ref List<IStation.Model.GroupPoint> correctPoints, bool isSxp, int stageNumber)
        {
            List<IStation.Model.CurvePoint> pointsQH = null;
@@ -267,7 +267,7 @@
        }

        //计算(带修正)
        static public bool CalcPoints(IStation.Model.GroupPoint ratedParas, double n, double? K0,
        public static bool CalcPoints(IStation.Model.GroupPoint ratedParas, double n, double? K0,
   ref List<IStation.Model.CurvePoint> pointsQH,
   ref List<IStation.Model.CurvePoint> pointsQE,
   ref List<IStation.Model.CurvePoint> pointsQP,

 WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏß×ø±ê²ÎÊý/CurveCoordinateParas.cs

@@ -1,6 +1,4 @@
using Yw.Model;

namespace IStation.Model
namespace IStation.Model
{
    /// <summary>
    /// æ›²çº¿åæ ‡å‚æ•°

 WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏß±í´ïʽ/CurveExpressStartLine.cs

@@ -204,7 +204,7 @@

        }

        public new static CurveExpressStartLine ToParameter(List<IStation.Model.CurvePoint> pointInfoNPSH)
        public static new CurveExpressStartLine ToParameter(List<IStation.Model.CurvePoint> pointInfoNPSH)
        {
            if (pointInfoNPSH == null || pointInfoNPSH.Count < 3)
                return null;
@@ -227,7 +227,7 @@
            }
        }

        public new static CurveExpressStartLine ToParameter(List<IStation.Model.CurvePoint> pointInfoNPSH, IStation.Model.eCurveFitType fitType)
        public static new CurveExpressStartLine ToParameter(List<IStation.Model.CurvePoint> pointInfoNPSH, IStation.Model.eCurveFitType fitType)
        {
            if (pointInfoNPSH == null || pointInfoNPSH.Count < 3)
                return null;
@@ -306,7 +306,7 @@
        {
            return ToDsString(this);
        }
        public new static string ToDsString(List<IStation.Model.CurvePoint> points)
        public static new string ToDsString(List<IStation.Model.CurvePoint> points)
        {
            if (points == null || points.Count < 3)
                return null;
@@ -352,7 +352,7 @@

        }

        public new static CurveExpressStartLine ToParameter(string strExpress)
        public static new CurveExpressStartLine ToParameter(string strExpress)
        {
            if (string.IsNullOrEmpty(strExpress))
                return null;

 WebApi/IStation.Service.Core/7-utils/3-epanet/DLL/EpanetMethods.cs

@@ -1,6 +1,5 @@
using IStation.Epanet.Enums;
using System.Runtime.InteropServices;
using System.Text;

namespace IStation.Epanet
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Enums/EnumsTxt.cs

@@ -1,5 +1,4 @@
using IStation.Epanet.Util;
using System;
using IStation.Epanet.Util;

namespace IStation.Epanet.Enums
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Enums/Error.cs

@@ -1,5 +1,4 @@
using System;
using System.Reflection;
using System.Reflection;

namespace IStation.Epanet.Enums
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Enums/ErrorAttribute.cs

@@ -1,6 +1,4 @@
using System;

namespace IStation.Epanet.Enums
namespace IStation.Epanet.Enums
{
    internal sealed class ErrorAttribute : Attribute
    {

 WebApi/IStation.Service.Core/7-utils/3-epanet/Enums/KeywordAttribute.cs

@@ -1,6 +1,4 @@
using System;

namespace IStation.Epanet.Enums
namespace IStation.Epanet.Enums
{
    internal sealed class KeywordAttribute : Attribute
    {

 WebApi/IStation.Service.Core/7-utils/3-epanet/Enums/Keywords.cs

@@ -1,5 +1,4 @@
using System;
using System.Reflection;
using System.Reflection;

namespace IStation.Epanet.Enums
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Hydraulic/HydraulicAnalysisHelper.cs

@@ -1,6 +1,4 @@
using IStation.Epanet.Enums;

namespace IStation.Epanet.Analysis
namespace IStation.Epanet.Analysis
{
    /// <summary>
    /// 

 WebApi/IStation.Service.Core/7-utils/3-epanet/Hydraulic/Input/Input.cs

@@ -1,7 +1,4 @@
using System.Collections.Generic;
using System.Linq;

namespace IStation.Epanet.Analysis
namespace IStation.Epanet.Analysis
{
    public class Input
    {

 WebApi/IStation.Service.Core/7-utils/3-epanet/Hydraulic/Input/InputLink.cs

@@ -1,5 +1,4 @@
using IStation.Epanet.Enums;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;

namespace IStation.Epanet.Analysis
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Hydraulic/Out/OutLink.cs

@@ -1,5 +1,4 @@
using IStation.Epanet.Enums;
using System;
using System.ComponentModel.DataAnnotations;

namespace IStation.Epanet.Analysis

 WebApi/IStation.Service.Core/7-utils/3-epanet/Hydraulic/Out/OutNode.cs

@@ -1,5 +1,4 @@
using IStation.Epanet.Enums;
using System;
using System.ComponentModel.DataAnnotations;

namespace IStation.Epanet.Analysis

 WebApi/IStation.Service.Core/7-utils/3-epanet/Hydraulic/Out/Output.cs

@@ -1,7 +1,4 @@
using System.Collections.Generic;
using System.Linq;

namespace IStation.Epanet.Analysis
namespace IStation.Epanet.Analysis
{
    public class Output
    {

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/ElementCollection.cs

@@ -1,5 +1,4 @@
using IStation.Epanet.Network.Structures;
using System;
using System.Collections.ObjectModel;

namespace IStation.Epanet.Network

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Exception/ENException.cs

@@ -1,5 +1,4 @@
using IStation.Epanet.Enums;
using System;
using IStation.Epanet.Enums;

namespace IStation.Epanet
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Exception/InputException.cs

@@ -1,5 +1,4 @@
using IStation.Epanet.Enums;
using System;

namespace IStation.Epanet.Network.IO
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/FieldsMap.cs

@@ -1,7 +1,5 @@
using IStation.Epanet.Enums;
using IStation.Epanet.Enums;
using IStation.Epanet.Network.Structures;
using System;
using System.Collections.Generic;
using System.Diagnostics;

namespace IStation.Epanet.Network

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Helpers/NetworkHelper.cs

@@ -1,7 +1,5 @@
using IStation.Epanet.Network.IO.Input;
using IStation.Epanet.Network.IO.Output;
using System;
using System.IO;
using EpanetNetwork = IStation.Epanet.Network.Network;

namespace IStation.Epanet

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/IO/Input/InpParser.cs

@@ -1,11 +1,7 @@
using IStation.Epanet.Enums;
using IStation.Epanet.Enums;
using IStation.Epanet.Log;
using IStation.Epanet.Network.Structures;
using IStation.Epanet.Util;
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;

namespace IStation.Epanet.Network.IO.Input
{
@@ -46,7 +42,7 @@
                using (FileStream fs = File.OpenRead(fileName))
                {
                    //Parse demands and time patterns first
                    //首先解析需求和时间模式
                    //首先解析需求和时间模式
                    ParsePc(fs);
                    fs.Position = 0;
                    Parse(fs);

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/IO/Input/InputParser.cs

@@ -1,11 +1,8 @@
using IStation.Epanet.Enums;
using IStation.Epanet.Enums;
using IStation.Epanet.Log;
using IStation.Epanet.Network.Structures;
using IStation.Epanet.Util;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Text;

namespace IStation.Epanet.Network.IO.Input
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/IO/Input/NetParser.cs

@@ -2,12 +2,8 @@
using IStation.Epanet.Log;
using IStation.Epanet.Network.Structures;
using IStation.Epanet.Util;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Text;

namespace IStation.Epanet.Network.IO.Input
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/IO/Input/XMLParser.cs

@@ -1,7 +1,5 @@
using IStation.Epanet.Enums;
using IStation.Epanet.Enums;
using IStation.Epanet.Network.Structures;
using System;
using System.IO;
using System.IO.Compression;
using System.Xml;


 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/IO/Output/InpComposer.cs

@@ -1,10 +1,6 @@
using IStation.Epanet.Enums;
using IStation.Epanet.Enums;
using IStation.Epanet.Network.Structures;
using IStation.Epanet.Util;
using System;
using System.IO;
using System.Linq;
using System.Text;

namespace IStation.Epanet.Network.IO.Output
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Network.cs

@@ -1,4 +1,4 @@
/*
/*
 * Copyright (C) 2016 Vyacheslav Shevelyov (slavash at aha dot ru)
 *
 * This program is free software: you can redistribute it and/or modify
@@ -17,9 +17,6 @@

using IStation.Epanet.Enums;
using IStation.Epanet.Network.Structures;
using System;
using System.Collections.Generic;
using System.Linq;

namespace IStation.Epanet.Network
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Control.cs

@@ -1,5 +1,4 @@
using IStation.Epanet.Enums;
using System;
using IStation.Epanet.Enums;

namespace IStation.Epanet.Network.Structures
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Curve.cs

@@ -1,7 +1,5 @@
using IStation.Epanet.Enums;
using System;
using IStation.Epanet.Enums;
using System.Collections;
using System.Collections.Generic;

namespace IStation.Epanet.Network.Structures
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Element.cs

@@ -1,6 +1,4 @@
using System;

namespace IStation.Epanet.Network.Structures
namespace IStation.Epanet.Network.Structures
{

    public enum ElementType { NODE, LINK, PATTERN, CURVE, CONTROL, RULE }

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/EnPoint.cs

@@ -1,5 +1,4 @@
using IStation.Epanet.Util;
using System;
using IStation.Epanet.Util;

namespace IStation.Epanet.Network.Structures
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Junction.cs

@@ -1,5 +1,4 @@
using IStation.Epanet.Enums;
using System;

namespace IStation.Epanet.Network.Structures
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Link.cs

@@ -1,6 +1,4 @@
using IStation.Epanet.Enums;
using System;
using System.Collections.Generic;
using IStation.Epanet.Enums;

namespace IStation.Epanet.Network.Structures
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Node.cs

@@ -1,5 +1,4 @@
using IStation.Epanet.Enums;
using System.Collections.Generic;
using IStation.Epanet.Enums;

namespace IStation.Epanet.Network.Structures
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Pattern.cs

@@ -1,5 +1,4 @@
using System.Collections;
using System.Collections.Generic;
using System.Collections;
using System.Diagnostics;

namespace IStation.Epanet.Network.Structures

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Pipe.cs

@@ -1,5 +1,4 @@
using IStation.Epanet.Enums;
using System;

namespace IStation.Epanet.Network.Structures
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Pump.cs

@@ -1,5 +1,4 @@
using IStation.Epanet.Enums;
using System;
using IStation.Epanet.Enums;

namespace IStation.Epanet.Network.Structures
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Rule.cs

@@ -1,6 +1,4 @@
using System.Collections.Generic;

namespace IStation.Epanet.Network.Structures
namespace IStation.Epanet.Network.Structures
{

    ///<summary>Rule source code class.</summary>

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Tank.cs

@@ -1,5 +1,4 @@
using IStation.Epanet.Enums;
using System;
using IStation.Epanet.Enums;

namespace IStation.Epanet.Network.Structures
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Valve.cs

@@ -1,5 +1,4 @@
using IStation.Epanet.Enums;
using System;
using IStation.Epanet.Enums;

namespace IStation.Epanet.Network.Structures
{

 WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Util/Utilities.cs

@@ -1,4 +1,4 @@
/*
/*
 * Copyright (C) 2016 Vyacheslav Shevelyov (slavash at aha dot ru)
 *
 * This program is free software: you can redistribute it and/or modify
@@ -16,8 +16,6 @@
 */

using IStation.Epanet.Enums;
using System;
using System.Collections.Generic;
using System.Globalization;

namespace IStation.Epanet.Util

 WebApi/IStation.Service.Core/GlobalUsings.cs

@@ -1,4 +1,5 @@
global using SqlSugar;
global using System.Text;
global using Yw.Newtonsoft;
global using Yw.Untity;
global using System.Text;
global using IStation.Epanet.Enums;
global using Yw;

 WebApi/IStation.Service.Core/IStation.Service.Core.csproj

@@ -37,7 +37,7 @@
        <PackageReference Include="Yw.DynamicExpresso.Core" Version="1.0.0" />
        <PackageReference Include="Yw.RabbitMq.Core" Version="1.0.0" />
        <PackageReference Include="Yw.Redis.Core" Version="1.0.2" />
        <PackageReference Include="Yw.Service.Core" Version="1.1.6" />
        <PackageReference Include="Yw.Service.Core" Version="3.0.2" />
        <PackageReference Include="Yw.Yitter.Core" Version="1.0.0" />
    </ItemGroup>