diff --git a/PVDEMCS/.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2 b/PVDEMCS/.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2 index 5a9f804..829ec73 100644 Binary files a/PVDEMCS/.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2 and b/PVDEMCS/.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2 differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/1170ff39-eb37-45bf-bbf7-0bc10c0f1647.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/1170ff39-eb37-45bf-bbf7-0bc10c0f1647.vsidx deleted file mode 100644 index 23cecd8..0000000 Binary files a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/1170ff39-eb37-45bf-bbf7-0bc10c0f1647.vsidx and /dev/null differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/15847690-decd-45de-99ca-485a8d07f5b0.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/15847690-decd-45de-99ca-485a8d07f5b0.vsidx new file mode 100644 index 0000000..e7adabe Binary files /dev/null and b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/15847690-decd-45de-99ca-485a8d07f5b0.vsidx differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/15c6ee4f-b4fe-43d4-9052-7c2ef16075b1.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/15c6ee4f-b4fe-43d4-9052-7c2ef16075b1.vsidx deleted file mode 100644 index e862541..0000000 Binary files a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/15c6ee4f-b4fe-43d4-9052-7c2ef16075b1.vsidx and /dev/null differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/312186de-6f4a-4d6a-8ded-ea57279cf970.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/312186de-6f4a-4d6a-8ded-ea57279cf970.vsidx new file mode 100644 index 0000000..8147e38 Binary files /dev/null and b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/312186de-6f4a-4d6a-8ded-ea57279cf970.vsidx differ diff --git a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/fef02d90-50f7-4e1c-967b-58024e8599a8.vsidx b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/5483d7d2-4fe6-478b-bf73-e3a75ac0b0db.vsidx similarity index 59% rename from PVDEMCS/.vs/PVDEMCS/FileContentIndex/fef02d90-50f7-4e1c-967b-58024e8599a8.vsidx rename to PVDEMCS/.vs/PVDEMCS/FileContentIndex/5483d7d2-4fe6-478b-bf73-e3a75ac0b0db.vsidx index 15b6100..15bfda0 100644 Binary files a/PVDEMCS/.vs/PVDEMCS/FileContentIndex/fef02d90-50f7-4e1c-967b-58024e8599a8.vsidx and b/PVDEMCS/.vs/PVDEMCS/FileContentIndex/5483d7d2-4fe6-478b-bf73-e3a75ac0b0db.vsidx differ diff --git a/PVDEMCS/.vs/PVDEMCS/v17/.suo b/PVDEMCS/.vs/PVDEMCS/v17/.suo index f5a079e..ed71165 100644 Binary files a/PVDEMCS/.vs/PVDEMCS/v17/.suo and b/PVDEMCS/.vs/PVDEMCS/v17/.suo differ diff --git a/PVDEMCS/PVDEMCS/Controllers/EquipmentController.cs b/PVDEMCS/PVDEMCS/Controllers/EquipmentController.cs index 679cad3..f7ee878 100644 --- a/PVDEMCS/PVDEMCS/Controllers/EquipmentController.cs +++ b/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 /// 页大小 /// [HttpGet] - public Result> GetEquipmentPageList(string equipmentName, string equipmentCode, string equipmentType, bool? activated, int page, int size) + public Result> 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> GetEquipmentList(string equipmentName, string equipmentCode, string equipmentType, bool? activated) { var result = this._equipmentService.GetEquipmentList(equipmentName, equipmentCode, equipmentType, activated); - + return result; } diff --git a/PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs b/PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs index 5ca7b7d..7e70782 100644 --- a/PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs +++ b/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 /// 页大小 /// [HttpGet] - public Result> GetEquipmentRecordPageList(string equipmentName, string equipmentCode, string equipmentType, DateTime begTime, DateTime endTime, int page, int size) + public Result> 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; } - + /// /// 添加或更新设备状态记录 /// 1.如果设备最新记录状态没有改变则更新结束时间 @@ -105,9 +105,9 @@ namespace PVDEMCS.Controllers /// 当前页 /// 页大小 [HttpGet] - public Result> GetEquipmentRecordDayTotalPageList(string equipmentName, string equipmentCode, string equipmentType, DateTime begTime, DateTime endTime, int page, int size) + public Result> 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> GetEquipmentStateView() { - var points = _deviceService.GetDevicePointList(activated:true); + var points = _deviceService.GetDevicePointList(activated: true); return null; } diff --git a/PVDEMCS/PVDEMCS/Controllers/SysConfigController.cs b/PVDEMCS/PVDEMCS/Controllers/SysConfigController.cs index 79de6ab..c93b4ea 100644 --- a/PVDEMCS/PVDEMCS/Controllers/SysConfigController.cs +++ b/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 /// 页大小 /// [HttpGet] - public Result> GetSysConfigPageList(string configName, string configKey, int page, int size) + public Result> 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; } diff --git a/PVDEMCS/PVDEMCS/Services/Impl/EquipmentService.cs b/PVDEMCS/PVDEMCS/Services/Impl/EquipmentService.cs index 8b10800..33673d7 100644 --- a/PVDEMCS/PVDEMCS/Services/Impl/EquipmentService.cs +++ b/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; diff --git a/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.dll b/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.dll index 26ce623..c54a77d 100644 Binary files a/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.dll and b/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.dll differ diff --git a/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.pdb b/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.pdb index 5f29432..f03fc66 100644 Binary files a/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.pdb and b/PVDEMCS/PVDEMCS/bin/Debug/net6.0/PVDEMCS.pdb differ diff --git a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.dll b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.dll index 26ce623..c54a77d 100644 Binary files a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.dll and b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.dll differ diff --git a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.pdb b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.pdb index 5f29432..f03fc66 100644 Binary files a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.pdb and b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.pdb differ diff --git a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/ref/PVDEMCS.dll b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/ref/PVDEMCS.dll index 735db1e..1598524 100644 Binary files a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/ref/PVDEMCS.dll and b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/ref/PVDEMCS.dll differ diff --git a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/refint/PVDEMCS.dll b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/refint/PVDEMCS.dll index 735db1e..1598524 100644 Binary files a/PVDEMCS/PVDEMCS/obj/Debug/net6.0/refint/PVDEMCS.dll and b/PVDEMCS/PVDEMCS/obj/Debug/net6.0/refint/PVDEMCS.dll differ