From e08f18c84c96ca794407f4fcb737b26fa76c0a1f Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期二, 11 六月 2024 09:35:03 +0800
Subject: [PATCH] 改了配置类
---
WebApi/Controllers/AnaPrjController.cs | 110 ++++++++++++++++++++++++++-----------------------------
1 files changed, 52 insertions(+), 58 deletions(-)
diff --git a/WebApi/Controllers/AnaPrjController.cs b/WebApi/Controllers/AnaPrjController.cs
index 89a71b5..a1fe6d2 100644
--- a/WebApi/Controllers/AnaPrjController.cs
+++ b/WebApi/Controllers/AnaPrjController.cs
@@ -31,11 +31,24 @@
[Route("Debug")]
[HttpGet]
public IStation.Dto.ApiResult Debug(string info)
- {
-
+ {
IStation.LogHelper.Info("debug:"+ info);
-
+ //IStation.CalcModel.AnaPrj entity = new IStation.CalcModel.AnaPrj();
+ //entity.ID = "123";
+ //entity.StartTime = DateTime.Now;
+ //entity.EndTime = DateTime.Now;
+ //entity.Name = "232";
+
+ //IStation.CalcModel.AnaRequest ana_request = new AnaRequest();
+ //ana_request.TotalFlow鍙栨按鎬婚噺 = 102;
+
+ //var dal = new IStation.DAL.AnaProject();
+ //dal.Insert(entity, ana_request);
+
+
+ var dal = new IStation.DAL.AnaProject();
+ var aa = dal.GetLastRecord();
return new IStation.Dto.ApiResult<string >("ok");
}
@@ -44,9 +57,9 @@
/// </summary>
/// <param name="day"></param>
/// <returns></returns>
- [Route("GetPrj")]
+ [Route("GetPrjByDay")]
[HttpGet]
- public IStation.Dto.ApiResult GetPrj(string day)
+ public IStation.Dto.ApiResult GetPrjByDay(string day)
{
if (day == null)
{
@@ -57,8 +70,8 @@
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 鏍煎紡涓嶆纭�" };
}
-
- var prj = Common.HistoryAnaPrjFileHelper.GetPrj(d);
+ IStation.CalcModel.AnaRequestBase requestBase = null;
+ var prj = Common.HistoryAnaPrjFileHelper.GetByDay(d,out requestBase);
return new IStation.Dto.ApiResult<IStation.CalcModel.AnaPrj>(prj);
}
@@ -93,12 +106,32 @@
[HttpGet]
public IStation.Dto.ApiResult GetLastTimeOpenPumpCount(DateTime day)
{
- int dict = HistoryAnaPrjFileHelper.GetLastTime_OpenPumpCount(day);
-
- return new IStation.Dto.ApiResult<int>(dict);
+ var status = HistoryAnaPrjFileHelper.GetLastTime_OpenPumpStatus (day);
+ if(status == null)
+ {
+ return new IStation.Dto.ApiResult<int>(-1);
+ }
+ else
+ {
+ return new IStation.Dto.ApiResult<int>(status.Count);
+ }
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="day"></param>
+ /// <returns></returns>
+ [Route("GetLastTimeOpenPumpStatus")]
+ [HttpGet]
+ public IStation.Dto.ApiResult GetLastTimeOpenPumpStatus(DateTime day)
+ {
+ var status = HistoryAnaPrjFileHelper.GetLastTime_OpenPumpStatus(day);
+ if(status == null)
+ return new IStation.Dto.ApiResult<string >("");
+ else
+ return new IStation.Dto.ApiResult<string >(string.Join(",",status));
+ }
public class SavePrjRequest
{
@@ -124,15 +157,17 @@
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "prj null" };
}
-
- var ret = Common.HistoryAnaPrjFileHelper.SavePrj( request.settting, request.requestBase, request.prj);
+
+ var ret = Common.HistoryAnaPrjFileHelper.SavePrj(request.settting, request.requestBase, request.prj);
+
+ //鎻掑叆鍒版暟鎹簱
+ //var dal = new IStation.DAL.AnaProject();
+ //dal.Insert(request.prj, request.requestBase);
+
if (request.isSubmit)
{
- string error = await ZyConnectHelper.SubmitPrj(request.prj);//, (id) => { IStation.LogHelper.Info("SavePrj success id=" + id); }, (info) => { IStation.LogHelper.Info("SavePrj failse info:" + info); });//.Result;
-
-
-
+ string error = await ZyProjectHelper.SubmitPrj(request.prj);//, (id) => { IStation.LogHelper.Info("SavePrj success id=" + id); }, (info) => { IStation.LogHelper.Info("SavePrj failse info:" + info); });//.Result;
if(!string.IsNullOrEmpty(error))
{
@@ -151,48 +186,7 @@
- /// <summary>
- ///
- /// </summary>
- /// <param name="request"></param>
- /// <returns></returns>
- [Route("CalcPrj")]
- [HttpPost]
- public async Task<IStation.Dto.ApiResult> CalcPrj([FromBody] SavePrjRequest request)
- {
- if (request == null )
- {
- return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day null" };
- }
- if (request.prj == null)
- {
- return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "prj null" };
- }
- var ret = Common.HistoryAnaPrjFileHelper.SavePrj( request.settting, request.requestBase, request.prj);
-
- if (request.isSubmit)
- {
- string error = await ZyConnectHelper.SubmitPrj(request.prj);//, (id) => { IStation.LogHelper.Info("SavePrj success id=" + id); }, (info) => { IStation.LogHelper.Info("SavePrj failse info:" + info); });//.Result;
-
-
-
-
- if (!string.IsNullOrEmpty(error))
- {
- IStation.LogHelper.Info("Submit prj finish (fail) day:" + request.requestBase.StartTime + ",error:" + error);
- return new IStation.Dto.ApiResult<string>(error) { Code = ApiResultCode.Error };
- }
- else
- {
- IStation.LogHelper.Info("Submit prj finish (success) day:" + request.requestBase.StartTime);
- }
- }
-
-
- return new IStation.Dto.ApiResult<bool>(ret) { Code = ApiResultCode.Success };
- }
-
}
--
Gitblit v1.9.3