From 0a48aec6a38d34db6e9194920aac7d2d19cadcb3 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 04 四月 2024 16:22:01 +0800
Subject: [PATCH] 升级更新
---
IStation.Application.SZJT/99-logic/07-dma-analy/DmaAnaly_LogicController.cs | 102 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 89 insertions(+), 13 deletions(-)
diff --git a/IStation.Application.SZJT/99-logic/07-dma-analy/DmaAnaly_LogicController.cs b/IStation.Application.SZJT/99-logic/07-dma-analy/DmaAnaly_LogicController.cs
index 692d953..b341d67 100644
--- a/IStation.Application.SZJT/99-logic/07-dma-analy/DmaAnaly_LogicController.cs
+++ b/IStation.Application.SZJT/99-logic/07-dma-analy/DmaAnaly_LogicController.cs
@@ -72,8 +72,6 @@
}
return vm_list;
-
-
}
#endregion
@@ -90,7 +88,7 @@
var model = new Yw.Service.DmaArea().GetByID(input.ID);
if (model == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
}
var vm = new DmaAnalyAreaDetailDto(model);
@@ -149,7 +147,19 @@
[HttpGet]
public List<DmaAnalyAreaDayStatusDto> GetAreaDayStatusList([FromQuery][Required] QueryDmaAreaDayStatusListInput input)
{
- return default;
+ var vmList = new List<DmaAnalyAreaDayStatusDto>();
+ for (DateTime i = input.StartDay.Date; i <= input.EndDay.Date; i = i.AddDays(1))
+ {
+ var vm = new DmaAnalyAreaDayStatusDto();
+ vm.Day = i;
+ vm.InVol = RandomHelper.Random(4000, 5000);
+ vm.OutVol = RandomHelper.Random(1000, 2000);
+ vm.ReadVol = RandomHelper.Random(2000, 3000);
+ vm.UseVol = vm.InVol - vm.OutVol;
+ vm.LeakRate = null;
+ vmList.Add(vm);
+ }
+ return vmList;
}
/// <summary>
@@ -157,9 +167,36 @@
/// </summary>
[Route("GetAreaMonthStatusList@V1.0")]
[HttpGet]
- public List<DmaAnalyAreaDayStatusDto> GetAreaMonthStatusList([FromQuery][Required] QueryDmaAreaMonthStatusListInput input)
+ public List<DmaAnalyAreaMonthStatusDto> GetAreaMonthStatusList([FromQuery][Required] QueryDmaAreaMonthStatusListInput input)
{
- return default;
+ var vmList = new List<DmaAnalyAreaMonthStatusDto>();
+ for (int i = input.StartYear; i <= input.EndYear; i++)
+ {
+ var min = 1;
+ if (i == input.StartYear)
+ {
+ min = input.StartMonth;
+ }
+ var max = 12;
+ if (i == input.EndYear)
+ {
+ max = input.EndMonth;
+ }
+ for (int j = min; j <= max; j++)
+ {
+ var vm = new DmaAnalyAreaMonthStatusDto();
+ vm.Year = i;
+ vm.Month = j;
+ vm.InVol = RandomHelper.Random(4000, 5000);
+ vm.OutVol = RandomHelper.Random(1000, 2000);
+ vm.ReadVol = RandomHelper.Random(2000, 3000);
+ vm.UseVol = vm.InVol - vm.OutVol;
+ vm.LeakRate = null;
+ vmList.Add(vm);
+ }
+
+ }
+ return vmList;
}
#endregion
@@ -176,7 +213,7 @@
var site = new Yw.Service.DmaSite().GetByID(input.ID);
if (site == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
}
var vm = new DmaAnalySiteDetailDto(site);
@@ -204,7 +241,7 @@
var site = new Yw.Service.DmaSite().GetByID(input.ID);
if (site == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
}
var binding = new Yw.Service.DmaSiteBinding().GetValidBySiteID(site.ID);
if (binding == null)
@@ -264,7 +301,19 @@
[HttpGet]
public List<DmaAnalySiteDayStatusDto> GetSiteDayStatusList([FromQuery][Required] QueryDmaSiteDayStatusListInput input)
{
- return default;
+ var vmList = new List<DmaAnalySiteDayStatusDto>();
+ for (DateTime i = input.StartDay.Date; i <= input.EndDay.Date; i = i.AddDays(1))
+ {
+ var vm = new DmaAnalySiteDayStatusDto();
+ vm.Day = i;
+ vm.Value = RandomHelper.Random(1000, 5000);
+ if (vm.Value > 4000)
+ {
+ vm.Value = null;
+ }
+ vmList.Add(vm);
+ }
+ return vmList;
}
/// <summary>
@@ -272,9 +321,36 @@
/// </summary>
[Route("GetSiteMonthStatusList@V1.0")]
[HttpGet]
- public List<DmaAnalySiteDayStatusDto> GetSiteMonthStatusList([FromQuery][Required] QueryDmaSiteDayStatusListInput input)
+ public List<DmaAnalySiteMonthStatusDto> GetSiteMonthStatusList([FromQuery][Required] QueryDmaSiteMonthStatusListInput input)
{
- return default;
+ var vmList = new List<DmaAnalySiteMonthStatusDto>();
+ for (int i = input.StartYear; i <= input.EndYear; i++)
+ {
+ var min = 1;
+ if (i == input.StartYear)
+ {
+ min = input.StartMonth;
+ }
+ var max = 12;
+ if (i == input.EndYear)
+ {
+ max = input.EndMonth;
+ }
+ for (int j = min; j <= max; j++)
+ {
+ var vm = new DmaAnalySiteMonthStatusDto();
+ vm.Year = i;
+ vm.Month = j;
+ vm.Value = RandomHelper.Random(1000, 5000);
+ if (vm.Value > 4000)
+ {
+ vm.Value = null;
+ }
+ vmList.Add(vm);
+ }
+
+ }
+ return vmList;
}
#endregion
@@ -291,7 +367,7 @@
var catalogList = new Yw.Service.SysCatalog().GetChildAndSelfByCode(IStation.Catalog.FlowMeter);
if (catalogList == null || catalogList.Count < 1)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "娴侀噺璁″垎绫荤紪鐮侀獙璇佸け璐�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "娴侀噺璁″垎绫荤紪鐮侀獙璇佸け璐�");
}
var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();
@@ -399,7 +475,7 @@
var catalogList = new Yw.Service.SysCatalog().GetChildAndSelfByCode(IStation.Catalog.PressMeter);
if (catalogList == null || catalogList.Count < 1)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "鍘嬪姏璁″垎绫荤紪鐮侀獙璇佸け璐�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "鍘嬪姏璁″垎绫荤紪鐮侀獙璇佸け璐�");
}
var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();
--
Gitblit v1.9.3