提交

tangxu

2024-03-19 26c7bd3e7060ffcb6456ea2098850ec5a4fee77c

 WebApi/Controllers/TotalWaterOutController.cs

@@ -5,6 +5,7 @@
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using System.Web;
using System.Web.Http;
using System.Web.UI.WebControls;
@@ -24,26 +25,37 @@
        /// <returns></returns>
        [Route("GetByDay")]
        [HttpGet]
        public IStation.Dto.ApiResult GetByDay(string day)
        public async Task<IStation.Dto.ApiResult> GetByDay(string day)
        {
            if (day == null)
            {
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day null" };
            }
            DateTime d;
            if (!DateTime.TryParse(day, out d))
            DateTime dayD;
            if (!DateTime.TryParse(day, out dayD))
            {
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 格式不正确" };
            }
            var sum = TotalWaterOutHelper.Read(d);
            if (sum < 0)
            if (dayD > DateTime.Today)
            {
                sum = ZyConnectHelper.GetTotalWaterByDay_Out(DateTime.Parse(day)).Result;//.GetAwaiter().GetResult();

                TotalWaterOutHelper.Save(d, sum);
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "不能查询今日的数据" };
            }
             
            return new IStation.Dto.ApiResult<double>(sum);
            double sum = -1;
            if (dayD < DateTime.Today)
            {
                sum = TotalWaterOutHelper.Read(dayD);
            }
            if (sum < 0)
            {
                sum = await  ZyConnectHelper.GetTotalWaterByDay_Out(DateTime.Parse(day));//.Result;//.GetAwaiter().GetResult();
                if (dayD < DateTime.Today)
                {
                    TotalWaterOutHelper.Save(dayD, sum);
                }
            }
             
            return new IStation.Dto.ApiResult<double>(sum / 10000);
        }


@@ -54,13 +66,13 @@
        /// <returns></returns>
        [Route("GetLastDay3")]
        [HttpGet]
        public IStation.Dto.ApiResult GetLastDay3()
        public async Task<IStation.Dto.ApiResult> GetLastDay3()
        {
            DateTime yest1 = DateTime.Today.AddDays(-1);
            var sum1 = TotalWaterOutHelper.Read(yest1);
            if (sum1 < 0)
            {
                sum1 = ZyConnectHelper.GetTotalWaterByDay_Out(yest1).Result;//.GetAwaiter().GetResult();
                sum1 = await ZyConnectHelper.GetTotalWaterByDay_Out(yest1);//.Result;//.GetAwaiter().GetResult();

                TotalWaterOutHelper.Save(yest1, sum1);
            }
@@ -69,7 +81,7 @@
            var sum2 = TotalWaterOutHelper.Read(yest2);
            if (sum2 < 0)
            {
                sum2 = ZyConnectHelper.GetTotalWaterByDay_Out(yest2).Result;//.GetAwaiter().GetResult();
                sum2 = await ZyConnectHelper.GetTotalWaterByDay_Out(yest2);//.Result;//.GetAwaiter().GetResult();

                TotalWaterOutHelper.Save(yest2, sum2);
            }
@@ -78,12 +90,12 @@
            var sum3 = TotalWaterOutHelper.Read(yest3);
            if (sum3 < 0)
            {
                sum3 = ZyConnectHelper.GetTotalWaterByDay_Out(yest3).Result;//.GetAwaiter().GetResult();
                sum3 = await ZyConnectHelper.GetTotalWaterByDay_Out(yest3);//.Result;//.GetAwaiter().GetResult();

                TotalWaterOutHelper.Save(yest3, sum3);
            }

            return new IStation.Dto.ApiResult<List<double>>(new List<double> { sum1, sum2, sum3 });
            return new IStation.Dto.ApiResult<List<double>>(new List<double> { sum1 / 10000, sum2 / 10000, sum3 / 10000 });
        }