diff --git a/Entity/DbModel/Station/EquipInfo.cs b/Entity/DbModel/Station/EquipInfo.cs index d4129ef..23c2385 100644 --- a/Entity/DbModel/Station/EquipInfo.cs +++ b/Entity/DbModel/Station/EquipInfo.cs @@ -40,7 +40,7 @@ namespace Entity.DbModel.Station public string Name {get;set;} /// - /// Desc:设备类型编码 + /// Desc:设备类型编码 0交流,1直流 /// Default: /// Nullable:True /// diff --git a/Repository/Ammeter/EmeterDayEnergyRepository.cs b/Repository/Ammeter/EmeterDayEnergyRepository.cs index 99f427d..c8e7386 100644 --- a/Repository/Ammeter/EmeterDayEnergyRepository.cs +++ b/Repository/Ammeter/EmeterDayEnergyRepository.cs @@ -8,8 +8,10 @@ namespace Repository.Ammeter [Scope("SingleInstance")] public class EmeterDayEnergyRepository : BaseRepository { + private ISqlSugarClient DbBaseClient; public EmeterDayEnergyRepository(ISqlSugarClient sqlSugar) : base(sqlSugar) { + DbBaseClient = sqlSugar; } } } diff --git a/Repository/Ammeter/EmeterHourEnergyRepository.cs b/Repository/Ammeter/EmeterHourEnergyRepository.cs index 751cfc0..f3e750e 100644 --- a/Repository/Ammeter/EmeterHourEnergyRepository.cs +++ b/Repository/Ammeter/EmeterHourEnergyRepository.cs @@ -8,8 +8,10 @@ namespace Repository.Ammeter [Scope("SingleInstance")] public class EmeterHourEnergyRepository : BaseRepository { + private ISqlSugarClient DbBaseClient; public EmeterHourEnergyRepository(ISqlSugarClient sqlSugar) : base(sqlSugar) { + DbBaseClient = sqlSugar; } } } diff --git a/Repository/Ammeter/EmeterMinutesEnergyChangeRepository.cs b/Repository/Ammeter/EmeterMinutesEnergyChangeRepository.cs index ff189b5..e141d9a 100644 --- a/Repository/Ammeter/EmeterMinutesEnergyChangeRepository.cs +++ b/Repository/Ammeter/EmeterMinutesEnergyChangeRepository.cs @@ -12,8 +12,10 @@ namespace Repository.Ammeter [Scope("SingleInstance")] public class EmeterMinutesEnergyChangeRepository : BaseRepository { + private ISqlSugarClient DbBaseClient; public EmeterMinutesEnergyChangeRepository(ISqlSugarClient sqlSugar) : base(sqlSugar) { + DbBaseClient = sqlSugar; } } } diff --git a/Repository/Ammeter/EmeterMinutesEnergyRepository.cs b/Repository/Ammeter/EmeterMinutesEnergyRepository.cs index 11a6ffa..f43e572 100644 --- a/Repository/Ammeter/EmeterMinutesEnergyRepository.cs +++ b/Repository/Ammeter/EmeterMinutesEnergyRepository.cs @@ -7,8 +7,10 @@ namespace Repository.Ammeter [Scope("SingleInstance")] public class EmeterMinutesEnergyRepository : BaseRepository { + private ISqlSugarClient DbBaseClient; public EmeterMinutesEnergyRepository(ISqlSugarClient sqlSugar) : base(sqlSugar) { + DbBaseClient = sqlSugar; } } } diff --git a/Service/Station/EquipInfoService.cs b/Service/Station/EquipInfoService.cs index 64d955f..ec5f9e8 100644 --- a/Service/Station/EquipInfoService.cs +++ b/Service/Station/EquipInfoService.cs @@ -1,4 +1,5 @@ -using Entity.DbModel; +using Entity.Ammeter; +using Entity.DbModel; using Entity.DbModel.Station; using HybirdFrameworkCore.Autofac.Attribute; using Repository.Ammeter; @@ -14,10 +15,9 @@ namespace Service.Station [Scope("SingleInstance")] public class EquipInfoService : BaseServices { - private readonly EquipInfoRepository _service; public EquipInfoService(EquipInfoRepository service) { - _service = service; + this.BaseDal = service; } } } diff --git a/WebStarter/Controllers/Ammeter/AmmeterController.cs b/WebStarter/Controllers/Ammeter/AmmeterController.cs index 5736f8a..efe4047 100644 --- a/WebStarter/Controllers/Ammeter/AmmeterController.cs +++ b/WebStarter/Controllers/Ammeter/AmmeterController.cs @@ -170,7 +170,6 @@ namespace WebStarter.Controllers.Ammeter //TODO:: //每天计算总能耗值,每天计算充电能耗值,每天计算换电能耗值,每天计算其他能耗值,开始时间,结束时间 - #endregion #region 电能监控/交流电能监控 @@ -187,7 +186,7 @@ namespace WebStarter.Controllers.Ammeter { strings.Add(kvp.Code); } - + //TODO::过滤,确保编码相同只出现一次 return Result>.Success(_emeterMinutesEnergyService.QueryListByClause(i => strings.Contains(i.Code)).ToList()); } @@ -195,7 +194,7 @@ namespace WebStarter.Controllers.Ammeter #region 电能监控/直流电能监控 /// - /// 电能监控/交流电能监控 + /// 电能监控/直流电能监控 /// [HttpGet("ManualSwap/GetDcCurrentInfo")] public Result> GetDcCurrentInfo() @@ -206,7 +205,7 @@ namespace WebStarter.Controllers.Ammeter { strings.Add(kvp.Code); } - + //TODO::过滤,确保编码相同只出现一次 return Result>.Success(_emeterMinutesEnergyService.QueryListByClause(i => strings.Contains(i.Code)).ToList()); } #endregion