ciro_xu/iotgateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化多变量同时下发功能

Browse Source
This commit is contained in:
iioter 2022-08-22 12:46:01 +08:00
parent feb09b14ae
commit 30bd58b4aa
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IoTGateway.ViewModel/BasicData/DeviceVariableVMs/SetValueVM.cs
View File

@ -22,8 +22,18 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
{ {
try try
{ {
var ids = (StringValues)FC["setValue.ID[]"]; StringValues ids , values;
var values= (StringValues)FC["setValue.SetRawValue[]"]; if (FC.ContainsKey("setValue.ID[]"))
{
ids = (StringValues)FC["setValue.ID[]"];
values = (StringValues)FC["setValue.SetRawValue[]"];
}
else
{
ids = (StringValues)FC["setValue.ID"];
values = (StringValues)FC["setValue.SetRawValue"];
}
Dictionary<string, string> kv = new(0); Dictionary<string, string> kv = new(0);
for (int i = 0; i < ids.Count; i++) for (int i = 0; i < ids.Count; i++)
{ {
@ -87,6 +97,8 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
StringValues ids; StringValues ids;
if (FC.ContainsKey("setValue.ID[]")) if (FC.ContainsKey("setValue.ID[]"))
ids = (StringValues)FC["setValue.ID[]"]; ids = (StringValues)FC["setValue.ID[]"];
else if (FC.ContainsKey("setValue.ID"))
ids = (StringValues)FC["setValue.ID"];
else else
ids = (StringValues)FC["Ids[]"]; ids = (StringValues)FC["Ids[]"];

9
IoTGateway/Areas/BasicData/Controllers/DeviceVariableController.cs
View File

@ -216,7 +216,7 @@ namespace IoTGateway.Controllers
return vm.GetExportData(); return vm.GetExportData();
} }
#region 下发写入 #region 下发写入
[ActionDescription("下发写入")] [ActionDescription("下发页面")]
[HttpPost] [HttpPost]
public ActionResult SetValue(string[] IDs) public ActionResult SetValue(string[] IDs)
{ {
@ -225,11 +225,16 @@ namespace IoTGateway.Controllers
} }
[HttpPost] [HttpPost]
[ActionDescription("下发写入")] [ActionDescription("下发确认按钮")]
public ActionResult DoSetValue() public ActionResult DoSetValue()
{ {
var ids = Request.Form["setValue.ID[]"].ToArray(); var ids = Request.Form["setValue.ID[]"].ToArray();
var values = Request.Form["setValue.SetRawValue[]"].ToArray(); var values = Request.Form["setValue.SetRawValue[]"].ToArray();
if (ids.Length == 0)
{
ids = Request.Form["setValue.ID"].ToArray();
values = Request.Form["setValue.SetRawValue"].ToArray();
}
var vm = Wtm.CreateVM<SetValueVM>(Ids: ids); var vm = Wtm.CreateVM<SetValueVM>(Ids: ids);
if (!ModelState.IsValid) if (!ModelState.IsValid)