From 68da658e90864f503d97bc58a2a97f80d8e71065 Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期五, 12 四月 2024 10:52:03 +0800
Subject: [PATCH] 添加众毅 接口日志
---
WebApi/Controllers/PumpRunController.cs | 84 ++++++++++++++++++++++++-----------------
1 files changed, 49 insertions(+), 35 deletions(-)
diff --git a/WebApi/Controllers/PumpRunController.cs b/WebApi/Controllers/PumpRunController.cs
index ed50783..2d593a0 100644
--- a/WebApi/Controllers/PumpRunController.cs
+++ b/WebApi/Controllers/PumpRunController.cs
@@ -1,4 +1,5 @@
-锘縰sing IStation.Dto;
+锘縰sing IStation.Common;
+using IStation.Dto;
using IStation.Model;
using IStation.ZyModel;
using System;
@@ -14,6 +15,7 @@
[RoutePrefix("PumpRun")]
public class PumpRunController : ApiController
{
+ bool isdebug = true;
/// <summary>
/// 鑾峰彇娉靛疄闄呰繍琛屽弬鏁�(涓�澶�)
/// </summary>
@@ -21,13 +23,8 @@
/// <returns></returns>
[Route("GetByOneDay")]
[HttpGet]
- public async Task<IStation.Dto.ApiResult> GetByOneDay(string startday)
+ public async Task< IStation.Dto.ApiResult> GetByOneDay(string startday)
{
- List<RealScadaData> PumpState = new List<RealScadaData>();
- List<RealScadaData> TotalWater = new List<RealScadaData>();
- List<RealScadaData> PumpTotalElecty = new List<RealScadaData>();
-
- Model.RunParasData runParasData = new Model.RunParasData();
if (startday == null)
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day null" };
@@ -37,56 +34,57 @@
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 鏍煎紡涓嶆纭�" };
}
- // PumpState = await ZyConnectHelper.GetPumpOpenStatusBySingleDay(d); //鑾峰彇娉电殑寮�鏈烘儏鍐�
- // totalWater = await ZyConnectHelper.GetTotalWaterByDayRange_In(d, d);
- // pumpRunParasDay.TotalWater = totalWater;
- // PumpTotalElecty = await ZyConnectHelper.GetPumpTotalElectricity(d, d); //鑾峰彇鏌愭鏃堕棿鐨勭敤鐢甸噺
-
- var debug = Common.PumpRunParasHelper.ReadPumpRunParas(d.AddDays(-15));
- if (debug != null)
+ if (d > DateTime.Now.AddDays(1))
{
- debug.Electric = Math.Round(debug.Electric, 2);
- debug.Money = Math.Round(debug.Money, 2);
- debug.FlowIn = Math.Round(debug.FlowIn, 2);
- if (debug.Pump1.Count != 0)
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "澶╂暟涓嶆纭�" };
+ }
+ RunParasData result = null;
+ PumpRunParasHelper pumpRunParasHelper = new PumpRunParasHelper();
+ result = Common.PumpRunParasHelper.ReadPumpRunParas(d);
+ if (result != null&& isdebug)
+ {
+ result.Electric = Math.Round(result.Electric, 2);
+ result.Money = Math.Round(result.Money, 2);
+ result.FlowIn = Math.Round(result.FlowIn, 2);
+ if (result.Pump1.Count != 0)
{
- foreach (var item in debug.Pump1)
+ foreach (var item in result.Pump1)
{
item.Electric = Math.Round(item.Electric, 2);
item.Money = Math.Round(item.Money, 2);
item.FlowIn = Math.Round(item.FlowIn, 2);
}
}
- if (debug.Pump2.Count != 0)
+ if (result.Pump2.Count != 0)
{
- foreach (var item in debug.Pump2)
+ foreach (var item in result.Pump2)
{
item.Electric = Math.Round(item.Electric, 2);
item.Money = Math.Round(item.Money, 2);
item.FlowIn = Math.Round(item.FlowIn, 2);
}
}
- if (debug.Pump3.Count != 0)
+ if (result.Pump3.Count != 0)
{
- foreach (var item in debug.Pump3)
+ foreach (var item in result.Pump3)
{
item.Electric = Math.Round(item.Electric, 2);
item.Money = Math.Round(item.Money, 2);
item.FlowIn = Math.Round(item.FlowIn, 2);
}
}
- if (debug.Pump4.Count != 0)
+ if (result.Pump4.Count != 0)
{
- foreach (var item in debug.Pump4)
+ foreach (var item in result.Pump4)
{
item.Electric = Math.Round(item.Electric, 2);
item.Money = Math.Round(item.Money, 2);
item.FlowIn = Math.Round(item.FlowIn, 2);
}
}
- if (debug.Pump5.Count != 0)
+ if (result.Pump5.Count != 0)
{
- foreach (var item in debug.Pump5)
+ foreach (var item in result.Pump5)
{
item.Electric = Math.Round(item.Electric, 2);
item.Money = Math.Round(item.Money, 2);
@@ -94,8 +92,24 @@
}
}
}
- else { return null; }
- return new IStation.Dto.ApiResult<Model.RunParasData>(debug) { Code = ApiResultCode.Success, Message = "Success" };
+ else
+ {
+ var PumpTotalElecty = await ZyConnectHelper.GetPumpTotalElectricity(d, d); //鑾峰彇鏌愭鏃堕棿鐨勭敤鐢甸噺
+ var PumpState = await ZyConnectHelper.GetPumpOpenStatusBySingleDay(d); //鑾峰彇娉电殑寮�鏈烘儏鍐�
+ var TotalWater = await ZyConnectHelper.GetTotalWaterByDayTimeRange_In(d, d); //鍙栨按閲�
+
+ /* PumpHistoryDataFileHelper pumpHistoryDataFileHelper=new PumpHistoryDataFileHelper();
+ var TotalWater = pumpHistoryDataFileHelper.GetAllWaterData();
+ var PumpState = pumpHistoryDataFileHelper.getpumpstate();
+ var PumpTotalElecty = pumpHistoryDataFileHelper.GetAllEleData();*/
+ result = pumpRunParasHelper.GetRunParasDatas(PumpState, TotalWater, PumpTotalElecty, d);
+ }
+ if (result != null)
+ {
+ pumpRunParasHelper.Save(result, out string error);
+ // LogHelper.Info(error);
+ }
+ return new IStation.Dto.ApiResult<Model.RunParasData>(result) { Code = ApiResultCode.Success, Message = "Success" };
}
/// <summary>
@@ -105,7 +119,7 @@
/// <returns></returns>
[Route("GetByHistoryOneDay")]
[HttpGet]
- public async Task<IStation.Dto.ApiResult> GetByHistoryOneDay(string day)
+ public IStation.Dto.ApiResult GetByHistoryOneDay(string day)
{
if (day == null)
{
@@ -180,7 +194,7 @@
/// <returns></returns>
[Route("GetOneDayData")]
[HttpGet]
- public async Task<IStation.Dto.ApiResult> GetOneDayPumpWaterData(string day)
+ public IStation.Dto.ApiResult GetOneDayPumpWaterData(string day)
{
if (day == null)
{
@@ -207,7 +221,7 @@
/// <returns></returns>
[Route("GetPumpOutDayWater")]
[HttpGet]
- public async Task<IStation.Dto.ApiResult> GetPumpOutWater(string startday,string endday,int sign)
+ public IStation.Dto.ApiResult GetPumpOutWater(string startday,string endday,int sign)
{
if (startday == null||endday==null)
{
@@ -236,7 +250,7 @@
/// <returns></returns>
[Route("GetPumpOutMonthWater")]
[HttpGet]
- public async Task<IStation.Dto.ApiResult> GetPumpOutMonthWater()
+ public IStation.Dto.ApiResult GetPumpOutMonthWater()
{
var WaterParas = Common.PumpRunParasHelper.ReadPumpMonthOutWater();
return new IStation.Dto.ApiResult<List<Model.PumpOutWater>>(WaterParas) { Code = ApiResultCode.Success, Message = "Success" };
@@ -252,7 +266,7 @@
/// <returns></returns>
[Route("GetPumpTotalDayOutWater")]
[HttpGet]
- public async Task<IStation.Dto.ApiResult> GetPumpTotalDayOutWater(string startday, string endday)
+ public IStation.Dto.ApiResult GetPumpTotalDayOutWater(string startday, string endday)
{
if (startday == null || endday == null)
{
@@ -282,7 +296,7 @@
/// <returns></returns>
[Route("GetPumpTotalDayAccOutWater")]
[HttpGet]
- public async Task<IStation.Dto.ApiResult> GetPumpTotalDayAccOutWater(string startday, string endday)
+ public IStation.Dto.ApiResult GetPumpTotalDayAccOutWater(string startday, string endday)
{
if (startday == null || endday == null)
{
--
Gitblit v1.9.3