|
|
@ -278,13 +278,16 @@ namespace WebStarter.Controllers.Ammeter
|
|
|
|
|
|
|
|
|
|
|
|
if (resp != null)//添加主控柜电表
|
|
|
|
if (resp != null)//添加主控柜电表
|
|
|
|
{
|
|
|
|
{
|
|
|
|
EmeterResp EmeterResp = new EmeterResp();
|
|
|
|
if (FireControlMgr.Power != 0)//值为0即无主控柜电表
|
|
|
|
EmeterResp.Code = "主控柜";
|
|
|
|
{
|
|
|
|
EmeterResp.Value = FireControlMgr.Power;
|
|
|
|
EmeterResp EmeterResp = new EmeterResp();
|
|
|
|
EmeterResp.Type = 1;
|
|
|
|
EmeterResp.Code = "主控柜";
|
|
|
|
EmeterResp.UploadTime=DateTime.Now;
|
|
|
|
EmeterResp.Value = FireControlMgr.Power;
|
|
|
|
|
|
|
|
EmeterResp.Type = 1;
|
|
|
|
|
|
|
|
EmeterResp.UploadTime=DateTime.Now;
|
|
|
|
|
|
|
|
|
|
|
|
resp.emeterEnergyChange.Add(EmeterResp);
|
|
|
|
resp.emeterEnergyChange.Add(EmeterResp);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return Result<EmeterEnergyResp>.Success(resp, "成功");
|
|
|
|
return Result<EmeterEnergyResp>.Success(resp, "成功");
|
|
|
|