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 | 113 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 85 insertions(+), 28 deletions(-)
diff --git a/WebApi/Controllers/AnaPrjController.cs b/WebApi/Controllers/AnaPrjController.cs
index ba916e3..a1fe6d2 100644
--- a/WebApi/Controllers/AnaPrjController.cs
+++ b/WebApi/Controllers/AnaPrjController.cs
@@ -1,4 +1,5 @@
-锘縰sing IStation.Common;
+锘縰sing IStation.CalcModel;
+using IStation.Common;
using IStation.Dto;
using System;
using System.Collections.Generic;
@@ -6,7 +7,9 @@
using System.Linq;
using System.Net;
using System.Net.Http;
+using System.Security.Permissions;
using System.Text;
+using System.Threading.Tasks;
using System.Web;
using System.Web.Http;
using System.Web.UI.WebControls;
@@ -20,15 +23,43 @@
[RoutePrefix("AnaPrj")]
public class AnaPrjController : ApiController
{
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="day"></param>
+ /// <returns></returns>
+ [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");
+ }
/// <summary>
///
/// </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)
{
@@ -39,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);
}
@@ -75,18 +106,37 @@
[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
- {
- public string day { get; set; }
- public Model.AnaSetting settting { get; set; }
- public Model.AnaRequestBase requestBase { get; set; }
+ {
+ public IStation.CalcModel.AnaSetting settting { get; set; }
+ public IStation.CalcModel.AnaRequestBase requestBase { get; set; }
public IStation.CalcModel.AnaPrj prj { get; set; }
public bool isSubmit { get; set; }
}
@@ -97,9 +147,9 @@
/// <returns></returns>
[Route("SavePrj")]
[HttpPost]
- public IStation.Dto.ApiResult SavePrj([FromBody] SavePrjRequest request)
+ public async Task<IStation.Dto.ApiResult> SavePrj([FromBody] SavePrjRequest request)
{
- if (request == null || request.day == null)
+ if (request == null )
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day null" };
}
@@ -107,29 +157,36 @@
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "prj null" };
}
- DateTime d;
- if (!DateTime.TryParse(request.day, out d))
- {
- return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 鏍煎紡涓嶆纭�" };
- }
- var ret = Common.HistoryAnaPrjFileHelper.SavePrj(d, 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)
{
- ret = ZyConnectHelper.SubmitPrj(request.prj, () => { }, (f) => { }).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))
+ {
+ 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);
+ return new IStation.Dto.ApiResult<bool>(ret) { Code = ApiResultCode.Success };
}
-
-
-
-
-
+
}
--
Gitblit v1.9.3