signalR test2
This commit is contained in:
parent
d250bca681
commit
99a6b6f28c
@ -31,6 +31,31 @@
|
||||
datat: reactive([])
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
var _this = this;
|
||||
_this.connection = new signalR.HubConnectionBuilder()
|
||||
.withAutomaticReconnect()
|
||||
.withUrl("/stocks")
|
||||
.build();
|
||||
_this.connection.start().then(function () {
|
||||
_this.connection.invoke("GetAllStocks").then(function (stocks) {
|
||||
for (let i = 0; i < stocks.length; i++) {
|
||||
_this.datat.push({
|
||||
Key: stocks[i].dbName,
|
||||
Value: stocks[i].dbValue
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
_this.connection.invoke("OpenMarket");
|
||||
|
||||
_this.connection.invoke("GetMarketState").then(function (state) {
|
||||
if (state === 'Open') {
|
||||
_this.startStreaming();
|
||||
}
|
||||
});
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
handleClick() {
|
||||
var _this = this;
|
||||
@ -41,66 +66,38 @@
|
||||
_this.result.forEach((item) => {
|
||||
_this.datat.push(item);
|
||||
})
|
||||
|
||||
// _this.datat.forEach((item,index) => {
|
||||
// if (item.Key == "DB4.24") {
|
||||
// _this.datat[index].Value = "3";
|
||||
// }
|
||||
// })
|
||||
})
|
||||
.catch(function (error) {
|
||||
console.log(error);
|
||||
});
|
||||
},
|
||||
|
||||
handleSubmit(data) {
|
||||
console.log(data);
|
||||
this.$message.info('This is an info message')
|
||||
},
|
||||
|
||||
startStreaming() {
|
||||
this.connection.stream("StreamStocks").subscribe({
|
||||
close: false,
|
||||
next: this.displayStock,
|
||||
error: function (err) {
|
||||
logger.log(err);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
displayStock(stock) {
|
||||
this.datat.forEach((item, index) => {
|
||||
if (item.Key == stock.dbName) {
|
||||
this.datat[index].Value = stock.dbValue;
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
});
|
||||
app
|
||||
.use(ArcoVue)
|
||||
app.use(ArcoVue)
|
||||
.use(ArcoVueIcon)
|
||||
.mount('#app');
|
||||
|
||||
console.log(app._instance.data);
|
||||
|
||||
let connection = new signalR.HubConnectionBuilder()
|
||||
.withAutomaticReconnect()
|
||||
.withUrl("/stocks")
|
||||
.build();
|
||||
connection.start().then(function () {
|
||||
connection.invoke("GetAllStocks").then(function (stocks) {
|
||||
for (let i = 0; i < stocks.length; i++) {
|
||||
app._instance.data.datat.push({ Key: stocks[i].dbName, Value: stocks[i].dbValue });
|
||||
}
|
||||
});
|
||||
|
||||
connection.invoke("GetMarketState").then(function (state) {
|
||||
console.log(state);
|
||||
// if (state === 'Open') {
|
||||
startStreaming();
|
||||
// }
|
||||
});
|
||||
|
||||
connection.invoke("OpenMarket");
|
||||
});
|
||||
|
||||
function startStreaming() {
|
||||
connection.stream("StreamStocks").subscribe({
|
||||
close: false,
|
||||
next: displayStock,
|
||||
error: function (err) {
|
||||
logger.log(err);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function displayStock(stock) {
|
||||
app._instance.data.datat.forEach((item,index) => {
|
||||
if (item.Key == stock.dbName) {
|
||||
app._instance.data.datat[index].Value = stock.dbValue;
|
||||
}
|
||||
})
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -17,7 +17,8 @@ namespace HHWMS.Web
|
||||
private readonly SemaphoreSlim _marketStateLock = new SemaphoreSlim(1, 1);
|
||||
private readonly SemaphoreSlim _updateStockPricesLock = new SemaphoreSlim(1, 1);
|
||||
|
||||
private readonly ConcurrentDictionary<string, Stock> _stocks = new ConcurrentDictionary<string, Stock>();
|
||||
private readonly ConcurrentDictionary<string, Stock> _stocks =
|
||||
new ConcurrentDictionary<string, Stock>();
|
||||
|
||||
private readonly Subject<Stock> _subject = new Subject<Stock>();
|
||||
|
||||
@ -30,18 +31,20 @@ namespace HHWMS.Web
|
||||
private Timer _timer;
|
||||
private volatile bool _updatingStockPrices;
|
||||
private volatile MarketState _marketState;
|
||||
private SiemensClient client;
|
||||
|
||||
public StockTicker(IHubContext<StockTickerHub> hub)
|
||||
{
|
||||
Hub = hub;
|
||||
client = new SiemensClient(
|
||||
SiemensVersion.S7_1500,
|
||||
"127.0.0.1",
|
||||
102
|
||||
);
|
||||
LoadDefaultStocks();
|
||||
}
|
||||
|
||||
private IHubContext<StockTickerHub> Hub
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
private IHubContext<StockTickerHub> Hub { get; set; }
|
||||
|
||||
public MarketState MarketState
|
||||
{
|
||||
@ -66,11 +69,11 @@ namespace HHWMS.Web
|
||||
{
|
||||
//if (MarketState != MarketState.Open)
|
||||
//{
|
||||
_timer = new Timer(UpdateStockPrices, null, _updateInterval, _updateInterval);
|
||||
_timer = new Timer(UpdateStockPrices, null, _updateInterval, _updateInterval);
|
||||
|
||||
MarketState = MarketState.Open;
|
||||
MarketState = MarketState.Open;
|
||||
|
||||
await BroadcastMarketStateChange(MarketState.Open);
|
||||
await BroadcastMarketStateChange(MarketState.Open);
|
||||
//}
|
||||
}
|
||||
finally
|
||||
@ -79,48 +82,6 @@ namespace HHWMS.Web
|
||||
}
|
||||
}
|
||||
|
||||
public async Task CloseMarket()
|
||||
{
|
||||
await _marketStateLock.WaitAsync();
|
||||
try
|
||||
{
|
||||
if (MarketState == MarketState.Open)
|
||||
{
|
||||
if (_timer != null)
|
||||
{
|
||||
_timer.Dispose();
|
||||
}
|
||||
|
||||
MarketState = MarketState.Closed;
|
||||
|
||||
await BroadcastMarketStateChange(MarketState.Closed);
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
_marketStateLock.Release();
|
||||
}
|
||||
}
|
||||
|
||||
public async Task Reset()
|
||||
{
|
||||
await _marketStateLock.WaitAsync();
|
||||
try
|
||||
{
|
||||
if (MarketState != MarketState.Closed)
|
||||
{
|
||||
throw new InvalidOperationException("Market must be closed before it can be reset.");
|
||||
}
|
||||
|
||||
LoadDefaultStocks();
|
||||
await BroadcastMarketReset();
|
||||
}
|
||||
finally
|
||||
{
|
||||
_marketStateLock.Release();
|
||||
}
|
||||
}
|
||||
|
||||
private void LoadDefaultStocks()
|
||||
{
|
||||
_stocks.Clear();
|
||||
@ -146,13 +107,10 @@ namespace HHWMS.Web
|
||||
|
||||
foreach (var stock in _stocks.Values)
|
||||
{
|
||||
SiemensClient client = new SiemensClient(SiemensVersion.S7_1500, "127.0.0.1", 102);
|
||||
|
||||
stock.DbValue = client.ReadFloat(stock.DbName).Value;
|
||||
|
||||
_subject.OnNext(stock);
|
||||
}
|
||||
|
||||
_updatingStockPrices = false;
|
||||
}
|
||||
}
|
||||
@ -176,11 +134,6 @@ namespace HHWMS.Web
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private async Task BroadcastMarketReset()
|
||||
{
|
||||
await Hub.Clients.All.SendAsync("marketReset");
|
||||
}
|
||||
}
|
||||
|
||||
public enum MarketState
|
||||
|
||||
@ -35,14 +35,5 @@ namespace HHWMS.Web
|
||||
await _stockTicker.OpenMarket();
|
||||
}
|
||||
|
||||
public async Task CloseMarket()
|
||||
{
|
||||
await _stockTicker.CloseMarket();
|
||||
}
|
||||
|
||||
public async Task Reset()
|
||||
{
|
||||
await _stockTicker.Reset();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user