解决EquipmentService 服务调用异常的问题

PVDEMCS/PVDEMCS/Controllers/EquipmentController.cs

@@ -20,9 +20,9 @@ namespace PVDEMCS.Controllers
     public class EquipmentController : Controller
     {
         private IEquipmentService _equipmentService;
-       
 
-        public EquipmentController(IEquipmentService equipmentService) 
+
+        public EquipmentController(IEquipmentService equipmentService)
         {
             this._equipmentService = equipmentService;
         }
@@ -37,10 +37,10 @@ namespace PVDEMCS.Controllers
         /// <param name="size">页大小</param>
         /// <returns></returns>
         [HttpGet]
-        public Result<PagedList<EquipmentInfo>> GetEquipmentPageList(string equipmentName, string equipmentCode, string equipmentType, bool? activated, int page, int size) 
+        public Result<PagedList<EquipmentInfo>> GetEquipmentPageList(string equipmentName, string equipmentCode, string equipmentType, bool? activated, int page, int size = 20)
         {
-            var result = this._equipmentService.GetEquipmentPageList(equipmentName,equipmentCode,equipmentType,activated,page,size);
-          
+            var result = this._equipmentService.GetEquipmentPageList(equipmentName, equipmentCode, equipmentType, activated, page, size);
+
             return result;
         }
 
@@ -54,7 +54,7 @@ namespace PVDEMCS.Controllers
         public Result<List<EquipmentInfo>> GetEquipmentList(string equipmentName, string equipmentCode, string equipmentType, bool? activated)
         {
             var result = this._equipmentService.GetEquipmentList(equipmentName, equipmentCode, equipmentType, activated);
-            
+
             return result;
         }
 

PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs

@@ -20,7 +20,7 @@ namespace PVDEMCS.Controllers
 
         private IDeviceService _deviceService;
 
-        public EquipmentRecordController(IEquipmentRecordService equipmentRecordService,IDeviceService deviceService)
+        public EquipmentRecordController(IEquipmentRecordService equipmentRecordService, IDeviceService deviceService)
         {
             this._equipmentRecordService = equipmentRecordService;
             this._deviceService = deviceService;
@@ -40,9 +40,9 @@ namespace PVDEMCS.Controllers
         /// <param name="size">页大小</param>
         /// <returns></returns>
         [HttpGet]
-        public Result<PagedList<EquipmentRecord>> GetEquipmentRecordPageList(string equipmentName, string equipmentCode, string equipmentType, DateTime begTime, DateTime endTime, int page, int size)
+        public Result<PagedList<EquipmentRecord>> GetEquipmentRecordPageList(string equipmentName, string equipmentCode, string equipmentType, DateTime begTime, DateTime endTime, int page, int size = 20)
         {
-            var result= _equipmentRecordService.GetEquipmentRecordPageList(equipmentName, equipmentCode, equipmentType, begTime, endTime, page, size);
+            var result = _equipmentRecordService.GetEquipmentRecordPageList(equipmentName, equipmentCode, equipmentType, begTime, endTime, page, size);
             return result;
         }
 
@@ -61,7 +61,7 @@ namespace PVDEMCS.Controllers
             var result = _equipmentRecordService.GetEquipmentRecordList(equipmentName, equipmentCode, equipmentType, begTime, endTime);
             return result;
         }
-       
+
         /// <summary>
         /// 添加或更新设备状态记录
         /// 1.如果设备最新记录状态没有改变则更新结束时间
@@ -105,9 +105,9 @@ namespace PVDEMCS.Controllers
         /// <param name="page">当前页</param>
         /// <param name="size">页大小</param>
         [HttpGet]
-        public Result<PagedList<EquipmentRecordTotal>> GetEquipmentRecordDayTotalPageList(string equipmentName, string equipmentCode, string equipmentType, DateTime begTime, DateTime endTime, int page, int size)
+        public Result<PagedList<EquipmentRecordTotal>> GetEquipmentRecordDayTotalPageList(string equipmentName, string equipmentCode, string equipmentType, DateTime begTime, DateTime endTime, int page, int size = 20)
         {
-            var result = _equipmentRecordService.GetEquipmentRecordDayTotalPageList(equipmentName,equipmentCode,equipmentType,begTime,endTime,page,size);
+            var result = _equipmentRecordService.GetEquipmentRecordDayTotalPageList(equipmentName, equipmentCode, equipmentType, begTime, endTime, page, size);
             return result;
         }
 
@@ -133,7 +133,7 @@ namespace PVDEMCS.Controllers
         [HttpGet]
         public Result<List<EquipmentStateView>> GetEquipmentStateView()
         {
-            var points = _deviceService.GetDevicePointList(activated:true);
+            var points = _deviceService.GetDevicePointList(activated: true);
 
             return null;
         }

PVDEMCS/PVDEMCS/Controllers/SysConfigController.cs

@@ -17,7 +17,7 @@ namespace PVDEMCS.Controllers
     public class SysConfigController : Controller
     {
         private ISysConfigService _sysConfigService;
-        public SysConfigController(ISysConfigService sysConfigService) 
+        public SysConfigController(ISysConfigService sysConfigService)
         {
             this._sysConfigService = sysConfigService;
         }
@@ -30,9 +30,9 @@ namespace PVDEMCS.Controllers
         /// <param name="size">页大小</param>
         /// <returns></returns>
         [HttpGet]
-        public Result<PagedList<SysConfig>> GetSysConfigPageList(string configName, string configKey, int page, int size) 
+        public Result<PagedList<SysConfig>> GetSysConfigPageList(string configName, string configKey, int page, int size = 20)
         {
-            var result  = this._sysConfigService.GetSysConfigPageList(configName,configKey,page,size);
+            var result = this._sysConfigService.GetSysConfigPageList(configName, configKey, page, size);
             return result;
         }
 

PVDEMCS/PVDEMCS/Services/Impl/EquipmentService.cs

@@ -18,10 +18,10 @@ namespace PVDEMCS.Services.Impl
      */
     internal class EquipmentService : IEquipmentService
     {
-        private readonly EquipmentRepository _equipmentRepository;
+        private readonly IEquipmentRepository _equipmentRepository;
         private readonly IDeviceRun _deviceRun;
 
-        public EquipmentService(EquipmentRepository equipmentRepository, IDeviceRun deviceRun)
+        public EquipmentService(IEquipmentRepository equipmentRepository, IDeviceRun deviceRun)
         {
             this._equipmentRepository = equipmentRepository;
             this._deviceRun = deviceRun;