改

tangxu

2024-03-26 8d31cd366ea79ced8e5f3d56ce9b4e6f75872939

 WebApi/Controllers/PumpRunController.cs

@@ -1,7 +1,9 @@
using IStation.Dto;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using System.Web.Http;
using static IStation.Common.PumpHistoryDataFileHelper;

namespace IStation.WebApi.Controllers
{
@@ -12,7 +14,7 @@
    public class PumpRunController : ApiController
    {

        Dto.PumpRunParasDays pumpRunParasDay = new Dto.PumpRunParasDays();

         /// <summary>
        ///  获取某一天参数
        /// </summary>
@@ -20,10 +22,15 @@
        /// <returns></returns>
        [Route("GetByOneDay")]
        [HttpGet]
        public async Task<IStation.Dto.ApiResult> GetByOneDay(DateTime startday)
        public async Task<IStation.Dto.ApiResult> GetByOneDay(string  startday)
        {
           
            var PumpState = await ZyConnectHelper.GetPumpIsopen(startday,startday);
            DateTime d;
            if (!DateTime.TryParse(startday, out d))
            {
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 格式不正确" };
            }
            Dto.PumpRunParasDays pumpRunParasDay = new Dto.PumpRunParasDays();
            var PumpState = await ZyConnectHelper.GetPumpOpenStatusBySingleDay(d,d);
            //    var totalWater = await ZyConnectHelper.GetTotalWaterByDayRange_In(startday, startday);
            //   pumpRunParasDay.TotalWater = totalWater;
         //   var PumpTotalElecty = await ZyConnectHelper.GetPumpTotalElectricity(startday, startday);
@@ -37,8 +44,28 @@
            return new IStation.Dto.ApiResult<Dto.PumpRunParasDays>(pumpRunParasDay) { Code = ApiResultCode.Success, Message = "Success" };
        }

        /// <summary>
        /// 
        /// </summary>
        /// <param name="day"></param>
        /// <returns></returns>
        [Route("GetByHistoryOneDay")]
        [HttpGet]
        public async Task<IStation.Dto.ApiResult> GetByHistoryOneDay(string  day)
        {
            if (day == null)
            {
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day null" };
            }
            DateTime d;
            if (!DateTime.TryParse(day, out d))
            {
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 格式不正确" };
            } 


            var history = Common.PumpHistoryDataFileHelper.GetHistoryData(d);
            return new IStation.Dto.ApiResult<List<RunParasData>>(history) { Code = ApiResultCode.Success, Message = "Success" };
        }