From 64a3ab5bcb0bc961da28e89c5c089b0448b67379 Mon Sep 17 00:00:00 2001 From: xiaoguo Date: Wed, 1 Nov 2023 15:24:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2 | Bin 159744 -> 159744 bytes PVDEMCS/.vs/PVDEMCS/v17/.suo | Bin 155648 -> 186368 bytes .../Controllers/EquipmentRecordController.cs | 50 ++++++ .../Services/IEquipmentRecordService.cs | 30 ++++ .../Services/Impl/EquipmentRecordService.cs | 47 +++++- .../Models/EquipmentRecordDayTotal.cs | 44 +---- .../EquipmentRecordFurnaceMonthTotal.cs | 2 +- .../Models/EquipmentRecordStateMonthTotal.cs | 2 +- .../Services/Models/EquipmentRecordTotal.cs | 56 ++++++ .../Repositories/Entities/EFContext.cs | 25 ++- .../Entities/EquipmentRecordDayTotalEntity.cs | 60 +++++++ .../Entities/EquipmentRecordTotalEntity.cs | 6 - .../IEquipmentRecordRepository.cs | 33 +++- .../Impl/EquipmentRecordRepository.cs | 159 +++++++++++++++--- 14 files changed, 435 insertions(+), 79 deletions(-) create mode 100644 PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordTotal.cs create mode 100644 PVDEMCS/PVDEMCS/Services/Repositories/Entities/EquipmentRecordDayTotalEntity.cs diff --git a/PVDEMCS/.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2 b/PVDEMCS/.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2 index 337b8f78338bda29ebd3d5d401533ce8752888a8..8d504d86b5858cb57c6016310f6f9b303128b107 100644 GIT binary patch delta 619 zcmbWzyH6BR6vy#9cQYHHAXX%V-+&5>@({fcKrL1ekr$nlC+#R&_J?K-|!u|q3g^-F>6=bb1jY_bW zzgRaG>-tKUQAql7y0_!xh4IlK96B{NS{pt)RtrXsh3A#^f6pAO1+}5{Tux6I#y}Ex z>%Qc8k8V!}a=Inm?A8a_WV>G%Cl^hn?m{c2QgR7x)N|xK7H|#MaRWDT54Ug|2LIkC zGo<|Y0J10RhvXwXMknj5nww8A&neF=`G=J6Z#sWepE+U7r3aC|oNe2mG0Xe2W;u@2-Vwc<`3G%^ Bh!orqHps+SnTUl5ribvE0 z*8}hS!UL@oMSJ}W{$D|C+~k-4d)YTLyOXW^vvoiJ%JY$7LzhlmhGS7psz$^zqtetg zOWLO8NIe=hlX2ZKQ_*DHGL4uWF*Q|7I=XI4E2V0-RP)mvA{@yTr;5B(6tkUtz|93k zk2e<-Y0hJAq6^Jrx2P)0ypOSh&mHX(G9wscCG?xnin@SYgd!}#GOWNVc(4ZRz%jdp zY(mo9HqbljcaXbKh7R;}-X8430UW{t9Qjy=9iyPbPT&;I;2bW1Hok-_xCT1p25#XF z8XvQPTERgTByD^TwDtiSAN7cu);~cTW~<1uuZ6K^6fbTiB-#h*{VTjd4c;Mu*$*Vm z)86z`e@l%2me3v4G1jX diff --git a/PVDEMCS/.vs/PVDEMCS/v17/.suo b/PVDEMCS/.vs/PVDEMCS/v17/.suo index 1f312e21a6e72d91d2e8e73507a672479bae17c7..1263ec6d12720755e224a70266172b1beb2c48c2 100644 GIT binary patch delta 16832 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 diff --git a/PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs b/PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs index 15cc11b..20feb91 100644 --- a/PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs +++ b/PVDEMCS/PVDEMCS/Controllers/EquipmentRecordController.cs @@ -126,6 +126,34 @@ namespace PVDEMCS.Controllers return result; } + /// + /// 获取设备状态记录统计分页列表 + /// + /// 设备名称 + /// 设备编号 + /// 设备类型 + /// 当前页 + /// 页大小 + [HttpGet] + public Result> GetEquipmentRecordTotalPageList(string equipmentName, string equipmentCode, string equipmentType, int page, int size = 20) + { + var result = _equipmentRecordService.GetEquipmentRecordTotalPageList(equipmentName, equipmentCode, equipmentType, page, size); + return result; + } + + /// + /// 获取设备状态记录统计列表 + /// + /// 设备名称 + /// 设备编号 + /// 设备类型 + [HttpGet] + public Result> GetEquipmentRecordTotalList(string equipmentName, string equipmentCode, string equipmentType) + { + var result = _equipmentRecordService.GetEquipmentRecordTotalList(equipmentName, equipmentCode, equipmentType); + return result; + } + /// /// 获取设备总览 /// @@ -207,6 +235,28 @@ namespace PVDEMCS.Controllers return new Result>(alarmList); } + /// + /// 获取设备状态记录月统计 + /// + /// + [HttpGet] + public Result> GetEquipmentRecordStateMonthTotal() + { + var result = _equipmentRecordService.GetEquipmentRecordStateMonthTotal(); + return result; + } + + /// + /// 获取设备记录开炉次数月统计 + /// + /// + [HttpGet] + public Result> GetEquipmentRecordFurnaceMonthTotal() + { + var result = _equipmentRecordService.GetEquipmentRecordFurnaceMonthTotal(); + return result; + } + #endregion } diff --git a/PVDEMCS/PVDEMCS/Services/IEquipmentRecordService.cs b/PVDEMCS/PVDEMCS/Services/IEquipmentRecordService.cs index dba9901..4f05728 100644 --- a/PVDEMCS/PVDEMCS/Services/IEquipmentRecordService.cs +++ b/PVDEMCS/PVDEMCS/Services/IEquipmentRecordService.cs @@ -80,6 +80,36 @@ namespace PVDEMCS.Services /// 结束时间 Result> GetEquipmentRecordDayTotalList(string equipmentName, string equipmentCode, string equipmentType, DateTime begTime, DateTime endTime); + /// + /// 获取设备状态记录统计分页列表 + /// + /// 设备名称 + /// 设备编号 + /// 设备类型 + /// 当前页 + /// 页大小 + Result> GetEquipmentRecordTotalPageList(string equipmentName, string equipmentCode, string equipmentType, int page, int size); + + /// + /// 获取设备状态记录统计列表 + /// + /// 设备名称 + /// 设备编号 + /// 设备类型 + Result> GetEquipmentRecordTotalList(string equipmentName, string equipmentCode, string equipmentType); + + /// + /// 获取设备状态记录月统计 + /// + /// + Result> GetEquipmentRecordStateMonthTotal(); + + /// + /// 获取设备记录开炉次数月统计 + /// + /// + Result> GetEquipmentRecordFurnaceMonthTotal(); + #endregion } } diff --git a/PVDEMCS/PVDEMCS/Services/Impl/EquipmentRecordService.cs b/PVDEMCS/PVDEMCS/Services/Impl/EquipmentRecordService.cs index 4b4830d..fca796d 100644 --- a/PVDEMCS/PVDEMCS/Services/Impl/EquipmentRecordService.cs +++ b/PVDEMCS/PVDEMCS/Services/Impl/EquipmentRecordService.cs @@ -61,7 +61,6 @@ namespace PVDEMCS.Services.Impl /// /// 设备Id /// 设备状态，运行:Run，待机:Stop，报警:Alarm - /// 设备Id /// public Result AddUpdateEquipmentRecord(string equipmentId, string state, DateTime dateTime) { @@ -114,6 +113,52 @@ namespace PVDEMCS.Services.Impl return result; } + /// + /// 获取设备状态记录统计分页列表 + /// + /// 设备名称 + /// 设备编号 + /// 设备类型 + /// 当前页 + /// 页大小 + public Result> GetEquipmentRecordTotalPageList(string equipmentName, string equipmentCode, string equipmentType, int page, int size) + { + var result = this._equipmentRecordRepository.GetEquipmentRecordTotalPageList(equipmentName, equipmentCode, equipmentType, page, size); + return result; + } + + /// + /// 获取设备状态记录统计列表 + /// + /// 设备名称 + /// 设备编号 + /// 设备类型 + public Result> GetEquipmentRecordTotalList(string equipmentName, string equipmentCode, string equipmentType) + { + var result = this._equipmentRecordRepository.GetEquipmentRecordTotalList(equipmentName, equipmentCode, equipmentType); + return result; + } + + /// + /// 获取设备状态记录月统计 + /// + /// + public Result> GetEquipmentRecordStateMonthTotal() + { + var result = this._equipmentRecordRepository.GetEquipmentRecordStateMonthTotal(); + return result; + } + + /// + /// 获取设备记录开炉次数月统计 + /// + /// + public Result> GetEquipmentRecordFurnaceMonthTotal() + { + var result = this._equipmentRecordRepository.GetEquipmentRecordFurnaceMonthTotal(); + return result; + } + #endregion } } diff --git a/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordDayTotal.cs b/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordDayTotal.cs index 5fd740f..f35abad 100644 --- a/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordDayTotal.cs +++ b/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordDayTotal.cs @@ -8,50 +8,8 @@ namespace PVDEMCS.Services.Models; /// 设备状态记录日统计 /// /// -public partial class EquipmentRecordDayTotal +public partial class EquipmentRecordDayTotal: EquipmentRecordTotal { - public string Id { get; set; } - - /// - /// 设备Id - /// - public string EquipmentId { get; set; } - - /// - /// 设备编码 - /// - public string EquipmentCode { get; set; } - - /// - /// 设备名称 - /// - public string EquipmentName { get; set; } - - /// - /// 设备类型：Ionbond，Balzers，Cemecon - /// - public string EquipmentType { get; set; } - - /// - /// 开炉次数 - /// - public int FurnaceNum { get; set; } - - /// - /// 总运行时长 - /// - public decimal TotalRunningTime { get; set; } - - /// - /// 总报警时长 - /// - public decimal TotalAlarmTime { get; set; } - - /// - /// 总待机时长 - /// - public decimal TotalStopTime { get; set; } - /// /// 日期 /// diff --git a/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordFurnaceMonthTotal.cs b/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordFurnaceMonthTotal.cs index 5c064c1..4fa973e 100644 --- a/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordFurnaceMonthTotal.cs +++ b/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordFurnaceMonthTotal.cs @@ -18,6 +18,6 @@ /// /// 日期 /// - public DateTime? TotalMonth { get; set; } + public string TotalMonth { get; set; } } } diff --git a/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordStateMonthTotal.cs b/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordStateMonthTotal.cs index 9eaea42..30382d4 100644 --- a/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordStateMonthTotal.cs +++ b/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordStateMonthTotal.cs @@ -23,6 +23,6 @@ /// /// 日期 /// - public DateTime? TotalMonth { get; set; } + public string TotalMonth { get; set; } } } diff --git a/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordTotal.cs b/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordTotal.cs new file mode 100644 index 0000000..23b541a --- /dev/null +++ b/PVDEMCS/PVDEMCS/Services/Models/EquipmentRecordTotal.cs @@ -0,0 +1,56 @@ + +using System; +using System.Collections.Generic; + +namespace PVDEMCS.Services.Models; + +/// +/// 设备状态记录统计 +/// +/// +public partial class EquipmentRecordTotal +{ + public string Id { get; set; } + + /// + /// 设备Id + /// + public string EquipmentId { get; set; } + + /// + /// 设备编码 + /// + public string EquipmentCode { get; set; } + + /// + /// 设备名称 + /// + public string EquipmentName { get; set; } + + /// + /// 设备类型：Ionbond，Balzers，Cemecon + /// + public string EquipmentType { get; set; } + + /// + /// 开炉次数 + /// + public int FurnaceNum { get; set; } + + /// + /// 总运行时长 + /// + public decimal TotalRunningTime { get; set; } + + /// + /// 总报警时长 + /// + public decimal TotalAlarmTime { get; set; } + + /// + /// 总待机时长 + /// + public decimal TotalStopTime { get; set; } + + +} \ No newline at end of file diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/Entities/EFContext.cs b/PVDEMCS/PVDEMCS/Services/Repositories/Entities/EFContext.cs index e5e4602..046cc46 100644 --- a/PVDEMCS/PVDEMCS/Services/Repositories/Entities/EFContext.cs +++ b/PVDEMCS/PVDEMCS/Services/Repositories/Entities/EFContext.cs @@ -30,6 +30,8 @@ public partial class EFContext : DbContext public virtual DbSet EquipmentRecords { get; set; } + public virtual DbSet EquipmentRecordDayTotals { get; set; } + public virtual DbSet EquipmentRecordTotals { get; set; } public virtual DbSet SysConfigs { get; set; } @@ -129,18 +131,18 @@ public partial class EFContext : DbContext entity.Property(e => e.CreateAt).HasComment("创建时间"); entity.Property(e => e.CreateBy).HasComment("创建者"); entity.Property(e => e.EndTime).HasComment("设备名称"); - entity.Property(e => e.EquipmentId).HasComment("设备类型：Ionbond，Balzers，Cemecon"); + entity.Property(e => e.EquipmentId).HasComment("设备id"); entity.Property(e => e.StartTime).HasComment("设备编码"); entity.Property(e => e.State).HasComment("设备状态,1：运行，2：待机，3：报警"); entity.Property(e => e.UpdateAt).HasComment("修改时间"); entity.Property(e => e.UpdateBy).HasComment("修改者"); }); - modelBuilder.Entity(entity => + modelBuilder.Entity(entity => { entity.HasKey(e => e.Id).HasName("PRIMARY"); - entity.ToTable("equipment_record_total", tb => tb.HasComment("设备状态记录日统计\r\n")); + entity.ToTable("equipment_record_day_total", tb => tb.HasComment("设备状态记录日统计\r\n")); entity.Property(e => e.CreateAt).HasComment("创建时间"); entity.Property(e => e.CreateBy).HasComment("创建者"); @@ -154,6 +156,23 @@ public partial class EFContext : DbContext entity.Property(e => e.UpdateBy).HasComment("修改者"); }); + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("PRIMARY"); + + entity.ToTable("equipment_record_total", tb => tb.HasComment("设备状态记录统计\r\n")); + + entity.Property(e => e.CreateAt).HasComment("创建时间"); + entity.Property(e => e.CreateBy).HasComment("创建者"); + entity.Property(e => e.EquipmentId).HasComment("设备Id"); + entity.Property(e => e.FurnaceNum).HasComment("开炉次数"); + entity.Property(e => e.TotalAlarmTime).HasComment("总报警时长"); + entity.Property(e => e.TotalStopTime).HasComment("总待机时长"); + entity.Property(e => e.TotalRunningTime).HasComment("总运行时长"); + entity.Property(e => e.UpdateAt).HasComment("修改时间"); + entity.Property(e => e.UpdateBy).HasComment("修改者"); + }); + modelBuilder.Entity(entity => { entity.HasKey(e => e.Id).HasName("PRIMARY"); diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/Entities/EquipmentRecordDayTotalEntity.cs b/PVDEMCS/PVDEMCS/Services/Repositories/Entities/EquipmentRecordDayTotalEntity.cs new file mode 100644 index 0000000..85a7c0c --- /dev/null +++ b/PVDEMCS/PVDEMCS/Services/Repositories/Entities/EquipmentRecordDayTotalEntity.cs @@ -0,0 +1,60 @@ +// This file has been auto generated by EF Core Power Tools. +#nullable disable +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using PVDEMCS.Services.Repositories.Entities.BaseEntity; + +namespace PVDEMCS.Services.Repositories.Entities; + + +/// +/// 设备状态记录日统计 +/// +/// +[Table("equipment_record_day_total")] +public partial class EquipmentRecordDayTotalEntity : CUBaseEntity +{ + /// + /// 设备Id + /// + [Required] + [Column("equipment_id")] + [StringLength(32)] + public string EquipmentId { get; set; } + + /// + /// 开炉次数 + /// + [Column("furnace_num")] + public int FurnaceNum { get; set; } + + /// + /// 总运行时长 + /// + [Column("total_running_time")] + [Precision(32, 2)] + public decimal TotalRunningTime { get; set; } + + /// + /// 总报警时长 + /// + [Column("total_alarm_time")] + [Precision(32, 2)] + public decimal TotalAlarmTime { get; set; } + + /// + /// 总待机时长 + /// + [Column("total_stop_time")] + [Precision(32, 2)] + public decimal TotalStopTime { get; set; } + /// + /// 日期 + /// + [Column("total_day", TypeName = "datetime")] + public DateTime? TotalDay { get; set; } + +} \ No newline at end of file diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/Entities/EquipmentRecordTotalEntity.cs b/PVDEMCS/PVDEMCS/Services/Repositories/Entities/EquipmentRecordTotalEntity.cs index ce35b5f..53d9dc9 100644 --- a/PVDEMCS/PVDEMCS/Services/Repositories/Entities/EquipmentRecordTotalEntity.cs +++ b/PVDEMCS/PVDEMCS/Services/Repositories/Entities/EquipmentRecordTotalEntity.cs @@ -53,10 +53,4 @@ public partial class EquipmentRecordTotalEntity : CUBaseEntity [Precision(32, 2)] public decimal TotalStopTime { get; set; } - /// - /// 日期 - /// - [Column("total_day", TypeName = "datetime")] - public DateTime? TotalDay { get; set; } - } \ No newline at end of file diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/IEquipmentRecordRepository.cs b/PVDEMCS/PVDEMCS/Services/Repositories/IEquipmentRecordRepository.cs index 8fdc435..b89e8f7 100644 --- a/PVDEMCS/PVDEMCS/Services/Repositories/IEquipmentRecordRepository.cs +++ b/PVDEMCS/PVDEMCS/Services/Repositories/IEquipmentRecordRepository.cs @@ -5,6 +5,7 @@ using PVDEMCS.Common; using PVDEMCS.Common.DI; using PVDEMCS.Services.Models; using PVDEMCS.Services.Repositories.Entities; +using Microsoft.EntityFrameworkCore; namespace PVDEMCS.Services.Repositories { @@ -74,7 +75,7 @@ namespace PVDEMCS.Services.Repositories Result> GetEquipmentRecordDayTotalPageList(string equipmentName, string equipmentCode, string equipmentType, DateTime begTime, DateTime endTime, int page, int size); /// - /// 获取设备状态记录统计列表 + /// 获取设备状态记录日统计列表 /// /// 设备名称 /// 设备编号 @@ -83,7 +84,35 @@ namespace PVDEMCS.Services.Repositories /// 结束时间 Result> GetEquipmentRecordDayTotalList(string equipmentName, string equipmentCode, string equipmentType, DateTime begTime, DateTime endTime); - + /// + /// 获取设备状态记录统计分页列表 + /// + /// 设备名称 + /// 设备编号 + /// 设备类型 + /// 当前页 + /// 页大小 + Result> GetEquipmentRecordTotalPageList(string equipmentName, string equipmentCode, string equipmentType, int page, int size); + + /// + /// 获取设备状态记录统计列表 + /// + /// 设备名称 + /// 设备编号 + /// 设备类型 + Result> GetEquipmentRecordTotalList(string equipmentName, string equipmentCode, string equipmentType); + + /// + /// 获取设备状态记录月统计 + /// + /// + Result> GetEquipmentRecordStateMonthTotal(); + + /// + /// 获取设备记录开炉次数月统计 + /// + /// + Result> GetEquipmentRecordFurnaceMonthTotal(); #endregion } diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs index 40b781a..73ad16f 100644 --- a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs +++ b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs @@ -1,11 +1,13 @@ using AngleSharp.Css.Values; using Masuit.Tools; using Masuit.Tools.Models; +using Microsoft.EntityFrameworkCore; using PVDEMCS.Common; using PVDEMCS.Common.Constant; using PVDEMCS.Common.DI; using PVDEMCS.Services.Models; using PVDEMCS.Services.Repositories.Entities; +using System.Text.RegularExpressions; namespace PVDEMCS.Services.Repositories.Impl { @@ -195,7 +197,7 @@ namespace PVDEMCS.Services.Repositories.Impl } // var furnaceList = (from q in query - join e in context.EquipmentInfos.Where(f=>!f.IsDelete) on q.EquipmentId equals e.Id + join e in context.EquipmentInfos.Where(f => !f.IsDelete) on q.EquipmentId equals e.Id where q.State == EquipmentState.Run select new { @@ -244,7 +246,7 @@ namespace PVDEMCS.Services.Repositories.Impl } } //记录统计时间 - var list = context.EquipmentRecordTotals.Where(f => f.TotalDay == begDate).ToList(); + var list = context.EquipmentRecordDayTotals.Where(f => f.TotalDay == begDate).ToList(); //有记录 foreach (var item in list) { @@ -274,7 +276,7 @@ namespace PVDEMCS.Services.Repositories.Impl foreach (var equipmentId in notRecords.Select(f => f.EquipmentId).Distinct()) { var records = total.Where(f => f.EquipmentId == equipmentId).ToList(); - var item = new EquipmentRecordTotalEntity + var item = new EquipmentRecordDayTotalEntity { EquipmentId = equipmentId, TotalDay = begDate @@ -298,7 +300,7 @@ namespace PVDEMCS.Services.Repositories.Impl } item.Create(); } - context.EquipmentRecordTotals.Add(item); + context.EquipmentRecordDayTotals.Add(item); } context.SaveChanges(); @@ -318,7 +320,7 @@ namespace PVDEMCS.Services.Repositories.Impl #region 设备记录统计 /// - /// 获取设备状态记录统计分页列表 + /// 获取设备状态记录日统计分页列表 /// /// 设备名称 /// 设备编号 @@ -331,7 +333,7 @@ namespace PVDEMCS.Services.Repositories.Impl { using (var context = new EFContext()) { - var query = QueryEquipmentRecordTotal(equipmentName, equipmentCode, equipmentType, begTime, endTime, context); + var query = QueryEquipmentRecordDayTotal(equipmentName, equipmentCode, equipmentType, begTime, endTime, context); var pageList = query.OrderByDescending(f => f.EquipmentCode).ToPagedList(page, size); @@ -340,7 +342,7 @@ namespace PVDEMCS.Services.Repositories.Impl } /// - /// 获取设备状态记录统计列表 + /// 获取设备状态记录日统计列表 /// /// 设备名称 /// 设备编号 @@ -351,7 +353,7 @@ namespace PVDEMCS.Services.Repositories.Impl { using (var context = new EFContext()) { - var query = QueryEquipmentRecordTotal(equipmentName, equipmentCode, equipmentType, begTime, endTime, context); + var query = QueryEquipmentRecordDayTotal(equipmentName, equipmentCode, equipmentType, begTime, endTime, context); var pageList = query.OrderByDescending(f => f.EquipmentCode).ToList(); @@ -359,32 +361,83 @@ namespace PVDEMCS.Services.Repositories.Impl } } + private IQueryable QueryEquipmentRecordDayTotal(string equipmentName, string equipmentCode, string equipmentType, DateTime begTime, DateTime endTime, EFContext context) + { + var query = from recordTotal in context.EquipmentRecordDayTotals + join equipment in context.EquipmentInfos.Where(f => !f.IsDelete) on recordTotal.EquipmentId equals equipment.Id + select new EquipmentRecordDayTotal + { + Id = recordTotal.Id, + EquipmentName = equipment.EquipmentName, + EquipmentCode = equipment.EquipmentCode, + EquipmentType = equipment.EquipmentType, + FurnaceNum = recordTotal.FurnaceNum, + TotalAlarmTime = recordTotal.TotalAlarmTime, + TotalStopTime = recordTotal.TotalStopTime, + TotalRunningTime = recordTotal.TotalRunningTime, + TotalDay = recordTotal.TotalDay, + }; + + if (!equipmentName.IsNullOrEmpty()) + { + query = query.Where(f => f.EquipmentName.StartsWith(equipmentName)); + } + if (!equipmentCode.IsNullOrEmpty()) + { + query = query.Where(f => f.EquipmentCode.StartsWith(equipmentCode)); + } + if (!equipmentType.IsNullOrEmpty()) + { + query = query.Where(f => f.EquipmentType == equipmentType); + } + query = query.Where(f => f.TotalDay >= begTime && f.TotalDay <= endTime); + + return query; + } + /// - /// 获取设备状态记录月统计 + /// 获取设备状态记录统计分页列表 /// - /// - public Result> GetEquipmentRecordStateMonthTotal() + /// 设备名称 + /// 设备编号 + /// 设备类型 + /// 当前页 + /// 页大小 + public Result> GetEquipmentRecordTotalPageList(string equipmentName, string equipmentCode, string equipmentType, int page, int size) { using (var context = new EFContext()) - { } + { + var query = QueryEquipmentRecordTotal(equipmentName, equipmentCode, equipmentType, context); + + var pageList = query.OrderByDescending(f => f.EquipmentCode).ToPagedList(page, size); - return null; + return new Result>(pageList); + } } /// - /// 获取设备记录开炉次数月统计 + /// 获取设备状态记录统计列表 /// - /// - public Result> GetEquipmentRecordFurnaceMonthTotal() + /// 设备名称 + /// 设备编号 + /// 设备类型 + public Result> GetEquipmentRecordTotalList(string equipmentName, string equipmentCode, string equipmentType) { - return null; + using (var context = new EFContext()) + { + var query = QueryEquipmentRecordTotal(equipmentName, equipmentCode, equipmentType, context); + + var pageList = query.OrderByDescending(f => f.EquipmentCode).ToList(); + + return new Result>(pageList); + } } - private IQueryable QueryEquipmentRecordTotal(string equipmentName, string equipmentCode, string equipmentType, DateTime begTime, DateTime endTime, EFContext context) + private IQueryable QueryEquipmentRecordTotal(string equipmentName, string equipmentCode, string equipmentType, EFContext context) { - var query = from recordTotal in context.EquipmentRecordTotals + var query = from recordTotal in context.EquipmentRecordDayTotals join equipment in context.EquipmentInfos.Where(f => !f.IsDelete) on recordTotal.EquipmentId equals equipment.Id - select new EquipmentRecordDayTotal + select new EquipmentRecordTotal { Id = recordTotal.Id, EquipmentName = equipment.EquipmentName, @@ -394,7 +447,6 @@ namespace PVDEMCS.Services.Repositories.Impl TotalAlarmTime = recordTotal.TotalAlarmTime, TotalStopTime = recordTotal.TotalStopTime, TotalRunningTime = recordTotal.TotalRunningTime, - TotalDay = recordTotal.TotalDay, }; if (!equipmentName.IsNullOrEmpty()) @@ -409,11 +461,74 @@ namespace PVDEMCS.Services.Repositories.Impl { query = query.Where(f => f.EquipmentType == equipmentType); } - query = query.Where(f => f.TotalDay >= begTime && f.TotalDay <= endTime); return query; } + /// + /// 获取设备状态记录月统计 + /// + /// + public Result> GetEquipmentRecordStateMonthTotal() + { + //获取今年第一天和最后一天 + var begDate = DateTime.Now.ToString("yyyy-01-01"); + var endDate = DateTime.Parse(begDate).AddYears(1).AddSeconds(-1).ToString("yyyy-01-01"); + using (var context = new EFContext()) + { + var list = context.Database.SqlQuery(@$"SELECT + SUM(total_running_time) AS TotalRunningTime, + SUM(total_alarm_time) AS TotalAlarmTime, + SUM(total_stop_time) AS TotalStopTime, + MONTH(total_day) AS TotalMonth + FROM + + equipment_record_total + WHERE + + total_day >= '{begDate}' + + AND total_day <= '{endDate}' + GROUP BY + TotalMonth").ToList(); + + return new Result>(list); + } + + } + + /// + /// 获取设备记录开炉次数月统计 + /// + /// + public Result> GetEquipmentRecordFurnaceMonthTotal() + { + //获取今年第一天和最后一天 + var begDate = DateTime.Now.ToString("yyyy-01-01"); + var endDate = DateTime.Parse(begDate).AddYears(1).AddSeconds(-1).ToString("yyyy-01-01"); + using (var context = new EFContext()) + { + var list = context.Database.SqlQuery(@$"SELECT + SUM( furnace_num ) AS FurnaceNum, + equipment_info.equipment_type AS EquipmentType, + MONTH ( total_day ) AS TotalMonth + FROM + equipment_record_total + JOIN equipment_info ON equipment_record_total.equipment_id = equipment_info.id + WHERE + total_day >= '{begDate}' + AND total_day <= '{endDate}' + GROUP BY + TotalMonth, + EquipmentType").ToList(); + + return new Result>(list); + } + } + + + + #endregion } } From ad76f74bad386b80c4cee798be150537337fb612 Mon Sep 17 00:00:00 2001 From: xiaoguo Date: Wed, 1 Nov 2023 15:25:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20sql=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SQL/pvdemcs.sql | 50 ++++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/SQL/pvdemcs.sql b/SQL/pvdemcs.sql index a5bee8b..9493a7a 100644 --- a/SQL/pvdemcs.sql +++ b/SQL/pvdemcs.sql @@ -11,7 +11,7 @@ Target Server Version : 80034 File Encoding : 65001 - Date: 30/10/2023 00:17:45 + Date: 01/11/2023 15:24:59 */ SET NAMES utf8mb4; @@ -40,10 +40,6 @@ CREATE TABLE `device_info` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'PLC控制器' ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Records of device_info --- ---------------------------- - -- ---------------------------- -- Table structure for device_point -- ---------------------------- @@ -69,10 +65,6 @@ CREATE TABLE `device_point` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'PLC点位' ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Records of device_point --- ---------------------------- - -- ---------------------------- -- Table structure for equipment_info -- ---------------------------- @@ -94,10 +86,6 @@ CREATE TABLE `equipment_info` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备信息' ROW_FORMAT = Dynamic; --- ---------------------------- --- Records of equipment_info --- ---------------------------- - -- ---------------------------- -- Table structure for equipment_record -- ---------------------------- @@ -116,8 +104,23 @@ CREATE TABLE `equipment_record` ( ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备状态记录明显' ROW_FORMAT = Dynamic; -- ---------------------------- --- Records of equipment_record +-- Table structure for equipment_record_day_total -- ---------------------------- +DROP TABLE IF EXISTS `equipment_record_day_total`; +CREATE TABLE `equipment_record_day_total` ( + `id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, + `equipment_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '设备Id', + `furnace_num` int NOT NULL COMMENT '开炉次数', + `total_running_time` decimal(32, 2) NOT NULL COMMENT '总运行时长', + `total_alarm_time` decimal(32, 2) NOT NULL COMMENT '总报警时长', + `total_stop_time` decimal(32, 2) NOT NULL COMMENT '总待机时长', + `total_day` datetime NULL DEFAULT NULL COMMENT '日期', + `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '创建者', + `create_at` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '修改者', + `update_at` datetime NULL DEFAULT NULL COMMENT '修改时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备状态记录日统计\r\n' ROW_FORMAT = Dynamic; -- ---------------------------- -- Table structure for equipment_record_total @@ -130,17 +133,12 @@ CREATE TABLE `equipment_record_total` ( `total_running_time` decimal(32, 2) NOT NULL COMMENT '总运行时长', `total_alarm_time` decimal(32, 2) NOT NULL COMMENT '总报警时长', `total_stop_time` decimal(32, 2) NOT NULL COMMENT '总待机时长', - `total_day` datetime NULL DEFAULT NULL COMMENT '日期', `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '创建者', `create_at` datetime NULL DEFAULT NULL COMMENT '创建时间', `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '修改者', `update_at` datetime NULL DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备状态记录日统计\r\n' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of equipment_record_total --- ---------------------------- +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备状态记录统计\r\n' ROW_FORMAT = Dynamic; -- ---------------------------- -- Table structure for sys_config @@ -161,11 +159,7 @@ CREATE TABLE `sys_config` ( `delete_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '删除者', `delete_at` datetime NULL DEFAULT NULL COMMENT '删除时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 120 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '参数配置表' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of sys_config --- ---------------------------- +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '参数配置表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Table structure for sys_user @@ -194,10 +188,6 @@ CREATE TABLE `sys_user` ( `delete_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '删除者', `delete_at` datetime NULL DEFAULT NULL COMMENT '删除时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户信息表' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of sys_user --- ---------------------------- +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户信息表' ROW_FORMAT = DYNAMIC; SET FOREIGN_KEY_CHECKS = 1;