diff --git a/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs b/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs index 873e8fc..47c1002 100644 --- a/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs +++ b/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs @@ -551,8 +551,8 @@ namespace CK.SCP.Controller { ScpEntities scpdb = EntitiesFactory.CreateScpInstance(); ExchangeCenterContext db = EntitiesFactory.CreateExchangeCenterInstance(); - var _list = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled&&p.Domain== "BJBMPT").OrderBy(p => p.UID).ToList(); - var _list1 = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled && p.Domain == "BJBMPT" && p.InterfaceType== "Price").OrderBy(p => p.UID).ToList(); + var _list = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled&&p.Domain== "CQBMPT").OrderBy(p => p.UID).ToList(); + var _list1 = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled && p.Domain == "CQBMPT" && p.InterfaceType== "Price").OrderBy(p => p.UID).ToList(); var apiii = _list1.Count(); if (apiii > 0) { diff --git a/北京北汽/UniApiWpf/MainWindow.xaml.cs b/北京北汽/UniApiWpf/MainWindow.xaml.cs index d568b63..ed650d2 100644 --- a/北京北汽/UniApiWpf/MainWindow.xaml.cs +++ b/北京北汽/UniApiWpf/MainWindow.xaml.cs @@ -174,6 +174,11 @@ namespace UniApiWpf private void BgwPutDoWork(object sender, DoWorkEventArgs e) { + TimeSpan nowDt = DateTime.Now.TimeOfDay; + TimeSpan workstartDT = DateTime.Parse("1:00").TimeOfDay; + TimeSpan workendDT = DateTime.Parse("2:00").TimeOfDay; + if (nowDt < workstartDT || nowDt > workendDT) + { SCP_DC_UNI_CONTROLLER.WriteService((rs) => { if (rs.State == ReturnStatus.Succeed) @@ -185,6 +190,7 @@ namespace UniApiWpf CreateLogDataList(rs.Result, WriteLogEnum.Put); } }); + } } @@ -197,24 +203,33 @@ namespace UniApiWpf { try { - SCP_DC_UNI_CONTROLLER.ReadService((rs) => + TimeSpan nowDt = DateTime.Now.TimeOfDay; + TimeSpan workstartDT = DateTime.Parse("1:00").TimeOfDay; + TimeSpan workendDT = DateTime.Parse("2:00").TimeOfDay; + if (nowDt < workstartDT || nowDt > workendDT) { - List _list = new List(); - if (rs.State == ReturnStatus.Succeed) - { - rs.MessageList.ForEach(p => { - _list.Add(new LogModel() { LogMessage = string.Format("{0}任务:{1}", p,rs.Message.ToString()), LogTime = DateTime.Now.ToShortDateString(), TableName = "", TaskId=rs.Message.ToString(), }); - }); - CreateLogDataList(_list, WriteLogEnum.Get); - } - else - { - rs.ErrorList.ForEach(p => { - _list.Add(new LogModel() { LogMessage = string.Format("{0}任务:{1}", p.Message, rs.Message.ToString()), LogTime = DateTime.Now.ToShortDateString(), TableName = "", TaskId = rs.Message.ToString(), }); - }); - CreateLogDataList(_list, WriteLogEnum.Get); - } - }); + #region + SCP_DC_UNI_CONTROLLER.ReadService((rs) => + { + List _list = new List(); + if (rs.State == ReturnStatus.Succeed) + { + rs.MessageList.ForEach(p => { + _list.Add(new LogModel() { LogMessage = string.Format("{0}任务:{1}", p, rs.Message.ToString()), LogTime = DateTime.Now.ToShortDateString(), TableName = "", TaskId = rs.Message.ToString(), }); + }); + CreateLogDataList(_list, WriteLogEnum.Get); + } + else + { + rs.ErrorList.ForEach(p => { + _list.Add(new LogModel() { LogMessage = string.Format("{0}任务:{1}", p.Message, rs.Message.ToString()), LogTime = DateTime.Now.ToShortDateString(), TableName = "", TaskId = rs.Message.ToString(), }); + }); + CreateLogDataList(_list, WriteLogEnum.Get); + } + }); + #endregion + } + } catch (Exception ex) {