From 7dfbb6f5dbb275a83163565a10ca2a6b9d6c74cc Mon Sep 17 00:00:00 2001 From: xiaoguo Date: Wed, 1 Nov 2023 16:51:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=AE=BE=E5=A4=87Id=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=AE=B0=E5=BD=95=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PVDEMCS/.vs/PVDEMCS/v17/.suo | Bin 162304 -> 174080 bytes .../Controllers/EquipmentRecordController.cs | 12 +++++++++ .../Services/IEquipmentRecordService.cs | 8 ++++++ .../Services/Impl/EquipmentRecordService.cs | 23 ++++++++++++++++++ .../Entities/BaseEntity/CUDBaseEntity.cs | 2 +- .../IEquipmentRecordRepository.cs | 7 ++++++ .../Impl/EquipmentRecordRepository.cs | 14 +++++++++++ 7 files changed, 65 insertions(+), 1 deletion(-) diff --git a/PVDEMCS/.vs/PVDEMCS/v17/.suo b/PVDEMCS/.vs/PVDEMCS/v17/.suo index 71be1b81c0bca093911d2633c448fe9fd4c2c768..f5e9dfd47d4878f48c03ce1129986ecffe4840f7 100644 GIT binary patch delta 8997 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 delta 6566 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 S@!mt~%XOmE@0dkYIsPYqasFBW diff --git a/PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs b/PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs index 20feb91..8b0273b 100644 --- a/PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs +++ b/PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs @@ -154,6 +154,18 @@ namespace PVDEMCS.Controllers return result; } + /// + /// 根据设备Id获取记录统计 + /// + /// 设备Id + /// + [HttpGet] + public Result GetEquipmentRecordTotalDetail(string equipmentId) + { + var result = _equipmentRecordService.GetEquipmentRecordTotalDetail(equipmentId); + return result; + } + /// /// 获取设备总览 /// diff --git a/PVDEMCS/PVDEMCS/Services/IEquipmentRecordService.cs b/PVDEMCS/PVDEMCS/Services/IEquipmentRecordService.cs index 4c92be6..0f1cba1 100644 --- a/PVDEMCS/PVDEMCS/Services/IEquipmentRecordService.cs +++ b/PVDEMCS/PVDEMCS/Services/IEquipmentRecordService.cs @@ -2,6 +2,7 @@ using PVDEMCS.Common.DI; using PVDEMCS.Common; using PVDEMCS.Services.Models; +using PVDEMCS.Services.Repositories.Entities; namespace PVDEMCS.Services { @@ -36,6 +37,13 @@ namespace PVDEMCS.Services /// Result> GetEquipmentRecordList(string equipmentName, string equipmentCode, string equipmentType, DateTime begTime, DateTime endTime); + /// + /// 根据设备Id获取记录统计 + /// + /// 设备Id + /// + Result GetEquipmentRecordTotalDetail(string equipmentId); + /// /// 添加或更新设备状态记录 /// 1.如果设备最新记录状态没有改变则更新结束时间 diff --git a/PVDEMCS/PVDEMCS/Services/Impl/EquipmentRecordService.cs b/PVDEMCS/PVDEMCS/Services/Impl/EquipmentRecordService.cs index db58e0f..dcf79c5 100644 --- a/PVDEMCS/PVDEMCS/Services/Impl/EquipmentRecordService.cs +++ b/PVDEMCS/PVDEMCS/Services/Impl/EquipmentRecordService.cs @@ -6,6 +6,8 @@ using PVDEMCS.Services.Repositories; using Microsoft.AspNetCore.Mvc.RazorPages; using PVDEMCS.Common.Constant; using System; +using PVDEMCS.Common.Tools; +using PVDEMCS.Services.Repositories.Entities; namespace PVDEMCS.Services.Impl { @@ -149,6 +151,27 @@ namespace PVDEMCS.Services.Impl return result; } + + /// + /// 根据设备Id获取记录统计 + /// + /// 设备Id + /// + public Result GetEquipmentRecordTotalDetail(string equipmentId) + { + var result = new Result(); + + var value = this._equipmentRecordRepository.GetEquipmentRecordTotalDetail(equipmentId); + if (!value.IsSuccess) + { + result.Message = value.Message; + return result; + } + result.Content = ModelTools.PubClone.Trans(value.Content); + + return result; + } + /// /// 获取设备状态记录月统计 /// diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/Entities/BaseEntity/CUDBaseEntity.cs b/PVDEMCS/PVDEMCS/Services/Repositories/Entities/BaseEntity/CUDBaseEntity.cs index d7d7274..341f146 100644 --- a/PVDEMCS/PVDEMCS/Services/Repositories/Entities/BaseEntity/CUDBaseEntity.cs +++ b/PVDEMCS/PVDEMCS/Services/Repositories/Entities/BaseEntity/CUDBaseEntity.cs @@ -52,7 +52,7 @@ namespace PVDEMCS.Services.Repositories.Entities.BaseEntity public void Create() { - Id = SnowFlakeNew.NewId; + Id = SnowFlakeNew.LongId.ToString(); CreateAt = DateTime.Now; CreateBy = "1"; Update(); diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/IEquipmentRecordRepository.cs b/PVDEMCS/PVDEMCS/Services/Repositories/IEquipmentRecordRepository.cs index 902cef6..5f34159 100644 --- a/PVDEMCS/PVDEMCS/Services/Repositories/IEquipmentRecordRepository.cs +++ b/PVDEMCS/PVDEMCS/Services/Repositories/IEquipmentRecordRepository.cs @@ -107,6 +107,13 @@ namespace PVDEMCS.Services.Repositories /// 设备类型 Result> GetEquipmentRecordTotalList(string equipmentName, string equipmentCode, string equipmentType); + /// + /// 根据设备Id获取记录统计 + /// + /// 设备Id + /// + Result GetEquipmentRecordTotalDetail(string equipmentId); + /// /// 获取设备状态记录月统计 /// diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs index 385dcbd..44aeb45 100644 --- a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs +++ b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs @@ -528,6 +528,20 @@ namespace PVDEMCS.Services.Repositories.Impl return query; } + /// + /// 根据设备Id获取记录统计 + /// + /// 设备Id + /// + public Result GetEquipmentRecordTotalDetail(string equipmentId) + { + using (var context=new EFContext()) + { + var entity = context.EquipmentRecordTotals.Where(f => f.EquipmentId == equipmentId).FirstOrDefault(); + return new Result(entity); + } + } + /// /// 获取设备状态记录月统计 ///