From 594b3d1a2fa051d1aa8c3da15cbdff6195dbbfc5 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期五, 19 八月 2022 13:49:54 +0800
Subject: [PATCH] 增加泵曲线可信度更新 接口
---
Application/IStation.Application4Product/pump_curve/_/PumpCurve_Controller.cs | 12 +++++
Application/IStation.Application4Product/pump_curve/_/dto/UpdatePumpCurveInput.cs | 5 ++
Application/IStation.Application4Product/config/Mapper.cs | 2
Application/IStation.Application4Product/pump_curve/_/dto/PumpCurveDto.cs | 5 ++
Model/IStation.Model4Curve/曲线坐标参数/CurveCoordinateParas_Disp.cs | 8 ++--
DAL/IStation.DAL4Product/pump_curve/PumpCurve.cs | 15 +++++++
Application/IStation.Application4Product/pump_curve/_/dto/UpdateCurveReliabilityStatus.cs | 30 +++++++++++++++
Service/IStation.Service4Product/pump_curve/pump_curve/PumpCurve.cs | 16 ++++++++
Entry/IStation.WebApi.Entry/IStation.WebApi.Entry.csproj.user | 2
Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user | 4 +-
10 files changed, 90 insertions(+), 9 deletions(-)
diff --git a/Application/IStation.Application4Product/config/Mapper.cs b/Application/IStation.Application4Product/config/Mapper.cs
index e1915bd..051baae 100644
--- a/Application/IStation.Application4Product/config/Mapper.cs
+++ b/Application/IStation.Application4Product/config/Mapper.cs
@@ -226,7 +226,7 @@
config.ForType<Model.PumpCurve, PumpCurveDto>()
.Map(dest => dest.CoordParas, src => src.CoordParas)
.Map(dest => dest.CurveInfo, src => src.CurveInfo)
- .Map(dest => dest.PointInfo, src => src.PointInfo);
+ .Map(dest => dest.PointInfo, src => src.PointInfo)
#endregion
diff --git a/Application/IStation.Application4Product/pump_curve/_/PumpCurve_Controller.cs b/Application/IStation.Application4Product/pump_curve/_/PumpCurve_Controller.cs
index 3231a3c..4b0cd8c 100644
--- a/Application/IStation.Application4Product/pump_curve/_/PumpCurve_Controller.cs
+++ b/Application/IStation.Application4Product/pump_curve/_/PumpCurve_Controller.cs
@@ -209,10 +209,20 @@
[HttpPut]
public bool UpdateCoordParas(UpdateCurveCoordParasInput input)
{
- var bol = _service.UpdatePointInfo(input.CorpID, input.ID, input.CoordParas?.ToJson(), UserManager.UserID, DateTime.Now);
+ var bol = _service.UpdateCoordParas(input.CorpID, input.ID, input.CoordParas?.ToJson(), UserManager.UserID, DateTime.Now);
return bol;
}
+ /// <summary>
+ /// 更新可信度
+ /// </summary>
+ [Route("UpdateReliabilityStatus@V1.0")]
+ [HttpPut]
+ public bool UpdateReliabilityStatus(UpdateCurveReliabilityStatus input)
+ {
+ var bol = _service.UpdateReliabilityStatus(input.CorpID, input.ID, (int)input.ReliabilityStatus, UserManager.UserID, DateTime.Now);
+ return bol;
+ }
#endregion
diff --git a/Application/IStation.Application4Product/pump_curve/_/dto/PumpCurveDto.cs b/Application/IStation.Application4Product/pump_curve/_/dto/PumpCurveDto.cs
index c9069f5..1c81b44 100644
--- a/Application/IStation.Application4Product/pump_curve/_/dto/PumpCurveDto.cs
+++ b/Application/IStation.Application4Product/pump_curve/_/dto/PumpCurveDto.cs
@@ -51,6 +51,11 @@
/// 鐐逛俊鎭�
/// </summary>
public SingleCurvePointListGroup PointInfo { get; set; }
+
+ /// <summary>
+ /// 鍙俊搴�
+ /// </summary>
+ public PumpCurve.eReliabilityStatus ReliabilityStatus { get; set; }
/// <summary>
/// 澶囨敞璇存槑
diff --git a/Application/IStation.Application4Product/pump_curve/_/dto/UpdateCurveReliabilityStatus.cs b/Application/IStation.Application4Product/pump_curve/_/dto/UpdateCurveReliabilityStatus.cs
new file mode 100644
index 0000000..5bdbab2
--- /dev/null
+++ b/Application/IStation.Application4Product/pump_curve/_/dto/UpdateCurveReliabilityStatus.cs
@@ -0,0 +1,30 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IStation.Application
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class UpdateCurveReliabilityStatus
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public long ID { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public long CorpID { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public Model.PumpCurve.eReliabilityStatus ReliabilityStatus { get; set; }
+
+ }
+}
diff --git a/Application/IStation.Application4Product/pump_curve/_/dto/UpdatePumpCurveInput.cs b/Application/IStation.Application4Product/pump_curve/_/dto/UpdatePumpCurveInput.cs
index 361a1f6..612df03 100644
--- a/Application/IStation.Application4Product/pump_curve/_/dto/UpdatePumpCurveInput.cs
+++ b/Application/IStation.Application4Product/pump_curve/_/dto/UpdatePumpCurveInput.cs
@@ -53,6 +53,11 @@
public SingleCurvePointListGroup PointInfo { get; set; }
/// <summary>
+ /// 鍙俊搴�
+ /// </summary>
+ public PumpCurve.eReliabilityStatus ReliabilityStatus { get; set; }
+
+ /// <summary>
/// 澶囨敞璇存槑
/// </summary>
public string Description { get; set; }
diff --git a/DAL/IStation.DAL4Product/pump_curve/PumpCurve.cs b/DAL/IStation.DAL4Product/pump_curve/PumpCurve.cs
index 38c1141..17a77cf 100644
--- a/DAL/IStation.DAL4Product/pump_curve/PumpCurve.cs
+++ b/DAL/IStation.DAL4Product/pump_curve/PumpCurve.cs
@@ -115,6 +115,21 @@
}
/// <summary>
+ /// 鏇存柊鍙俊搴�
+ /// </summary>
+ public bool UpdateReliabilityStatus(long CorpID, long ID, int ReliabilityStatus, long UpdateUserID, DateTime UpdateTime)
+ {
+ using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
+ {
+ return db.Updateable<Entity.PumpCurve>()
+ .SetColumns(x => x.ReliabilityStatus == ReliabilityStatus)
+ .SetColumns(x => x.UpdateUserID == UpdateUserID)
+ .SetColumns(x => x.UpdateTime == UpdateTime)
+ .Where(x => x.CorpID == CorpID && x.ID == ID).ExecuteCommand() > 0;
+ }
+ }
+
+ /// <summary>
/// 閫氳繃 ID 鍒犻櫎 鍚屾椂鍒犻櫎鏄犲皠
/// </summary>
public bool DeleteWithMappingByID(long CorpID, long ID)
diff --git a/Entry/IStation.WebApi.Entry/IStation.WebApi.Entry.csproj.user b/Entry/IStation.WebApi.Entry/IStation.WebApi.Entry.csproj.user
index 2e407a6..2b11135 100644
--- a/Entry/IStation.WebApi.Entry/IStation.WebApi.Entry.csproj.user
+++ b/Entry/IStation.WebApi.Entry/IStation.WebApi.Entry.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\WorkData\git\istation\webapi\v4\Entry\IStation.WebApi.Entry\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\WorkData\IStation\IStationV4.1\Core\Service.V4.1\Entry\IStation.WebApi.Entry\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ActiveDebugProfile>IIS Express</ActiveDebugProfile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user b/Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
index c7a587b..0103290 100644
--- a/Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project>
<PropertyGroup>
- <_PublishTargetUrl>D:\WorkData\git\istation\webapi\v4\Entry\IStation.WebApi.Entry\bin\Release\net6.0\publish\</_PublishTargetUrl>
- <History>True|2022-08-18T08:31:26.4673400Z;True|2022-08-18T10:37:50.8776926+08:00;True|2022-08-17T17:10:09.3527873+08:00;True|2022-08-17T16:04:30.4487827+08:00;True|2022-08-15T13:35:48.4976973+08:00;True|2022-08-15T13:35:34.4046702+08:00;True|2022-08-15T13:31:44.3380038+08:00;True|2022-08-15T13:07:03.2183172+08:00;True|2022-07-25T15:14:36.3659352+08:00;True|2022-07-25T15:10:01.3426246+08:00;True|2022-07-25T13:20:08.1574461+08:00;True|2022-07-19T10:26:17.1257582+08:00;True|2022-07-14T10:30:13.1942620+08:00;True|2022-07-13T14:35:30.0524912+08:00;True|2022-07-08T14:32:42.4327635+08:00;True|2022-07-05T11:08:07.0982998+08:00;True|2022-07-04T10:33:11.4756479+08:00;True|2022-07-01T22:05:04.4907981+08:00;True|2022-07-01T15:57:41.6399584+08:00;True|2022-06-29T10:33:01.2518877+08:00;True|2022-06-29T09:35:04.8176716+08:00;True|2022-06-22T10:29:08.8189250+08:00;True|2022-06-21T20:20:26.7306581+08:00;True|2022-06-21T09:54:59.2174617+08:00;True|2022-06-20T16:05:34.5414017+08:00;True|2022-06-16T13:17:09.9717924+08:00;True|2022-06-16T09:40:45.1175998+08:00;True|2022-06-15T18:01:54.0267150+08:00;False|2022-06-15T18:00:46.8407587+08:00;True|2022-06-15T15:22:18.3048191+08:00;True|2022-06-15T14:10:37.0479735+08:00;False|2022-06-15T14:08:52.7287625+08:00;True|2022-06-15T11:52:36.3090013+08:00;True|2022-06-15T10:29:17.8467709+08:00;True|2022-06-15T09:53:07.0983926+08:00;False|2022-06-15T09:51:02.1269263+08:00;True|2022-06-14T16:42:04.7964854+08:00;True|2022-06-14T14:08:49.4227432+08:00;True|2022-06-14T14:04:00.9153594+08:00;True|2022-06-13T14:57:09.1986107+08:00;True|2022-06-12T10:12:40.2143903+08:00;True|2022-06-12T09:59:01.3527438+08:00;True|2022-06-09T17:47:54.0302121+08:00;True|2022-06-09T17:30:21.7998171+08:00;True|2022-06-09T13:53:49.3251173+08:00;True|2022-06-09T11:06:42.0691794+08:00;True|2022-06-09T10:24:37.1232972+08:00;True|2022-06-09T10:00:30.4180885+08:00;True|2022-06-08T16:55:14.5816280+08:00;True|2022-06-08T16:02:29.3874857+08:00;True|2022-06-08T13:37:33.4098629+08:00;True|2022-06-08T11:05:09.3848401+08:00;True|2022-06-08T10:21:11.6630897+08:00;True|2022-06-08T09:38:48.6605705+08:00;True|2022-06-08T09:38:12.5509843+08:00;True|2022-06-08T09:37:38.2420697+08:00;True|2022-06-08T09:33:06.1943764+08:00;True|2022-06-07T17:26:45.0216506+08:00;True|2022-06-07T17:15:13.6540984+08:00;True|2022-06-07T13:30:54.6796254+08:00;True|2022-06-06T17:33:50.9010674+08:00;True|2022-06-06T17:32:21.9276179+08:00;True|2022-06-06T15:59:31.7116819+08:00;True|2022-06-06T15:29:18.4459191+08:00;True|2022-06-06T14:17:56.0946686+08:00;True|2022-06-02T09:13:02.9635258+08:00;True|2022-06-01T17:15:47.4170975+08:00;True|2022-06-01T14:06:29.6241464+08:00;True|2022-06-01T13:27:18.8319582+08:00;True|2022-06-01T13:14:07.7862232+08:00;True|2022-06-01T09:48:16.4577267+08:00;True|2022-05-30T09:57:00.6017913+08:00;True|2022-05-28T15:54:16.3134700+08:00;True|2022-05-28T11:46:55.8201686+08:00;True|2022-05-28T00:40:34.8169520+08:00;True|2022-05-27T20:45:57.0931886+08:00;True|2022-05-27T20:45:18.6248676+08:00;True|2022-05-27T14:19:14.0927561+08:00;True|2022-05-26T16:52:59.8936895+08:00;True|2022-05-26T13:53:53.4391535+08:00;True|2022-05-25T14:49:54.5116623+08:00;True|2022-05-25T14:23:38.7752497+08:00;True|2022-05-18T00:26:56.5524482+08:00;True|2022-05-17T12:08:45.5933704+08:00;True|2022-05-17T02:14:04.9500075+08:00;True|2022-05-16T12:01:40.6872993+08:00;True|2022-05-12T10:27:07.2614929+08:00;True|2022-05-11T11:02:55.5830630+08:00;True|2022-05-11T10:00:40.6549316+08:00;True|2022-05-11T09:20:32.0973524+08:00;</History>
+ <_PublishTargetUrl>D:\WorkData\IStation\IStationV4.1\Core\Service.V4.1\Entry\IStation.WebApi.Entry\bin\Release\net6.0\publish\</_PublishTargetUrl>
+ <History>True|2022-08-19T03:51:17.0556654Z;True|2022-08-19T11:45:03.9834334+08:00;True|2022-08-19T10:56:27.1184994+08:00;True|2022-08-18T16:31:26.4673400+08:00;True|2022-08-18T10:37:50.8776926+08:00;True|2022-08-17T17:10:09.3527873+08:00;True|2022-08-17T16:04:30.4487827+08:00;True|2022-08-15T13:35:48.4976973+08:00;True|2022-08-15T13:35:34.4046702+08:00;True|2022-08-15T13:31:44.3380038+08:00;True|2022-08-15T13:07:03.2183172+08:00;True|2022-07-25T15:14:36.3659352+08:00;True|2022-07-25T15:10:01.3426246+08:00;True|2022-07-25T13:20:08.1574461+08:00;True|2022-07-19T10:26:17.1257582+08:00;True|2022-07-14T10:30:13.1942620+08:00;True|2022-07-13T14:35:30.0524912+08:00;True|2022-07-08T14:32:42.4327635+08:00;True|2022-07-05T11:08:07.0982998+08:00;True|2022-07-04T10:33:11.4756479+08:00;True|2022-07-01T22:05:04.4907981+08:00;True|2022-07-01T15:57:41.6399584+08:00;True|2022-06-29T10:33:01.2518877+08:00;True|2022-06-29T09:35:04.8176716+08:00;True|2022-06-22T10:29:08.8189250+08:00;True|2022-06-21T20:20:26.7306581+08:00;True|2022-06-21T09:54:59.2174617+08:00;True|2022-06-20T16:05:34.5414017+08:00;True|2022-06-16T13:17:09.9717924+08:00;True|2022-06-16T09:40:45.1175998+08:00;True|2022-06-15T18:01:54.0267150+08:00;False|2022-06-15T18:00:46.8407587+08:00;True|2022-06-15T15:22:18.3048191+08:00;True|2022-06-15T14:10:37.0479735+08:00;False|2022-06-15T14:08:52.7287625+08:00;True|2022-06-15T11:52:36.3090013+08:00;True|2022-06-15T10:29:17.8467709+08:00;True|2022-06-15T09:53:07.0983926+08:00;False|2022-06-15T09:51:02.1269263+08:00;True|2022-06-14T16:42:04.7964854+08:00;True|2022-06-14T14:08:49.4227432+08:00;True|2022-06-14T14:04:00.9153594+08:00;True|2022-06-13T14:57:09.1986107+08:00;True|2022-06-12T10:12:40.2143903+08:00;True|2022-06-12T09:59:01.3527438+08:00;True|2022-06-09T17:47:54.0302121+08:00;True|2022-06-09T17:30:21.7998171+08:00;True|2022-06-09T13:53:49.3251173+08:00;True|2022-06-09T11:06:42.0691794+08:00;True|2022-06-09T10:24:37.1232972+08:00;True|2022-06-09T10:00:30.4180885+08:00;True|2022-06-08T16:55:14.5816280+08:00;True|2022-06-08T16:02:29.3874857+08:00;True|2022-06-08T13:37:33.4098629+08:00;True|2022-06-08T11:05:09.3848401+08:00;True|2022-06-08T10:21:11.6630897+08:00;True|2022-06-08T09:38:48.6605705+08:00;True|2022-06-08T09:38:12.5509843+08:00;True|2022-06-08T09:37:38.2420697+08:00;True|2022-06-08T09:33:06.1943764+08:00;True|2022-06-07T17:26:45.0216506+08:00;True|2022-06-07T17:15:13.6540984+08:00;True|2022-06-07T13:30:54.6796254+08:00;True|2022-06-06T17:33:50.9010674+08:00;True|2022-06-06T17:32:21.9276179+08:00;True|2022-06-06T15:59:31.7116819+08:00;True|2022-06-06T15:29:18.4459191+08:00;True|2022-06-06T14:17:56.0946686+08:00;True|2022-06-02T09:13:02.9635258+08:00;True|2022-06-01T17:15:47.4170975+08:00;True|2022-06-01T14:06:29.6241464+08:00;True|2022-06-01T13:27:18.8319582+08:00;True|2022-06-01T13:14:07.7862232+08:00;True|2022-06-01T09:48:16.4577267+08:00;True|2022-05-30T09:57:00.6017913+08:00;True|2022-05-28T15:54:16.3134700+08:00;True|2022-05-28T11:46:55.8201686+08:00;True|2022-05-28T00:40:34.8169520+08:00;True|2022-05-27T20:45:57.0931886+08:00;True|2022-05-27T20:45:18.6248676+08:00;True|2022-05-27T14:19:14.0927561+08:00;True|2022-05-26T16:52:59.8936895+08:00;True|2022-05-26T13:53:53.4391535+08:00;True|2022-05-25T14:49:54.5116623+08:00;True|2022-05-25T14:23:38.7752497+08:00;True|2022-05-18T00:26:56.5524482+08:00;True|2022-05-17T12:08:45.5933704+08:00;True|2022-05-17T02:14:04.9500075+08:00;True|2022-05-16T12:01:40.6872993+08:00;True|2022-05-12T10:27:07.2614929+08:00;True|2022-05-11T11:02:55.5830630+08:00;True|2022-05-11T10:00:40.6549316+08:00;True|2022-05-11T09:20:32.0973524+08:00;</History>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git "a/Model/IStation.Model4Curve/\346\233\262\347\272\277\345\235\220\346\240\207\345\217\202\346\225\260/CurveCoordinateParas_Disp.cs" "b/Model/IStation.Model4Curve/\346\233\262\347\272\277\345\235\220\346\240\207\345\217\202\346\225\260/CurveCoordinateParas_Disp.cs"
index 78b7452..5bff531 100644
--- "a/Model/IStation.Model4Curve/\346\233\262\347\272\277\345\235\220\346\240\207\345\217\202\346\225\260/CurveCoordinateParas_Disp.cs"
+++ "b/Model/IStation.Model4Curve/\346\233\262\347\272\277\345\235\220\346\240\207\345\217\202\346\225\260/CurveCoordinateParas_Disp.cs"
@@ -414,9 +414,9 @@
if (coordinateParas.StartLineNoP < downGridNum)
{
int diff_num = downGridNum - coordinateParas.StartLineNoP;
- /*coordinateParas.GridNumberY += diff_num;
- coordinateParas.EndLineNoH += diff_num; //鏃т唬鐮� 娌℃湁鎰忎箟
- coordinateParas.StartLineNoH += diff_num;*/
+ coordinateParas.GridNumberY += diff_num; //鏃т唬鐮� 鏈夋剰涔� nsx
+ coordinateParas.EndLineNoH += diff_num; //鏃т唬鐮� 鏈夋剰涔� nsx
+ coordinateParas.StartLineNoH += diff_num; //鏃т唬鐮� 鏈夋剰涔� nsx
coordinateParas.EndLineNoP += diff_num;
coordinateParas.StartLineNoP += diff_num;
}
@@ -523,7 +523,7 @@
}
}
- double optimalSpace = GetOptimalSpace((maxValue - minValue) / (double)spaceNum,true);
+ double optimalSpace = GetOptimalSpace((maxValue - minValue) / (double)spaceNum, true);
maxDisplay = Math.Ceiling(maxValue / optimalSpace) * optimalSpace;
minDisplay = maxDisplay - (double)spaceNum * optimalSpace;
return optimalSpace;
diff --git a/Service/IStation.Service4Product/pump_curve/pump_curve/PumpCurve.cs b/Service/IStation.Service4Product/pump_curve/pump_curve/PumpCurve.cs
index 8464ac8..b94a6bf 100644
--- a/Service/IStation.Service4Product/pump_curve/pump_curve/PumpCurve.cs
+++ b/Service/IStation.Service4Product/pump_curve/pump_curve/PumpCurve.cs
@@ -340,6 +340,22 @@
return bol;
}
+ /// <summary>
+ /// 鏇存柊鍙俊搴�
+ /// </summary>
+ public bool UpdateReliabilityStatus(long CorpID, long ID, int ReliabilityStatus, long UpdateUserID, DateTime UpdateTime)
+ {
+ if (ID < 1)
+ return default;
+ var dal = new DAL.PumpCurve();
+ var bol = dal.UpdateReliabilityStatus(CorpID, ID, ReliabilityStatus, UpdateUserID, UpdateTime);
+ if (bol)
+ {
+ UpdateCorpCache(CorpID, ID);
+ }
+ return bol;
+ }
+
#endregion
#region Delete
--
Gitblit v1.9.3