From fec6f4d1aca06202d90ddfcf561da2f98043b41a Mon Sep 17 00:00:00 2001
From: CZ <CZ@DESKTOP-P59OM7P>
Date: Fri, 19 Jul 2024 10:23:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E6=8E=A7=E6=9F=9C=E7=94=B5=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Ammeter/AmmeterController.cs      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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