添加坐标

tangxu

2023-12-01 394d05e64b6742a3a9a1862896cebd65e5cdbc33

添加坐标

 Yw.Application.Curve.Core/1-pump-curve/1-mgr/dto/PumpCurveDto.cs

@@ -54,7 +54,7 @@
        /// <summary>
        /// 坐标参数
        /// </summary>
        public Dictionary<string, string> CoordParas { get; set; }
        public   string  CoordParas { get; set; }

        /// <summary>
        /// 曲线表达式

 Yw.Application.Curve.Core/3-pump-curve-extension/1-mgr/dto/PumpCurveExMappingDto.cs

@@ -75,7 +75,7 @@
        /// <summary>
        /// 坐标参数
        /// </summary>
        public Dictionary<string, string> CoordParas { get; set; }
        public  string  CoordParas { get; set; }

        /// <summary>
        /// 曲线表达式

 Yw.Application.Curve.Core/Yw.Application.Curve.Core.csproj

@@ -41,11 +41,15 @@
  <ItemGroup>
    <PackageReference Include="Yw.Application.Core" Version="1.2.7" />
    <PackageReference Include="Yw.Quartz.Core" Version="1.0.0" />
    <PackageReference Include="Yw.Service.Curve.Core" Version="1.0.6" />
  </ItemGroup>

  <ItemGroup>
    <Folder Include="2-pump-curve-mapping\2-std\" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\Yw.Coordinate\Yw.Coordinate.csproj" />
    <ProjectReference Include="..\Yw.Service.Curve.Core\Yw.Service.Curve.Core.csproj" />
  </ItemGroup>

</Project>

 Yw.Curve.Core.sln

@@ -13,6 +13,8 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yw.Entry.Curve.Core", "Yw.Entry.Curve.Core\Yw.Entry.Curve.Core.csproj", "{7F9D6EB3-52FC-4E78-960C-CD6F726D0172}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yw.Coordinate", "Yw.Coordinate\Yw.Coordinate.csproj", "{3EA3B1DA-2041-483A-9DDB-32A20377222E}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@
        {7F9D6EB3-52FC-4E78-960C-CD6F726D0172}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {7F9D6EB3-52FC-4E78-960C-CD6F726D0172}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {7F9D6EB3-52FC-4E78-960C-CD6F726D0172}.Release|Any CPU.Build.0 = Release|Any CPU
        {3EA3B1DA-2041-483A-9DDB-32A20377222E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {3EA3B1DA-2041-483A-9DDB-32A20377222E}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {3EA3B1DA-2041-483A-9DDB-32A20377222E}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {3EA3B1DA-2041-483A-9DDB-32A20377222E}.Release|Any CPU.Build.0 = Release|Any CPU
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE

 Yw.Service.Curve.Core/2-model/1-pump/PumpCurve.cs

@@ -30,6 +30,7 @@
            this.UpdateUserID = rhs.UpdateUserID;
            this.UpdateUserName = rhs.UpdateUserName;
            this.Description = rhs.Description;
             
        }

        /// <summary>
@@ -72,7 +73,7 @@
        /// <summary>
        /// 坐标参数
        /// </summary>
        public Dictionary<string, string> CoordParas { get; set; }
        public  string  CoordParas { get; set; }

        /// <summary>
        /// 曲线信息

 Yw.Service.Curve.Core/5-service/1-pump-curve/PumpCurve.cs

@@ -95,9 +95,10 @@
        public Model.PumpCurve GetByID(long ID)
        {
            var all = GetAll();
            return all.Find(x => x.ID == ID);
            return  all.Find(x => x.ID == ID);
 
        }

 
        /// <summary>
        /// 通过 ID 获取
        /// </summary>

 Yw.Service.Curve.Core/5-service/1-pump-curve/PumpCurve_Instance.cs

@@ -34,7 +34,7 @@
            if (model == null)
                return default;
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.PumpCurve, Entity.PumpCurve>()
            .ForMember(d => d.CoordParas, opt => opt.MapFrom(src => ParasHelper.ToString(src.CoordParas)))
            //.ForMember(d => d.CoordParas, opt => opt.MapFrom(src => ParasHelper.ToString(src.CoordParas)))
            .ForMember(d => d.CurveInfo, opt => opt.MapFrom(src => src.CurveInfo == null ? null : src.CurveInfo.ToJson())))
            .CreateMapper();
            var entity = mapper.Map<Model.PumpCurve, Entity.PumpCurve>(model);
@@ -47,7 +47,7 @@
            if (models == null || models.Count < 1)
                return default;
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.PumpCurve, Entity.PumpCurve>()
            .ForMember(d => d.CoordParas, opt => opt.MapFrom(src => ParasHelper.ToString(src.CoordParas)))
            //.ForMember(d => d.CoordParas, opt => opt.MapFrom(src => ParasHelper.ToString(src.CoordParas)))
            .ForMember(d => d.CurveInfo, opt => opt.MapFrom(src => src.CurveInfo == null ? null : src.CurveInfo.ToJson())))
            .CreateMapper();
            var entities = mapper.Map<List<Model.PumpCurve>, List<Entity.PumpCurve>>(models);
@@ -60,7 +60,7 @@
            if (model == null || entity == null)
                return;
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.PumpCurve, Entity.PumpCurve>()
            .ForMember(d => d.CoordParas, opt => opt.MapFrom(src => ParasHelper.ToString(src.CoordParas)))
            //.ForMember(d => d.CoordParas, opt => opt.MapFrom(src => ParasHelper.ToString(src.CoordParas)))
            .ForMember(d => d.CurveInfo, opt => opt.MapFrom(src => src.CurveInfo == null ? null : src.CurveInfo.ToJson())))
            .CreateMapper();
            mapper.Map(model, entity);

 Yw.Service.Curve.Core/Yw.Service.Curve.Core.csproj

@@ -27,7 +27,6 @@
    </ItemGroup>

    <ItemGroup>
      <PackageReference Include="Yw.CurveBase.Core" Version="1.0.1" />
      <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.1" />
@@ -35,6 +34,10 @@
    </ItemGroup>

    <ItemGroup>
      <ProjectReference Include="..\Yw.Coordinate\Yw.Coordinate.csproj" />
    </ItemGroup>

    <ItemGroup>
        <Content Update="C:\Users\admin\.nuget\packages\yw.memorycache.core\1.1.0\contentFiles\any\net6.0\paras_memory_cache_settings.json">
            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
        </Content>