From b627851ab5ca9e8391dc05bfb4fd342b4ce3eece Mon Sep 17 00:00:00 2001 From: zhougf Date: Thu, 7 Mar 2024 23:08:36 +0800 Subject: [PATCH] signalR test2 --- .../Areas/Configs/Views/Print/Index.cshtml | 8 +-- HHWMS.Web/Areas/Hub/StockTicker.cs | 59 ++++--------------- HHWMS.Web/Areas/Hub/StockTickerHub.cs | 5 -- 3 files changed, 12 insertions(+), 60 deletions(-) diff --git a/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml index e2889a1..3d4e2f8 100644 --- a/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml @@ -47,12 +47,8 @@ } }); - _this.connection.invoke("OpenMarket"); - - _this.connection.invoke("GetMarketState").then(function (state) { - if (state === 'Open') { - _this.startStreaming(); - } + _this.connection.invoke("OpenMarket").then(() => { + _this.startStreaming(); }); }); }, diff --git a/HHWMS.Web/Areas/Hub/StockTicker.cs b/HHWMS.Web/Areas/Hub/StockTicker.cs index 66928ab..c2f44ee 100644 --- a/HHWMS.Web/Areas/Hub/StockTicker.cs +++ b/HHWMS.Web/Areas/Hub/StockTicker.cs @@ -14,23 +14,18 @@ namespace HHWMS.Web { public class StockTicker { - private readonly SemaphoreSlim _marketStateLock = new SemaphoreSlim(1, 1); - private readonly SemaphoreSlim _updateStockPricesLock = new SemaphoreSlim(1, 1); + private readonly SemaphoreSlim _stateLock = new SemaphoreSlim(1, 1); + private readonly SemaphoreSlim _updateLock = new SemaphoreSlim(1, 1); private readonly ConcurrentDictionary _stocks = new ConcurrentDictionary(); private readonly Subject _subject = new Subject(); - // Stock can go up or down by a percentage of this factor on each change - private readonly double _rangePercent = 0.002; - private readonly TimeSpan _updateInterval = TimeSpan.FromSeconds(10); - private readonly Random _updateOrNotRandom = new Random(); private Timer _timer; - private volatile bool _updatingStockPrices; - private volatile MarketState _marketState; + private volatile bool _updatingStock; private SiemensClient client; public StockTicker(IHubContext hub) @@ -46,12 +41,6 @@ namespace HHWMS.Web private IHubContext Hub { get; set; } - public MarketState MarketState - { - get { return _marketState; } - private set { _marketState = value; } - } - public IEnumerable GetAllStocks() { return _stocks.Values; @@ -64,21 +53,14 @@ namespace HHWMS.Web public async Task OpenMarket() { - await _marketStateLock.WaitAsync(); + await _stateLock.WaitAsync(); try { - //if (MarketState != MarketState.Open) - //{ _timer = new Timer(UpdateStockPrices, null, _updateInterval, _updateInterval); - - MarketState = MarketState.Open; - - await BroadcastMarketStateChange(MarketState.Open); - //} } finally { - _marketStateLock.Release(); + _stateLock.Release(); } } @@ -98,12 +80,12 @@ namespace HHWMS.Web private async void UpdateStockPrices(object state) { // This function must be re-entrant as it's running as a timer interval handler - await _updateStockPricesLock.WaitAsync(); + await _updateLock.WaitAsync(); try { - if (!_updatingStockPrices) + if (!_updatingStock) { - _updatingStockPrices = true; + _updatingStock = true; foreach (var stock in _stocks.Values) { @@ -111,34 +93,13 @@ namespace HHWMS.Web _subject.OnNext(stock); } - _updatingStockPrices = false; + _updatingStock = false; } } finally { - _updateStockPricesLock.Release(); + _updateLock.Release(); } } - - private async Task BroadcastMarketStateChange(MarketState marketState) - { - switch (marketState) - { - case MarketState.Open: - await Hub.Clients.All.SendAsync("marketOpened"); - break; - case MarketState.Closed: - await Hub.Clients.All.SendAsync("marketClosed"); - break; - default: - break; - } - } - } - - public enum MarketState - { - Closed, - Open } } diff --git a/HHWMS.Web/Areas/Hub/StockTickerHub.cs b/HHWMS.Web/Areas/Hub/StockTickerHub.cs index 398c956..cc190fd 100644 --- a/HHWMS.Web/Areas/Hub/StockTickerHub.cs +++ b/HHWMS.Web/Areas/Hub/StockTickerHub.cs @@ -25,11 +25,6 @@ namespace HHWMS.Web return _stockTicker.StreamStocks().AsChannelReader(10); } - public string GetMarketState() - { - return _stockTicker.MarketState.ToString(); - } - public async Task OpenMarket() { await _stockTicker.OpenMarket();