From 36a0ce55799c95821f39aab5c13566a5f238970b Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 11 二月 2025 12:56:55 +0800
Subject: [PATCH] 修复预测接口问题

---
 WebApi/Controllers/TotalWaterInController.cs |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/WebApi/Controllers/TotalWaterInController.cs b/WebApi/Controllers/TotalWaterInController.cs
index a234557..a68c2fd 100644
--- a/WebApi/Controllers/TotalWaterInController.cs
+++ b/WebApi/Controllers/TotalWaterInController.cs
@@ -1,9 +1,7 @@
 锘縰sing IStation.Common;
 using IStation.Dto;
-using IStation.Untity;
-using IStation.ZyDto;
-using IStation.ZyModel;
-using Microsoft.Ajax.Utilities;
+using IStation.Untity; 
+using IStation.ZyModel; 
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,9 +12,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
-using System.Web.Http;
-using System.Web.UI.WebControls;
-using static IStation.ZyConnectHelper;
+using System.Web.Http; 
 
 namespace IStation.WebApi.Controllers
 {
@@ -61,7 +57,7 @@
         [HttpGet]
         public IStation.Dto.ApiResult GetByDayDebug(string day)
         {
-            if (isDebug)
+            if (ZyConnectHelper.isDebug)
                 return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "Debug is Unacess " };
             if (day == null)
             {
@@ -89,7 +85,7 @@
         [HttpGet]
         public async Task<IStation.Dto.ApiResult> GetByDay(string day)
         {
-            if (isDebug)
+            if (ZyConnectHelper.isDebug)
                 return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "Debug is Unacess " };
             if (day == null)
             {
@@ -127,8 +123,8 @@
                 }
                 sum = 0;
                 string joinedValues = string.Join(",", tagDict.Values);
-                var result = HttpClientHelper.Get<List<DataPoint>>(_GetUrl, starttime, endtime, "first", "300s", joinedValues);
-                var realScadaDataList = GetScadaData(result);
+                var result = HttpClientHelper.Get<List<DataPoint>>(ZyConnectHelper.ZyApiUrl, starttime, endtime, "first", "300s", joinedValues);
+                var realScadaDataList = ZyConnectHelper.GetScadaData(result);
                 if (realScadaDataList != null && realScadaDataList.Any())
                 {
                     foreach (var r in realScadaDataList)
@@ -162,7 +158,7 @@
         [HttpGet]
         public async Task<IStation.Dto.ApiResult> GetLastDay3()
         {
-            if (isDebug)
+            if (ZyConnectHelper.isDebug)
                 return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "Debug is Unacess " };
             DateTime yest1 = DateTime.Today.AddDays(-1);
             var sum1 = TotalWaterInHelper.Read(yest1);

--
Gitblit v1.9.3