合并代码

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,7 +288,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                     FocusId = 95780,
                     ProjectID = 1,
                     TripType =  "off",
-                    TripTime = "14:02",
+                    TripTime = $"{DateTime.Now:HH:mm}",
                     MeterId  = 127035,
                     LoopType = "EachDay",
                     EachDayWithout = "周六,周日",
@@ -306,36 +308,6 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                     EachDayWithout = "周六,周日",
                     TimeDensity = 15,
                 });
-
-                settingInfos.Add(new AmmeterAutoValveControlSetting()
-                {
-                    MeterType = MeterTypeEnum.Ammeter,
-                    AmmerterAddress = "321410010270",
-                    FocusAddress = "322011149",
-                    FocusId = 333333,
-                    ProjectID = 1,
-                    TripType = "on",
-                    TripTime = $"{DateTime.Now:HH:mm}",
-                    MeterId = 333333,
-                    LoopType = "EachDay",
-                    EachDayWithout = "周六,周日",
-                    TimeDensity = 15,
-                });
-
-                settingInfos.Add(new AmmeterAutoValveControlSetting()
-                {
-                    MeterType = MeterTypeEnum.Ammeter,
-                    AmmerterAddress = "112410027787",
-                    FocusAddress = "322011149",
-                    FocusId = 222222,
-                    ProjectID = 1,
-                    TripType = "on",
-                    TripTime = $"{DateTime.Now:HH:mm}",
-                    MeterId = 222222,
-                    LoopType = "EachDay",
-                    EachDayWithout = "周六,周日",
-                    TimeDensity = 15,
-                });
 #else
                 //获取电表阀控配置
                 var settingInfos = await GetAmmeterAutoValveControlSetting(currentTimeStr);