From edd23f115dba31d764fdaf75a6207d888d0419d3 Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期二, 26 三月 2024 13:52:09 +0800
Subject: [PATCH] 改API接口
---
WebApi/Controllers/AnaPrjController.cs | 58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 11 deletions(-)
diff --git a/WebApi/Controllers/AnaPrjController.cs b/WebApi/Controllers/AnaPrjController.cs
index 18366f1..89a71b5 100644
--- a/WebApi/Controllers/AnaPrjController.cs
+++ b/WebApi/Controllers/AnaPrjController.cs
@@ -101,8 +101,7 @@
public class SavePrjRequest
- {
- public string day { get; set; }
+ {
public IStation.CalcModel.AnaSetting settting { get; set; }
public IStation.CalcModel.AnaRequestBase requestBase { get; set; }
public IStation.CalcModel.AnaPrj prj { get; set; }
@@ -117,7 +116,7 @@
[HttpPost]
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" };
}
@@ -125,12 +124,8 @@
{
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);
if (request.isSubmit)
{
@@ -141,12 +136,12 @@
if(!string.IsNullOrEmpty(error))
{
- IStation.LogHelper.Info("Submit prj finish (fail) day:" + request.day+ ",error:" + 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.day);
+ IStation.LogHelper.Info("Submit prj finish (success) day:" + request.requestBase.StartTime);
}
}
@@ -156,6 +151,47 @@
+ /// <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