tangxu
2024-04-29 8b25d4c0c79c26900cea5de537887d658dcfa32e
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);
        }
@@ -101,8 +114,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 +129,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,28 +137,26 @@
            {
                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)
            {
                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))
                {
                    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,7 +166,7 @@
    }