日常提交

PVDEMCS/PVDEMCS/Common/Constant/Constant.cs

@@ -0,0 +1,18 @@
+namespace PVDEMCS.Common.Constant
+{
+    /// <summary>
+    /// 点位所属动作
+    /// </summary>
+    public sealed class ActionType
+    {
+        /// <summary>
+        /// 启动停止
+        /// </summary>
+        public const  String StartStop = "StartStop";
+
+        /// <summary>
+        /// 故障
+        /// </summary>
+        public const String Fault = "Fault";
+    }
+}

PVDEMCS/PVDEMCS/Services/Models/DevicePoint.cs

@@ -17,6 +17,36 @@ public partial class DevicePoint
     /// </summary>
     public string DeviceId { get; set; }
 
+    /// <summary>
+    /// 控制器编号
+    /// </summary>
+    public string DeviceCode { get; set; }
+
+    /// <summary>
+    /// 控制器名称
+    /// </summary>
+    public string DeviceName { get; set; }
+
+    /// <summary>
+    /// 设备编码
+    /// </summary>
+    public string EquipmentId { get; set; }
+
+    /// <summary>
+    /// 设备编码
+    /// </summary>
+    public string EquipmentCode { get; set; }
+
+    /// <summary>
+    /// 设备名称
+    /// </summary>
+    public string EquipmentName { get; set; }
+
+    /// <summary>
+    /// 设备类型：Ionbond，Balzers，Cemecon
+    /// </summary>
+    public string EquipmentType { get; set; }
+
     /// <summary>
     /// 点位编号
     /// </summary>
@@ -35,12 +65,12 @@ public partial class DevicePoint
     /// <summary>
     /// 字段类型
     /// </summary>
-    public string Type { get; set; }
+    public string DataType { get; set; }
 
     /// <summary>
     /// PLC 点位是否启用 (1 启用, 0 禁用)
     /// </summary>
-    public ulong Activated { get; set; }
+    public bool Activated { get; set; }
 
     /// <summary>
     /// 备注

PVDEMCS/PVDEMCS/Services/Models/EquipmentRecord.cs

@@ -13,10 +13,25 @@ public partial class EquipmentRecord
     public string Id { get; set; }
 
     /// <summary>
-    /// 设备类型：Ionbond，Balzers，Cemecon
+    /// 设备ID
     /// </summary>
     public string EquipmentId { get; set; }
 
+    /// <summary>
+    /// 设备编码
+    /// </summary>
+    public string EquipmentCode { get; set; }
+
+    /// <summary>
+    /// 设备名称
+    /// </summary>
+    public string EquipmentName { get; set; }
+
+    /// <summary>
+    /// 设备类型：Ionbond，Balzers，Cemecon
+    /// </summary>
+    public string EquipmentType { get; set; }
+
     /// <summary>
     /// 设备编码
     /// </summary>

PVDEMCS/PVDEMCS/Services/Repositories/Entities/DevicePointEntity.cs

@@ -24,6 +24,14 @@ public partial class DevicePointEntity : CUDBaseEntity
     [StringLength(64)]
     public string DeviceId { get; set; }
 
+    /// <summary>
+    /// 设备Id
+    /// </summary>
+    [Required]
+    [Column("equipment_id")]
+    [StringLength(64)]
+    public string EquipmentId { get; set; }
+
     /// <summary>
     /// 点位编号
     /// </summary>
@@ -52,15 +60,23 @@ public partial class DevicePointEntity : CUDBaseEntity
     /// 字段类型
     /// </summary>
     [Required]
-    [Column("type")]
+    [Column("data_type")]
+    [StringLength(32)]
+    public string DataType { get; set; }
+
+    /// <summary>
+    /// 点位所属动作，启动停止：start_stop；故障：fault
+    /// </summary>
+    [Required]
+    [Column("action_type")]
     [StringLength(32)]
-    public string Type { get; set; }
+    public string ActionType { get; set; }
 
     /// <summary>
     /// PLC 点位是否启用 (1 启用, 0 禁用)
     /// </summary>
     [Column("activated", TypeName = "bit(1)")]
-    public ulong Activated { get; set; }
+    public bool Activated { get; set; }
 
     /// <summary>
     /// 备注

PVDEMCS/PVDEMCS/Services/Repositories/Entities/EFContext.cs

@@ -87,13 +87,11 @@ public partial class EFContext : DbContext
             entity.Property(e => e.DeleteAt).HasComment("删除时间");
             entity.Property(e => e.DeleteBy).HasComment("删除者");
             entity.Property(e => e.DeviceId).HasComment("控制器Id");
-            entity.Property(e => e.IsDelete)
-                .HasDefaultValueSql("b'0'")
-                .HasComment("是否删除");
+            entity.Property(e => e.IsDelete).HasDefaultValueSql("b'0'").HasComment("是否删除");
             entity.Property(e => e.PointCode).HasComment("点位编号");
             entity.Property(e => e.PointName).HasComment("点位名称");
             entity.Property(e => e.Remark).HasComment("备注");
-            entity.Property(e => e.Type).HasComment("字段类型");
+            entity.Property(e => e.DataType).HasComment("字段类型");
             entity.Property(e => e.UpdateAt).HasComment("修改时间");
             entity.Property(e => e.UpdateBy).HasComment("修改者");
         });
@@ -158,11 +156,11 @@ public partial class EFContext : DbContext
 
         modelBuilder.Entity<SysConfigEntity>(entity =>
         {
-            entity.HasKey(e => e.ConfigId).HasName("PRIMARY");
+            entity.HasKey(e => e.Id).HasName("PRIMARY");
 
             entity.ToTable("sys_config", tb => tb.HasComment("参数配置表"));
 
-            entity.Property(e => e.ConfigId).HasComment("参数主键");
+            entity.Property(e => e.Id).HasComment("参数主键");
             entity.Property(e => e.ConfigKey)
                 .HasDefaultValueSql("''")
                 .HasComment("参数键名");
@@ -194,11 +192,11 @@ public partial class EFContext : DbContext
 
         modelBuilder.Entity<SysUserEntity>(entity =>
         {
-            entity.HasKey(e => e.UserId).HasName("PRIMARY");
+            entity.HasKey(e => e.Id).HasName("PRIMARY");
 
             entity.ToTable("sys_user", tb => tb.HasComment("用户信息表"));
 
-            entity.Property(e => e.UserId).HasComment("用户ID");
+            entity.Property(e => e.Id).HasComment("用户ID");
             entity.Property(e => e.Avatar)
                 .HasDefaultValueSql("''")
                 .HasComment("头像地址");

PVDEMCS/PVDEMCS/Services/Repositories/Entities/EquipmentInfoEntity.cs

@@ -42,7 +42,7 @@ public partial class EquipmentInfoEntity : CUDBaseEntity
     /// 设备状态,1：启用，0：停用
     /// </summary>
     [Column("activated", TypeName = "bit(1)")]
-    public ulong Activated { get; set; }
+    public bool Activated { get; set; }
 
     /// <summary>
     /// 备注

PVDEMCS/PVDEMCS/Services/Repositories/IDeviceRepository.cs

@@ -3,6 +3,7 @@ using Masuit.Tools;
 using PVDEMCS.Common;
 using PVDEMCS.Common.DI;
 using PVDEMCS.Services.Repositories.Entities;
+using PVDEMCS.Services.Models;
 
 namespace PVDEMCS.Services.Repositories
 {
@@ -64,22 +65,30 @@ namespace PVDEMCS.Services.Repositories
         /// <summary>
         /// 获取PLC控制器点位分页列表
         /// </summary>
-        /// <param name="deviceId">控制器Id</param>
+        /// <param name="deviceCode">控制器编号</param>
+        /// <param name="deviceName">控制器名称</param>
+        /// <param name="equipmentName">设备名称</param>
+        /// <param name="equipmentCode">设备编号</param>
+        /// <param name="equipmentType">设备类型</param>
         /// <param name="pointCode">点位编号</param>
         /// <param name="pointName">点位列表</param>
         /// <param name="page">当前页</param>
         /// <param name="size">页大小</param>
         /// <returns></returns>
-        Result<PagedList<DevicePointEntity>> GetDevicePointPageList(string deviceId, string pointCode, string pointName, int page, int size);
+        Result<PagedList<DevicePoint>> GetDevicePointPageList(string deviceName, string deviceCode, string equipmentName, string equipmentCode, string equipmentType, string pointCode, string pointName, bool? activated, int page, int size);
 
         /// <summary>
-        /// 获取PLC控制器点位分页列表
+        /// 获取PLC控制器点位列表
         /// </summary>
-        /// <param name="deviceId">控制器Id</param>
+        /// <param name="deviceCode">控制器编号</param>
+        /// <param name="deviceName">控制器名称</param>
+        /// <param name="equipmentName">设备名称</param>
+        /// <param name="equipmentCode">设备编号</param>
+        /// <param name="equipmentType">设备类型</param>
         /// <param name="pointCode">点位编号</param>
         /// <param name="pointName">点位列表</param>
         /// <returns></returns>
-        List<DevicePointEntity> GetDevicePointList(string deviceId, string pointCode, string pointName);
+        List<DevicePoint> GetDevicePointList(string deviceName, string deviceCode, string equipmentName, string equipmentCode, string equipmentType, string pointCode, string pointName, bool? activated);
 
         /// <summary>
         /// 获取PLC控制器点位明细

PVDEMCS/PVDEMCS/Services/Repositories/IEquipmentRepository.cs

@@ -1,4 +1,8 @@
-using PVDEMCS.Common.DI;
+using Masuit.Tools.Models;
+using Masuit.Tools;
+using PVDEMCS.Common;
+using PVDEMCS.Common.DI;
+using PVDEMCS.Services.Repositories.Entities;
 
 namespace PVDEMCS.Services.Repositories
 {
@@ -7,6 +11,52 @@ namespace PVDEMCS.Services.Repositories
      */
     public interface IEquipmentRepository : IDependency
     {
+        /// <summary>
+        /// 获取设备分页列表
+        /// </summary>
+        /// <param name="equipmentName">设备名称</param>
+        /// <param name="equipmentCode">设备编号</param>
+        /// <param name="equipmentType">设备类型</param>
+        /// <param name="activated">是否启用</param>
+        /// <param name="page">当前页</param>
+        /// <param name="size">页大小</param>
+        /// <returns></returns>
+        Result<PagedList<EquipmentInfoEntity>> GetEquipmentPageList(string equipmentName, string equipmentCode, string equipmentType, bool? activated, int page, int size);
 
+        /// <summary>
+        /// 获取设备列表
+        /// </summary>
+        /// <param name="equipmentName">设备名称</param>
+        /// <param name="equipmentCode">设备编号</param>
+        /// <param name="activated">是否启用</param>
+        Result<List<EquipmentInfoEntity>> GetEquipmentList(string equipmentName, string equipmentCode, bool? activated);
+
+        /// <summary>
+        /// 获取设备明显
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Result<EquipmentInfoEntity> GetEquipmentDetail(string id);
+
+        /// <summary>
+        /// 添加设备信息
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Result AddEquipment(EquipmentInfoEntity entity);
+
+        /// <summary>
+        /// 更新设备信息
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Result UpdateEquipment(EquipmentInfoEntity entity);
+
+        /// <summary>
+        /// 删除设备信息
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Result DeleteEquipment(string id);
     }
 }

PVDEMCS/PVDEMCS/Services/Repositories/ISysConfigRepository.cs

@@ -1,4 +1,8 @@
-using PVDEMCS.Common.DI;
+using Masuit.Tools.Models;
+using Masuit.Tools;
+using PVDEMCS.Common;
+using PVDEMCS.Common.DI;
+using PVDEMCS.Services.Repositories.Entities;
 
 namespace PVDEMCS.Services.Repositories
 {
@@ -7,6 +11,49 @@ namespace PVDEMCS.Services.Repositories
      */
     public interface ISysConfigRepository : IDependency
     {
+        /// <summary>
+        /// 获取系统参数设置分页列表
+        /// </summary>
+        /// <param name="configName">参数名称</param>
+        /// <param name="configKey">参数键值</param>
+        /// <param name="page">当前页</param>
+        /// <param name="size">页大小</param>
+        /// <returns></returns>
+        Result<PagedList<SysConfigEntity>> GetSysConfigPageList(string configName, string configKey, int page, int size);
 
+        /// <summary>
+        /// 获取系统参数设置列表
+        /// </summary>
+        /// <param name="configName">参数名称</param>
+        /// <param name="configKey">参数键值</param>
+        /// <returns></returns>
+        Result<List<SysConfigEntity>> GetSysConfigList(string configName, string configKey);
+
+        /// <summary>
+        /// 获取获取系统参数设置明细
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Result<SysConfigEntity> GetSysConfigDetail(string id);
+
+        /// <summary>
+        /// 添加系统参数设置
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Result AddSysConfig(SysConfigEntity entity);
+
+        /// <summary>
+        /// 更新系统参数设置
+        /// </summary>
+        /// <param name="entity"></param>
+
+        Result UpdateSysConfig(SysConfigEntity entity);
+
+        /// <summary>
+        /// 删除系统参数设置
+        /// </summary>
+        /// <param name="id"></param>
+        Result DeleteSysConfig(string id);
     }
 }

PVDEMCS/PVDEMCS/Services/Repositories/Impl/DeviceRepository.cs

@@ -3,7 +3,9 @@ using Masuit.Tools;
 using Masuit.Tools.Models;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using PVDEMCS.Common;
+using PVDEMCS.Common.Constant;
 using PVDEMCS.Common.DI;
+using PVDEMCS.Services.Models;
 using PVDEMCS.Services.Repositories.Entities;
 using SharpCompress.Common;
 using System;
@@ -44,9 +46,10 @@ namespace PVDEMCS.Services.Repositories.Impl
                 {
                     query = query.Where(f => f.Activated == activated.Value);
                 }
-                var result = query.OrderBy(f => f.CreateAt).ToPagedList(page, size);
+                var result = query.OrderBy(f => f.DeviceCode).ToPagedList(page, size);
 
                 return new Result<PagedList<DeviceInfoEntity>>(result);
+
             }
         }
 
@@ -74,7 +77,7 @@ namespace PVDEMCS.Services.Repositories.Impl
                 {
                     query = query.Where(f => f.Activated == activated.Value);
                 }
-                var result = query.OrderBy(f => f.CreateAt).ToList();
+                var result = query.OrderBy(f => f.DeviceCode).ToList();
 
                 return new Result<List<DeviceInfoEntity>>(result);
             }
@@ -92,12 +95,12 @@ namespace PVDEMCS.Services.Repositories.Impl
                 var result = new Result<DeviceInfoEntity>();
 
                 var detail = context.DeviceInfos.Where(f => f.Id == id).FirstOrDefault();
-                if (detail == null) 
+                if (detail == null)
                 {
-                    result.Message = $"没有找到Id:{id}的数据";
+                    result.Message = $"没有找到Id:【{id}】的数据";
                     return result;
                 }
-                result.Content= detail;
+                result.Content = detail;
                 return result;
             }
         }
@@ -116,12 +119,12 @@ namespace PVDEMCS.Services.Repositories.Impl
                 var query = context.DeviceInfos.Where(f => !f.IsDelete);
                 if (query.Where(f => f.DeviceName == entity.DeviceName).FirstOrDefault() != null)
                 {
-                    result.Message = $"已存在名称为:{entity.DeviceName}的PLC控制器";
+                    result.Message = $"没有找到Id:【{entity.DeviceName}】的数据";
                     return result;
                 }
                 if (query.Where(f => f.DeviceCode == entity.DeviceCode).FirstOrDefault() != null)
                 {
-                    result.Message = $"已存在编号为:{entity.DeviceCode}的PLC控制器";
+                    result.Message = $"没有找到Id:【{entity.DeviceCode}】的数据";
                     return result;
                 }
 
@@ -148,17 +151,17 @@ namespace PVDEMCS.Services.Repositories.Impl
                 var update = query.Where(f => f.Id == entity.Id).FirstOrDefault();
                 if (update == null)
                 {
-                    result.Message = $"没有找到Id:{entity.Id}的数据";
+                    result.Message = $"没有找到Id:【{entity.Id}】的数据";
                     return result;
                 }
                 if (query.Where(f => f.DeviceName == entity.DeviceName && f.Id != entity.Id).FirstOrDefault() != null)
                 {
-                    result.Message = $"已存在名称为:{entity.DeviceName}的PLC控制器";
+                    result.Message = $"没有找到Id:【{entity.DeviceName}】的数据";
                     return result;
                 }
                 if (query.Where(f => f.DeviceCode == entity.DeviceCode && f.Id != entity.Id).FirstOrDefault() != null)
                 {
-                    result.Message = $"已存在编号为:{entity.DeviceCode}的PLC控制器";
+                    result.Message = $"没有找到Id:【{entity.DeviceCode}】的数据";
                     return result;
                 }
 
@@ -175,6 +178,7 @@ namespace PVDEMCS.Services.Repositories.Impl
                 return result;
             }
         }
+
         /// <summary>
         /// 删除PLC控制器
         /// </summary>
@@ -187,7 +191,7 @@ namespace PVDEMCS.Services.Repositories.Impl
                 var entity = context.DeviceInfos.Where(f => f.Id == id).FirstOrDefault();
                 if (entity == null)
                 {
-                    result.Message = $"没有找到Id:{id}的数据";
+                    result.Message = $"没有找到Id:【{id}】的数据";
                     return result;
 
                 }
@@ -207,64 +211,105 @@ namespace PVDEMCS.Services.Repositories.Impl
         /// <summary>
         /// 获取PLC控制器点位分页列表
         /// </summary>
-        /// <param name="deviceId">控制器Id</param>
+        /// <param name="deviceCode">控制器编号</param>
+        /// <param name="deviceName">控制器名称</param>
+        /// <param name="equipmentName">设备名称</param>
+        /// <param name="equipmentCode">设备编号</param>
+        /// <param name="equipmentType">设备类型</param>
         /// <param name="pointCode">点位编号</param>
         /// <param name="pointName">点位列表</param>
         /// <param name="page">当前页</param>
         /// <param name="size">页大小</param>
         /// <returns></returns>
-        public Result<PagedList<DevicePointEntity>> GetDevicePointPageList(string deviceId, string pointCode, string pointName, int page, int size)
+        public Result<PagedList<DevicePoint>> GetDevicePointPageList(string deviceName, string deviceCode, string equipmentName, string equipmentCode, string equipmentType, string pointCode, string pointName, bool? activated, int page, int size)
         {
             using (var context = new EFContext())
             {
-                var query = context.DevicePoints.Where(f => !f.IsDelete);
-                if (!deviceId.IsNullOrEmpty())
-                {
-                    query = query.Where(f => f.DeviceId == deviceId);
-                }
-                if (!pointCode.IsNullOrEmpty())
-                {
-                    query = query.Where(f => f.PointCode.StartsWith(pointCode));
-                }
-                if (!pointName.IsNullOrEmpty())
-                {
-                    query = query.Where(f => f.PointName.StartsWith(pointName));
-                }
-                var pageList = query.OrderBy(f => f.CreateAt).ToPagedList(page, size);
-                return new Result<PagedList<DevicePointEntity>>(pageList);
+                var query = DeviceQuery(deviceName, deviceCode, equipmentName, equipmentCode, equipmentType, pointCode, pointName, activated, context);
+                var pageList = query.OrderBy(f => f.PointCode).ToPagedList(page, size);
+                return new Result<PagedList<DevicePoint>>(pageList);
             }
         }
 
-
         /// <summary>
-        /// 获取PLC控制器点位分页列表
+        /// 获取PLC控制器点位列表
         /// </summary>
-        /// <param name="deviceId">控制器Id</param>
+        /// <param name="deviceCode">控制器编号</param>
+        /// <param name="deviceName">控制器名称</param>
+        /// <param name="equipmentName">设备名称</param>
+        /// <param name="equipmentCode">设备编号</param>
+        /// <param name="equipmentType">设备类型</param>
         /// <param name="pointCode">点位编号</param>
         /// <param name="pointName">点位列表</param>
         /// <returns></returns>
-        public List<DevicePointEntity> GetDevicePointList(string deviceId, string pointCode, string pointName)
+        public List<DevicePoint> GetDevicePointList(string deviceName, string deviceCode, string equipmentName, string equipmentCode, string equipmentType, string pointCode, string pointName, bool? activated)
         {
             using (var context = new EFContext())
             {
-                var query = context.DevicePoints.Where(f => !f.IsDelete);
-                if (!deviceId.IsNullOrEmpty())
-                {
-                    query = query.Where(f => f.DeviceId == deviceId);
-                }
-                if (!pointCode.IsNullOrEmpty())
-                {
-                    query = query.Where(f => f.PointCode.StartsWith(pointCode));
-                }
-                if (!pointName.IsNullOrEmpty())
-                {
-                    query = query.Where(f => f.PointName.StartsWith(pointName));
-                }
+                var query = DeviceQuery(deviceName, deviceCode, equipmentName, equipmentCode, equipmentType, pointCode, pointName, activated, context);
                 var list = query.ToList();
                 return list;
             }
         }
 
+        private IQueryable<DevicePoint> DeviceQuery(string deviceName, string deviceCode, string equipmentName, string equipmentCode, string equipmentType, string pointCode, string pointName, bool? activated, EFContext context)
+        {
+            var query = from device in context.DeviceInfos.Where(f => !f.IsDelete)
+                        join point in context.DevicePoints.Where(f => !f.IsDelete) on device.Id equals point.DeviceId
+                        join equipment in context.EquipmentInfos.Where(f => !f.IsDelete) on point.EquipmentId equals equipment.Id
+                        select new DevicePoint
+                        {
+                            Id = point.Id,
+                            DeviceId = device.Id,
+                            DeviceCode = device.DeviceCode,
+                            DeviceName = device.DeviceName,
+                            EquipmentId = equipment.Id,
+                            EquipmentCode = equipment.EquipmentCode,
+                            EquipmentName = equipment.EquipmentName,
+                            EquipmentType = equipment.EquipmentType,
+                            Activated = point.Activated,
+                            PointCode = point.PointCode,
+                            PointName = point.PointName,
+                            Address = point.Address,
+                            DataType = point.DataType,
+                            Remark = point.Remark,
+                        };
+            if (!deviceName.IsNullOrEmpty())
+            {
+                query = query.Where(f => f.DeviceName.StartsWith(deviceName));
+            }
+            if (!deviceCode.IsNullOrEmpty())
+            {
+                query = query.Where(f => f.DeviceCode.StartsWith(deviceCode));
+            }
+            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);
+            }
+            if (!pointCode.IsNullOrEmpty())
+            {
+                query = query.Where(f => f.PointCode.StartsWith(pointCode));
+            }
+            if (!pointName.IsNullOrEmpty())
+            {
+                query = query.Where(f => f.PointName.StartsWith(pointName));
+            }
+            if (activated.HasValue)
+            {
+                query = query.Where(f => f.Activated == activated.Value);
+            }
+
+            return query;
+        }
+
         /// <summary>
         /// 获取PLC控制器点位明细
         /// </summary>
@@ -279,7 +324,7 @@ namespace PVDEMCS.Services.Repositories.Impl
                 var entity = context.DevicePoints.Where(f => f.Id == id).FirstOrDefault();
                 if (entity == null)
                 {
-                    result.Message = $"没有找到Id:{id}的数据";
+                    result.Message = $"没有找到Id:【{id}】的数据";
                     return result;
                 }
                 result.Content = entity;
@@ -302,12 +347,12 @@ namespace PVDEMCS.Services.Repositories.Impl
                 var query = context.DevicePoints.Where(f => !f.IsDelete);
                 if (query.Where(f => f.PointName == entity.PointName).FirstOrDefault() != null)
                 {
-                    result.Message = $"已存在名称为:{entity.PointName}的PLC控制器点位";
+                    result.Message = $"没有找到Id:【{entity.PointName}】的数据";
                     return result;
                 }
                 if (query.Where(f => f.PointCode == entity.PointCode).FirstOrDefault() != null)
                 {
-                    result.Message = $"已存在编号为:{entity.PointCode}的PLC控制器点位";
+                    result.Message = $"没有找到Id:【{entity.PointCode}】的数据";
                     return result;
                 }
 
@@ -325,7 +370,7 @@ namespace PVDEMCS.Services.Repositories.Impl
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        public Result UpdateDevicePoint(DevicePointEntity entity) 
+        public Result UpdateDevicePoint(DevicePointEntity entity)
         {
             using (var context = new EFContext())
             {
@@ -335,27 +380,28 @@ namespace PVDEMCS.Services.Repositories.Impl
                 var update = query.Where(f => f.Id == entity.Id).FirstOrDefault();
                 if (update == null)
                 {
-                    result.Message = $"没有找到Id:{entity.Id}的数据";
+                    result.Message = $"没有找到Id:【{entity.Id}】的数据";
                     return result;
                 }
                 if (query.Where(f => f.PointName == entity.PointName && f.Id != entity.Id).FirstOrDefault() != null)
                 {
-                    result.Message = $"已存在名称为:{entity.PointName}的PLC控制器点位";
+                    result.Message = $"没有找到Id:【{entity.PointName}】的数据";
                     return result;
                 }
                 if (query.Where(f => f.PointCode == entity.PointCode && f.Id != entity.Id).FirstOrDefault() != null)
                 {
-                    result.Message = $"已存在编号为:{entity.PointCode}的PLC控制器点位";
+                    result.Message = $"没有找到Id:【{entity.PointCode}】的数据";
                     return result;
                 }
-
                 update.DeviceId = entity.DeviceId;
+                update.EquipmentId = entity.EquipmentId;
                 update.PointCode = entity.PointCode;
                 update.PointName = entity.PointName;
+                update.ActionType = entity.ActionType;
                 update.Activated = entity.Activated;
-                update.Address= entity.Address;
-                update.Type = entity.Type;
-                update.Remark= entity.Remark;
+                update.Address = entity.Address;
+                update.DataType = entity.DataType;
+                update.Remark = entity.Remark;
                 entity.Update();
                 context.SaveChanges();
 
@@ -368,7 +414,7 @@ namespace PVDEMCS.Services.Repositories.Impl
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        public Result DeleteDevicePoint(string id) 
+        public Result DeleteDevicePoint(string id)
         {
             using (var context = new EFContext())
             {
@@ -377,7 +423,7 @@ namespace PVDEMCS.Services.Repositories.Impl
                 var entity = context.DevicePoints.Where(f => f.Id == id).FirstOrDefault();
                 if (entity == null)
                 {
-                    result.Message = $"没有找到Id:{id}的数据";
+                    result.Message = $"没有找到Id:【{id}】的数据";
                     return result;
                 }
 

PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs

@@ -1,4 +1,7 @@
-using PVDEMCS.Common.DI;
+using Masuit.Tools.Models;
+using PVDEMCS.Common;
+using PVDEMCS.Common.DI;
+using PVDEMCS.Services.Repositories.Entities;
 
 namespace PVDEMCS.Services.Repositories.Impl
 {
@@ -7,6 +10,6 @@ namespace PVDEMCS.Services.Repositories.Impl
      */
     internal class EquipmentRecordRepository : IEquipmentRecordRepository
     {
-
+       // public Result<PagedList<EquipmentInfoEntity>> GetEquipmentRecordPageList()  
     }
 }

PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRepository.cs

@@ -1,12 +1,206 @@
-using PVDEMCS.Common.DI;
+using Masuit.Tools;
+using Masuit.Tools.Models;
+using PVDEMCS.Common;
+using PVDEMCS.Common.DI;
+using PVDEMCS.Services.Repositories.Entities;
 
 namespace PVDEMCS.Services.Repositories
 {
     /*
-     * 用户操作 数据层 实现
+     * 设备信息 数据层 实现
      */
     internal class EquipmentRepository : IEquipmentRepository
     {
+        /// <summary>
+        /// 获取设备分页列表
+        /// </summary>
+        /// <param name="equipmentName">设备名称</param>
+        /// <param name="equipmentCode">设备编号</param>
+        /// <param name="equipmentType">设备类型</param>
+        /// <param name="activated">是否启用</param>
+        /// <param name="page">当前页</param>
+        /// <param name="size">页大小</param>
+        /// <returns></returns>
+        public Result<PagedList<EquipmentInfoEntity>> GetEquipmentPageList(string equipmentName, string equipmentCode, string equipmentType, bool? activated, int page, int size)
+        {
+            using (var context = new EFContext())
+            {
+                var query = context.EquipmentInfos.Where(f => !f.IsDelete);
 
+                if (!equipmentCode.IsNullOrEmpty())
+                {
+                    query = query.Where(f => f.EquipmentCode.StartsWith(equipmentCode));
+                }
+                if (!equipmentName.IsNullOrEmpty())
+                {
+                    query = query.Where(f => f.EquipmentName.StartsWith(equipmentName));
+                }
+                if (!equipmentType.IsNullOrEmpty())
+                {
+                    query = query.Where(f => f.EquipmentType == equipmentType);
+                }
+                if (activated.HasValue)
+                {
+                    query = query.Where(f => f.Activated == activated.Value);
+                }
+
+                var result = query.OrderBy(f => f.EquipmentCode).ToPagedList(page, size);
+
+                return new Result<PagedList<EquipmentInfoEntity>>(result);
+
+            }
+        }
+
+        /// <summary>
+        /// 获取设备列表
+        /// </summary>
+        /// <param name="equipmentName">设备名称</param>
+        /// <param name="equipmentCode">设备编号</param>
+        /// <param name="activated">是否启用</param>
+        public Result<List<EquipmentInfoEntity>> GetEquipmentList(string equipmentName, string equipmentCode, bool? activated)
+        {
+            using (var context = new EFContext())
+            {
+                var query = context.EquipmentInfos.Where(f => !f.IsDelete);
+
+                if (!equipmentCode.IsNullOrEmpty())
+                {
+                    query = query.Where(f => f.EquipmentCode.StartsWith(equipmentCode));
+                }
+                if (!equipmentName.IsNullOrEmpty())
+                {
+                    query = query.Where(f => f.EquipmentName.StartsWith(equipmentName));
+                }
+                if (activated.HasValue)
+                {
+                    query = query.Where(f => f.Activated == activated.Value);
+                }
+
+                var result = query.OrderBy(f => f.EquipmentCode).ToList();
+
+                return new Result<List<EquipmentInfoEntity>>(result);
+
+            }
+        }
+
+        /// <summary>
+        /// 获取设备明显
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public Result<EquipmentInfoEntity> GetEquipmentDetail(string id)
+        {
+            using (var context = new EFContext())
+            {
+                var result = new Result<EquipmentInfoEntity>();
+
+                var entity = context.EquipmentInfos.Where(f => !f.IsDelete && f.Id == id).FirstOrDefault();
+                if (entity == null)
+                {
+                    result.Message = $"没有找到Id:【{id}】的数据";
+                    return result;
+                }
+
+                result.Content = entity;
+
+                return result;
+            }
+        }
+
+        /// <summary>
+        /// 添加设备信息
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public Result AddEquipment(EquipmentInfoEntity entity)
+        {
+            using (var context = new EFContext())
+            {
+                var result = new Result();
+
+                var query = context.EquipmentInfos.Where(f => !f.IsDelete);
+                if (query.Where(f => f.EquipmentCode == entity.EquipmentCode).FirstOrDefault() != null)
+                {
+                    result.Message = $"没有找到Id:【{entity.EquipmentCode}】的数据";
+                    return result;
+                }
+                if (query.Where(f => f.EquipmentName == entity.EquipmentName).FirstOrDefault() != null)
+                {
+                    result.Message = $"没有找到Id:【{entity.EquipmentName}】的数据";
+                    return result;
+                }
+
+                entity.Create();
+                context.EquipmentInfos.Add(entity);
+                context.SaveChanges();
+
+                return result;
+            }
+        }
+
+        /// <summary>
+        /// 更新设备信息
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public Result UpdateEquipment(EquipmentInfoEntity entity)
+        {
+            using (var context = new EFContext())
+            {
+                var result = new Result();
+
+                var query = context.EquipmentInfos.Where(f => !f.IsDelete);
+                var update = query.Where(f => f.Id == entity.Id).FirstOrDefault();
+                if (update == null)
+                {
+                    result.Message = $"没有找到Id:【{entity.Id}】的数据";
+                    return result;
+                }
+                if (query.Where(f => f.EquipmentCode == entity.EquipmentCode && f.Id != entity.Id).FirstOrDefault() != null)
+                {
+                    result.Message = $"没有找到Id:【{entity.EquipmentCode}】的数据";
+                    return result;
+                }
+                if (query.Where(f => f.EquipmentName == entity.EquipmentName && f.Id != entity.Id).FirstOrDefault() != null)
+                {
+                    result.Message = $"没有找到Id:【{entity.EquipmentName}】的数据";
+                    return result;
+                }
+
+                update.EquipmentCode = entity.EquipmentCode;
+                update.EquipmentName = entity.EquipmentName;
+                update.Activated = entity.Activated;
+                update.Remark = entity.Remark;
+                update.Update();
+                context.SaveChanges();
+
+                return result;
+            }
+        }
+
+        /// <summary>
+        /// 删除设备信息
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public Result DeleteEquipment(string id)
+        {
+            using (var context = new EFContext())
+            {
+                var result = new Result();
+
+                var query = context.EquipmentInfos.Where(f => !f.IsDelete);
+                var entity = query.Where(f => f.Id == id).FirstOrDefault();
+                if (entity == null)
+                {
+                    result.Message = $"没有找到Id:【{id}】的数据";
+                    return result;
+                }
+                entity.Delete();
+                context.SaveChanges();
+
+                return result;
+            }
+        }
     }
 }

PVDEMCS/PVDEMCS/Services/Repositories/Impl/SysConfigRepository.cs

@@ -1,4 +1,8 @@
-using PVDEMCS.Common.DI;
+using Masuit.Tools;
+using Masuit.Tools.Models;
+using PVDEMCS.Common;
+using PVDEMCS.Common.DI;
+using PVDEMCS.Services.Repositories.Entities;
 
 namespace PVDEMCS.Services.Repositories.Impl
 {
@@ -7,6 +11,177 @@ namespace PVDEMCS.Services.Repositories.Impl
      */
     internal class SysConfigRepository : ISysConfigRepository
     {
+        /// <summary>
+        /// 获取系统参数设置分页列表
+        /// </summary>
+        /// <param name="configName">参数名称</param>
+        /// <param name="configKey">参数键值</param>
+        /// <param name="page">当前页</param>
+        /// <param name="size">页大小</param>
+        /// <returns></returns>
+        public Result<PagedList<SysConfigEntity>> GetSysConfigPageList(string configName, string configKey, int page, int size)
+        {
+            using (var context = new EFContext())
+            {
+                var query = context.SysConfigs.Where(f => !f.IsDelete);
 
+                if (!configName.IsNullOrEmpty())
+                {
+                    query = query.Where(f => f.ConfigName.StartsWith(configName));
+                }
+                if (!configName.IsNullOrEmpty())
+                {
+                    query = query.Where(f => f.ConfigKey.StartsWith(configKey));
+                }
+                var result = query.OrderBy(f => f.ConfigName).ToPagedList(page, size);
+
+                return new Result<PagedList<SysConfigEntity>>(result);
+            }
+        }
+
+        /// <summary>
+        /// 获取系统参数设置列表
+        /// </summary>
+        /// <param name="configName">参数名称</param>
+        /// <param name="configKey">参数键值</param>
+        /// <returns></returns>
+        public Result<List<SysConfigEntity>> GetSysConfigList(string configName, string configKey)
+        {
+            using (var context = new EFContext())
+            {
+                var query = context.SysConfigs.Where(f => !f.IsDelete);
+
+                if (!configName.IsNullOrEmpty())
+                {
+                    query = query.Where(f => f.ConfigName.StartsWith(configName));
+                }
+                if (!configName.IsNullOrEmpty())
+                {
+                    query = query.Where(f => f.ConfigKey.StartsWith(configKey));
+                }
+                var result = query.OrderBy(f => f.ConfigName).ToList();
+
+                return new Result<List<SysConfigEntity>>(result);
+            }
+        }
+
+        /// <summary>
+        /// 获取获取系统参数设置明细
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public Result<SysConfigEntity> GetSysConfigDetail(string id)
+        {
+            using (var context = new EFContext())
+            {
+                var result = new Result<SysConfigEntity>();
+
+                var detail = context.SysConfigs.Where(f => !f.IsDelete && f.Id == id).FirstOrDefault();
+                if (detail == null)
+                {
+                    result.Message = $"没有找到Id:【{id}】的数据";
+                    return result;
+                }
+                result.Content = detail;
+
+                return result;
+            }
+        }
+
+        /// <summary>
+        /// 添加系统参数设置
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public Result AddSysConfig(SysConfigEntity entity)
+        {
+            using (var context = new EFContext())
+            {
+                var result = new Result();
+
+                var query = context.SysConfigs.Where(f => !f.IsDelete);
+                if (query.Where(f => f.ConfigName == entity.ConfigName).FirstOrDefault() != null)
+                {
+                    result.Message = $"已存在名称为:【{entity.ConfigName}】的参数名称";
+                    return result;
+                }
+                if (query.Where(f => f.ConfigKey == entity.ConfigKey).FirstOrDefault() != null)
+                {
+                    result.Message = $"已存在编号为:【{entity.ConfigKey}】的参数键值";
+                    return result;
+                }
+
+                entity.Create();
+                context.SysConfigs.Add(entity);
+                context.SaveChanges();
+
+                return result;
+            }
+        }
+
+        /// <summary>
+        /// 更新系统参数设置
+        /// </summary>
+        /// <param name="entity"></param>
+
+        public Result UpdateSysConfig(SysConfigEntity entity)
+        {
+            using (var context = new EFContext())
+            {
+                var result = new Result();
+
+                var query = context.SysConfigs.Where(f => !f.IsDelete);
+                var update = query.Where(f => f.Id == entity.Id).FirstOrDefault();
+                if (update == null)
+                {
+                    result.Message = $"没有找到Id:【{entity.Id}】的数据";
+                    return result;
+                }
+                if (query.Where(f => f.ConfigName == entity.ConfigName && f.Id != entity.Id).FirstOrDefault() != null)
+                {
+                    result.Message = $"已存在名称为:【{entity.ConfigName}】的参数名称";
+                    return result;
+                }
+                if (query.Where(f => f.ConfigKey == entity.ConfigKey && f.Id != entity.Id).FirstOrDefault() != null)
+                {
+                    result.Message = $"已存在编号为:【{entity.ConfigKey}】的参数键值";
+                    return result;
+                }
+
+                update.ConfigName = entity.ConfigName;
+                update.ConfigKey = entity.ConfigKey;
+                update.ConfigValue = entity.ConfigValue;
+                update.ConfigType = entity.ConfigType;
+                update.Remark = entity.Remark;
+                entity.Update();
+                context.SaveChanges();
+
+                return result;
+            }
+        }
+
+        /// <summary>
+        /// 删除系统参数设置
+        /// </summary>
+        /// <param name="id"></param>
+        public Result DeleteSysConfig(string id)
+        {
+            using (var context = new EFContext())
+            {
+                var result = new Result();
+
+                var entity = context.SysConfigs.Where(f => f.Id == id).FirstOrDefault();
+                if (entity == null)
+                {
+                    result.Message = $"没有找到Id:【{id}】的数据";
+                    return result;
+                }
+
+                entity.Delete();
+                context.SaveChanges();
+
+                return result;
+            }
+        }
     }
 }

PVDEMCS/PVDEMCS/Services/Repositories/Impl/SysUserRepository.cs

@@ -1,4 +1,7 @@
-using PVDEMCS.Common.DI;
+using Masuit.Tools.Models;
+using PVDEMCS.Common;
+using PVDEMCS.Common.DI;
+using PVDEMCS.Services.Repositories.Entities;
 
 namespace PVDEMCS.Services.Repositories
 {
@@ -7,6 +10,6 @@ namespace PVDEMCS.Services.Repositories
      */
     internal class SysUserRepository: ISysUserRepository
     {
-
+       
     }
 }

PVDEMCS/PVDEMCS/obj/Debug/net6.0/PVDEMCS.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-cac9563343eeada6c9db9ada7736b4da688f6f98
+c81b2aea2744bafb8de652e7c468c70aebc896b5