admin/JiShe.CollectBus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改代码

Browse Source
This commit is contained in:
ChenYi 2025-05-14 15:21:33 +08:00
parent 94ff58dd12
commit ee0b48afbd
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
View File

@ -125,6 +125,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
BrandType = "DDS1980", BrandType = "DDS1980",
MeterType = MeterTypeEnum.Ammeter, MeterType = MeterTypeEnum.Ammeter,
ProjectID = 1, ProjectID = 1,
MeteringPort = 2,
}); });
ammeterInfos.Add(new DeviceInfo() ammeterInfos.Add(new DeviceInfo()
@ -143,6 +144,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
BrandType = "DDS1980", BrandType = "DDS1980",
MeterType = MeterTypeEnum.Ammeter, MeterType = MeterTypeEnum.Ammeter,
ProjectID = 1, ProjectID = 1,
MeteringPort = 2,
}); });
//ammeterInfos.Add(new DeviceInfo() //ammeterInfos.Add(new DeviceInfo()
@ -286,12 +288,26 @@ namespace JiShe.CollectBus.ScheduledMeterReading
FocusId = 95780, FocusId = 95780,
ProjectID = 1, ProjectID = 1,
TripType = "off", TripType = "off",
TripTime = "14:02", TripTime = $"{DateTime.Now:HH:mm}",
MeterId = 127035, MeterId = 127035,
LoopType = "EachDay", LoopType = "EachDay",
EachDayWithout = "周六,周日", EachDayWithout = "周六,周日",
TimeDensity = 15, 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 #else
//获取电表阀控配置 //获取电表阀控配置
var settingInfos = await GetAmmeterAutoValveControlSetting(currentTimeStr); var settingInfos = await GetAmmeterAutoValveControlSetting(currentTimeStr);
@ -302,7 +318,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
} }
#endif #endif
//设备hash缓存key //设备hash缓存key
string redisCacheDeviceInfoHashKey = $"{string.Format(RedisConst.CacheDeviceInfoHashKey, SystemType, ServerTagName)}"; string redisCacheDeviceInfoHashKey = $"{string.Format(RedisConst.CacheDeviceInfoHashKey, SystemType, ServerTagName)}";