From ee0b48afbdd6851d65a58628b662aca4bf7abafd Mon Sep 17 00:00:00 2001
From: ChenYi <296215406@outlook.com>
Date: Wed, 14 May 2025 15:21:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...nergySystemScheduledMeterReadingService.cs | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs b/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
index 0521dca..05c3007 100644
--- a/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
+++ b/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
@@ -125,6 +125,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                 BrandType = "DDS1980",
                 MeterType = MeterTypeEnum.Ammeter,
                 ProjectID = 1,
+                MeteringPort = 2,
             });
 
             ammeterInfos.Add(new DeviceInfo()
@@ -143,6 +144,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                 BrandType = "DDS1980",
                 MeterType = MeterTypeEnum.Ammeter,
                 ProjectID = 1,
+                MeteringPort = 2,
             });
 
             //ammeterInfos.Add(new DeviceInfo()
@@ -286,12 +288,26 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                     FocusId = 95780,
                     ProjectID = 1,
                     TripType =  "off",
-                    TripTime = "14:02",
+                    TripTime = $"{DateTime.Now:HH:mm}",
                     MeterId  = 127035,
                     LoopType = "EachDay",
                     EachDayWithout = "周六,周日",
                     TimeDensity = 15,
                 });
+                settingInfos.Add(new AmmeterAutoValveControlSetting()
+                {
+                    MeterType = MeterTypeEnum.Ammeter,
+                    AmmerterAddress = "442405000039",
+                    FocusAddress = "442400039",
+                    FocusId = 69280,
+                    ProjectID = 1,
+                    TripType = "off",
+                    TripTime = $"{DateTime.Now:HH:mm}",
+                    MeterId = 95594,
+                    LoopType = "EachDay",
+                    EachDayWithout = "周六,周日",
+                    TimeDensity = 15,
+                });
 #else
                 //获取电表阀控配置
                 var settingInfos = await GetAmmeterAutoValveControlSetting(currentTimeStr);
@@ -302,7 +318,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                 }
 #endif
 
-               
+
                 //设备hash缓存key
                 string redisCacheDeviceInfoHashKey = $"{string.Format(RedisConst.CacheDeviceInfoHashKey, SystemType, ServerTagName)}";