diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 8801d1f9e..f603cec15 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,8 +1,8 @@ - 10.7.46 - 10.7.46 + 10.7.47 + 10.7.47 2.5.0 8.0.17 9.0.6 diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Controller/ControlController.cs b/src/Gateway/ThingsGateway.Gateway.Application/Controller/ControlController.cs index 5d35967a2..b1d546acb 100644 --- a/src/Gateway/ThingsGateway.Gateway.Application/Controller/ControlController.cs +++ b/src/Gateway/ThingsGateway.Gateway.Application/Controller/ControlController.cs @@ -220,6 +220,23 @@ public class ControlController : ControllerBase { return GlobalData.VariableRuntimeService.InsertTestDataAsync(testVariableCount, testDeviceCount, slaveUrl, businessEnable, restart, default); } + + + /// + /// 确认实时报警 + /// + /// + [HttpPost("checkRealAlarm")] + [RequestAudit] + [DisplayName("确认实时报警")] + public async Task CheckRealAlarm(long variableId) + { + if (GlobalData.ReadOnlyRealAlarmIdVariables.TryGetValue(variableId, out var variable)) + { + await GlobalData.SysUserService.CheckApiDataScopeAsync(variable.CreateOrgId, variable.CreateUserId).ConfigureAwait(false); + GlobalData.AlarmHostedService.ConfirmAlarm(variableId); + } + } } public class ChannelInput { diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Controller/RuntimeInfoController.cs b/src/Gateway/ThingsGateway.Gateway.Application/Controller/RuntimeInfoController.cs index b9e276c49..507b54f09 100644 --- a/src/Gateway/ThingsGateway.Gateway.Application/Controller/RuntimeInfoController.cs +++ b/src/Gateway/ThingsGateway.Gateway.Application/Controller/RuntimeInfoController.cs @@ -34,7 +34,7 @@ public class RuntimeInfoController : ControllerBase /// [HttpGet("channelList")] [DisplayName("获取通道信息")] - public async Task> GetChannelListAsync(ChannelPageInput input) + public async Task> GetChannelListAsync([FromQuery] ChannelPageInput input) { var channelRuntimes = await GlobalData.GetCurrentUserChannels().ConfigureAwait(false); @@ -54,7 +54,7 @@ public class RuntimeInfoController : ControllerBase /// [HttpGet("deviceList")] [DisplayName("获取设备信息")] - public async Task> GetDeviceListAsync(DevicePageInput input) + public async Task> GetDeviceListAsync([FromQuery] DevicePageInput input) { var deviceRuntimes = await GlobalData.GetCurrentUserDevices().ConfigureAwait(false); var data = deviceRuntimes @@ -72,7 +72,7 @@ public class RuntimeInfoController : ControllerBase /// [HttpGet("realAlarmList")] [DisplayName("获取实时报警变量信息")] - public async Task> GetRealAlarmList(AlarmVariablePageInput input) + public async Task> GetRealAlarmList([FromQuery] AlarmVariablePageInput input) { var realAlarmVariables = await GlobalData.GetCurrentUserRealAlarmVariables().ConfigureAwait(false); @@ -84,29 +84,13 @@ public class RuntimeInfoController : ControllerBase return data; } - /// - /// 确认实时报警 - /// - /// - [HttpPost("checkRealAlarm")] - [RequestAudit] - [DisplayName("确认实时报警")] - public async Task CheckRealAlarm(long variableId) - { - if (GlobalData.ReadOnlyRealAlarmIdVariables.TryGetValue(variableId, out var variable)) - { - await GlobalData.SysUserService.CheckApiDataScopeAsync(variable.CreateOrgId, variable.CreateUserId).ConfigureAwait(false); - GlobalData.AlarmHostedService.ConfirmAlarm(variableId); - } - } - /// /// 获取变量信息 /// /// [HttpGet("variableList")] [DisplayName("获取变量信息")] - public async Task> GetVariableList(VariablePageInput input) + public async Task> GetVariableList([FromQuery] VariablePageInput input) { var variables = await GlobalData.GetCurrentUserIdVariables().ConfigureAwait(false); var data = variables @@ -144,7 +128,7 @@ public class RuntimeInfoController : ControllerBase /// [HttpGet("getPluginInfos")] [DisplayName("获取插件")] - public SqlSugarPagedList GetPluginInfos(PluginInfoPageInput input) + public SqlSugarPagedList GetPluginInfos([FromQuery] PluginInfoPageInput input) { //指定关键词搜索为插件FullName return GlobalData.PluginService.GetList().WhereIF(!input.Name.IsNullOrWhiteSpace(), a => a.Name == input.Name) diff --git a/src/Version.props b/src/Version.props index 4b7e00e05..e451693fa 100644 --- a/src/Version.props +++ b/src/Version.props @@ -1,6 +1,6 @@ - 10.7.46 + 10.7.47