调整注释

PVDEMCS/PVDEMCS/Services/IDeviceService.cs

@@ -19,6 +19,7 @@ namespace PVDEMCS.Services
         /// </summary>
         /// <param name="deviceCode">控制器编号</param>
         /// <param name="deviceName">控制器名称</param>
+        /// <param name="activated">是否启用</param>
         /// <param name="page">当前页</param>
         /// <param name="size">页大小</param>
         /// <returns></returns>
@@ -29,6 +30,7 @@ namespace PVDEMCS.Services
         /// </summary>
         /// <param name="deviceCode">控制器编号</param>
         /// <param name="deviceName">控制器名称</param>
+        /// <param name="activated">是否启用</param>
         /// <returns></returns>
         Result<List<DeviceInfo>> GetDeviceInfoList(string deviceCode="", string deviceName = "", bool? activated = false);
 
@@ -72,6 +74,7 @@ namespace PVDEMCS.Services
         /// <param name="equipmentType">设备类型</param>
         /// <param name="pointCode">点位编号</param>
         /// <param name="pointName">点位列表</param>
+        /// <param name="activated">是否启用</param>
         /// <param name="page">当前页</param>
         /// <param name="size">页大小</param>
         /// <returns></returns>
@@ -87,6 +90,7 @@ namespace PVDEMCS.Services
         /// <param name="equipmentType">设备类型</param>
         /// <param name="pointCode">点位编号</param>
         /// <param name="pointName">点位列表</param>
+        /// <param name="activated">是否启用</param>
         /// <returns></returns>
         Result<List<DevicePoint>> GetDevicePointList(string deviceName="", string deviceCode = "", string equipmentName = "", string equipmentCode = "", string equipmentType = "", string pointCode = "", string pointName = "", bool? activated = true);
 

PVDEMCS/PVDEMCS/Services/IEquipmentRecordService.cs

@@ -6,9 +6,9 @@ using PVDEMCS.Services.Repositories.Entities;
 
 namespace PVDEMCS.Services
 {
-    /*
-      * 设备数据记录与统计 服务层 接口
-      */
+    /// <summary>
+    /// 设备数据记录与统计 服务层 接口
+    /// </summary>
     public interface IEquipmentRecordService : IDependency
     {
         #region 设备状态记录
@@ -51,6 +51,7 @@ namespace PVDEMCS.Services
         /// </summary>
         /// <param name="equipmentId">设备Id</param>
         /// <param name="state">设备状态，运行:Run，待机:Stop，报警:Alarm</param>
+        /// <param name="dateTime">记录时间</param>
         /// <returns></returns>
         Result AddUpdateEquipmentRecord(string equipmentId, string state, DateTime dateTime);
 

PVDEMCS/PVDEMCS/Services/IEquipmentService.cs

@@ -6,9 +6,9 @@ using PVDEMCS.Services.Models;
 
 namespace PVDEMCS.Services
 {
-    /*
-     * 设备管理 服务层 接口
-     */
+    /// <summary>
+    /// 设备管理 服务层 接口
+    /// </summary>
     public interface IEquipmentService : IDependency
     {
         /// <summary>
@@ -28,6 +28,7 @@ namespace PVDEMCS.Services
         /// </summary>
         /// <param name="equipmentName">设备名称</param>
         /// <param name="equipmentCode">设备编号</param>
+        /// <param name="equipmentType">设备类型</param>
         /// <param name="activated">是否启用</param>
         Result<List<EquipmentInfo>> GetEquipmentList(string equipmentName = "", string equipmentCode = "", string equipmentType = "", bool? activated = true);
 
@@ -41,21 +42,21 @@ namespace PVDEMCS.Services
         /// <summary>
         /// 添加设备信息
         /// </summary>
-        /// <param name="entity"></param>
+        /// <param name="info"></param>
         /// <returns></returns>
         Result AddEquipment(EquipmentInfo info);
 
         /// <summary>
         /// 更新设备信息
         /// </summary>
-        /// <param name="entity"></param>
+        /// <param name="info"></param>
         /// <returns></returns>
         Result UpdateEquipment(EquipmentInfo info);
 
         /// <summary>
         /// 删除设备信息
         /// </summary>
-        /// <param name="entity"></param>
+        /// <param name="id"></param>
         /// <returns></returns>
         Result DeleteEquipment(string id);
     }

PVDEMCS/PVDEMCS/Services/ISysConfigService.cs

@@ -6,9 +6,9 @@ using PVDEMCS.Services.Models;
 
 namespace PVDEMCS.Services
 {
-    /*
-    * 系统参数设置 服务层 接口
-    */
+    /// <summary>
+    /// 系统参数设置 服务层 接口
+    /// </summary>
     public interface ISysConfigService : IDependency
     {
         /// <summary>
@@ -39,21 +39,22 @@ namespace PVDEMCS.Services
         /// <summary>
         /// 获取获取系统参数设置明细
         /// </summary>
-        /// <param name="id"></param>
+        /// <param name="name"></param>
+        /// <param name="key"></param>
         /// <returns></returns>
         Result<SysConfig> GetSysConfigDetailNameOrKey(string name, string key = "");
 
         /// <summary>
         /// 添加系统参数设置
         /// </summary>
-        /// <param name="entity"></param>
+        /// <param name="info"></param>
         /// <returns></returns>
         Result AddSysConfig(SysConfig info);
 
         /// <summary>
         /// 更新系统参数设置
         /// </summary>
-        /// <param name="entity"></param>
+        /// <param name="info"></param>
 
         Result UpdateSysConfig(SysConfig info);
 

PVDEMCS/PVDEMCS/Services/Impl/DeviceService.cs

@@ -30,6 +30,7 @@ namespace PVDEMCS.Services.Impl
         /// </summary>
         /// <param name="deviceCode">控制器编号</param>
         /// <param name="deviceName">控制器名称</param>
+        /// <param name="activated">是否启用</param>
         /// <param name="page">当前页</param>
         /// <param name="size">页大小</param>
         /// <returns></returns>
@@ -45,6 +46,7 @@ namespace PVDEMCS.Services.Impl
         /// </summary>
         /// <param name="deviceCode">控制器编号</param>
         /// <param name="deviceName">控制器名称</param>
+        /// <param name="activated">是否启用</param>
         /// <returns></returns>
         public Result<List<DeviceInfo>> GetDeviceInfoList(string deviceCode, string deviceName, bool? activated = false)
         {
@@ -120,6 +122,7 @@ namespace PVDEMCS.Services.Impl
         /// <param name="equipmentType">设备类型</param>
         /// <param name="pointCode">点位编号</param>
         /// <param name="pointName">点位列表</param>
+        /// <param name="activated">是否启用</param>
         /// <param name="page">当前页</param>
         /// <param name="size">页大小</param>
         /// <returns></returns>
@@ -140,6 +143,7 @@ namespace PVDEMCS.Services.Impl
         /// <param name="equipmentType">设备类型</param>
         /// <param name="pointCode">点位编号</param>
         /// <param name="pointName">点位列表</param>
+        /// <param name="activated">是否启用</param>
         /// <returns></returns>
         public Result<List<DevicePoint>>  GetDevicePointList(string deviceName, string deviceCode, string equipmentName, string equipmentCode, string equipmentType, string pointCode, string pointName, bool? activated)
         {
@@ -171,7 +175,7 @@ namespace PVDEMCS.Services.Impl
         /// <summary>
         /// 添加PLC控制器点位
         /// </summary>
-        /// <param name="entity"></param>
+        /// <param name="info"></param>
         /// <returns></returns>
         public Result<string> AddDevicePoint(DevicePoint info)
         {
@@ -183,7 +187,7 @@ namespace PVDEMCS.Services.Impl
         /// <summary>
         /// 更新PLC控制器点位
         /// </summary>
-        /// <param name="entity"></param>
+        /// <param name="info"></param>
         /// <returns></returns>
         public Result UpdateDevicePoint(DevicePoint info)
         {

PVDEMCS/PVDEMCS/Services/Impl/EquipmentRecordService.cs

@@ -11,9 +11,9 @@ using PVDEMCS.Services.Repositories.Entities;
 
 namespace PVDEMCS.Services.Impl
 {
-    /*
-      * 设备数据记录与统计 服务层 实现
-      */
+    /// <summary>
+    /// 设备数据记录与统计 服务层 实现
+    /// </summary>
     internal class EquipmentRecordService : IEquipmentRecordService
     {
         private readonly IEquipmentRecordRepository _equipmentRecordRepository;

PVDEMCS/PVDEMCS/Services/Impl/EquipmentService.cs

@@ -13,9 +13,9 @@ using Masuit.Tools;
 
 namespace PVDEMCS.Services.Impl
 {
-    /*
-     * 设备管理 服务层 接口
-     */
+    /// <summary>
+    /// 设备管理 服务层 接口
+    /// </summary>
     internal class EquipmentService : IEquipmentService
     {
         private readonly IEquipmentRepository _equipmentRepository;
@@ -123,7 +123,7 @@ namespace PVDEMCS.Services.Impl
         /// <summary>
         /// 添加设备信息
         /// </summary>
-        /// <param name="entity"></param>
+        /// <param name="info"></param>
         /// <returns></returns>
         public Result AddEquipment(EquipmentInfo info)
         {
@@ -135,7 +135,7 @@ namespace PVDEMCS.Services.Impl
         /// <summary>
         /// 更新设备信息
         /// </summary>
-        /// <param name="entity"></param>
+        /// <param name="info"></param>
         /// <returns></returns>
         public Result UpdateEquipment(EquipmentInfo info)
         {
@@ -147,7 +147,7 @@ namespace PVDEMCS.Services.Impl
         /// <summary>
         /// 删除设备信息
         /// </summary>
-        /// <param name="entity"></param>
+        /// <param name="id"></param>
         /// <returns></returns>
         public Result DeleteEquipment(string id)
         {

PVDEMCS/PVDEMCS/Services/Impl/SysConfigService.cs

@@ -10,9 +10,9 @@ using PVDEMCS.Services.Repositories.Impl;
 
 namespace PVDEMCS.Services.Impl
 {
-    /*
-   * 系统参数设置 服务层 实现
-   */
+    /// <summary>
+    /// 系统参数设置 服务层 实现
+    /// </summary>
     internal class SysConfigService : ISysConfigService
     {
         private readonly ISysConfigRepository _sysConfigRepository;
@@ -70,7 +70,8 @@ namespace PVDEMCS.Services.Impl
         /// <summary>
         /// 获取获取系统参数设置明细
         /// </summary>
-        /// <param name="id"></param>
+        /// <param name="name">名称</param>
+        /// <param name="key">键值</param>
         /// <returns></returns>
         public Result<SysConfig> GetSysConfigDetailNameOrKey(string name, string key = "")
         {
@@ -90,7 +91,7 @@ namespace PVDEMCS.Services.Impl
         /// <summary>
         /// 添加系统参数设置
         /// </summary>
-        /// <param name="entity"></param>
+        /// <param name="info"></param>
         /// <returns></returns>
         public Result AddSysConfig(SysConfig info)
         {
@@ -102,7 +103,7 @@ namespace PVDEMCS.Services.Impl
         /// <summary>
         /// 更新系统参数设置
         /// </summary>
-        /// <param name="entity"></param>
+        /// <param name="info"></param>
 
         public Result UpdateSysConfig(SysConfig info)
         {

PVDEMCS/PVDEMCS/Services/Repositories/IDeviceRepository.cs

@@ -7,10 +7,10 @@ using PVDEMCS.Services.Models;
 
 namespace PVDEMCS.Services.Repositories
 {
-    /*
-     * PLC控制器 数据层 接口
-     */
-    public interface IDeviceRepository: IDependency
+    /// <summary>
+    /// PLC控制器 数据层 接口
+    /// </summary>
+    public interface IDeviceRepository : IDependency
     {
         #region PLC控制器
 
@@ -19,6 +19,7 @@ namespace PVDEMCS.Services.Repositories
         /// </summary>
         /// <param name="deviceCode">控制器编号</param>
         /// <param name="deviceName">控制器名称</param>
+        /// <param name="activated">是否启用</param>
         /// <param name="page">当前页</param>
         /// <param name="size">页大小</param>
         /// <returns></returns>
@@ -29,6 +30,7 @@ namespace PVDEMCS.Services.Repositories
         /// </summary>
         /// <param name="deviceCode">控制器编号</param>
         /// <param name="deviceName">控制器名称</param>
+        /// <param name="activated">是否启用</param>
         /// <returns></returns>
         Result<List<DeviceInfo>> GetDeviceInfoList(string deviceCode, string deviceName, bool? activated = false);
 

PVDEMCS/PVDEMCS/Services/Repositories/IEquipmentRecordRepository.cs

@@ -9,9 +9,9 @@ using Microsoft.EntityFrameworkCore;
 
 namespace PVDEMCS.Services.Repositories
 {
-    /*
-     * 设备数据记录与统计 数据层 接口
-     */
+    /// <summary>
+    /// 设备数据记录与统计 数据层 接口
+    /// </summary>
     public interface IEquipmentRecordRepository : IDependency
     {
         #region 设备状态记录
@@ -47,6 +47,7 @@ namespace PVDEMCS.Services.Repositories
         /// </summary>
         /// <param name="equipmentId">设备Id</param>
         /// <param name="state">设备状态，运行:Run，待机:Stop，报警:Alarm</param>
+        /// <param name="dateTime">记录时间</param>
         /// <returns></returns>
         Result AddUpdateEquipmentRecord(string equipmentId, string state, DateTime dateTime);
 

PVDEMCS/PVDEMCS/Services/Repositories/IEquipmentRepository.cs

@@ -7,9 +7,9 @@ using PVDEMCS.Services.Models;
 
 namespace PVDEMCS.Services.Repositories
 {
-    /*
-     * 设备管理 数据层 接口
-     */
+    /// <summary>
+    /// 设备管理 数据层 接口
+    /// </summary>
     public interface IEquipmentRepository : IDependency
     {
         /// <summary>
@@ -56,7 +56,7 @@ namespace PVDEMCS.Services.Repositories
         /// <summary>
         /// 删除设备信息
         /// </summary>
-        /// <param name="entity"></param>
+        /// <param name="id"></param>
         /// <returns></returns>
         Result DeleteEquipment(string id);
     }

PVDEMCS/PVDEMCS/Services/Repositories/ISysConfigRepository.cs

@@ -7,9 +7,9 @@ using PVDEMCS.Services.Models;
 
 namespace PVDEMCS.Services.Repositories
 {
-    /*
-     * 系统参数设置 数据层 接口
-     */
+    /// <summary>
+    /// 系统参数设置 数据层 接口
+    /// </summary>
     public interface ISysConfigRepository : IDependency
     {
         /// <summary>
@@ -40,7 +40,8 @@ namespace PVDEMCS.Services.Repositories
         /// <summary>
         /// 获取获取系统参数设置明细
         /// </summary>
-        /// <param name="id"></param>
+        /// <param name="name"></param>
+        /// <param name="key"></param>
         /// <returns></returns>
         Result<SysConfigEntity> GetSysConfigDetailNameOrKey(string name, string key = "");
 

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

@@ -13,9 +13,9 @@ using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 namespace PVDEMCS.Services.Repositories.Impl
 {
-    /*
-     * PLC控制器 数据层 实现
-     */
+    /// <summary>
+    /// PLC控制器 数据层 实现
+    /// </summary>
     internal class DeviceRepository : IDeviceRepository
     {
         #region PLC控制器
@@ -25,6 +25,7 @@ namespace PVDEMCS.Services.Repositories.Impl
         /// </summary>
         /// <param name="deviceCode">控制器编号</param>
         /// <param name="deviceName">控制器名称</param>
+        /// <param name="activated">是否启用</param>
         /// <param name="page">当前页</param>
         /// <param name="size">页大小</param>
         /// <returns></returns>
@@ -46,6 +47,7 @@ namespace PVDEMCS.Services.Repositories.Impl
         /// </summary>
         /// <param name="deviceCode">控制器编号</param>
         /// <param name="deviceName">控制器名称</param>
+        /// <param name="activated">是否启用</param>
         /// <returns></returns>
         public Result<List<DeviceInfo>> GetDeviceInfoList(string deviceCode, string deviceName, bool? activated = false)
         {

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

@@ -108,7 +108,7 @@ namespace PVDEMCS.Services.Repositories.Impl
         /// </summary>
         /// <param name="equipmentId">设备Id</param>
         /// <param name="state">设备状态，运行:Run，待机:Stop，报警:Alarm</param>
-        /// <param name="equipmentId">设备Id</param>
+        /// <param name="dateTime">记录时间</param>
         /// <returns></returns>
         public Result AddUpdateEquipmentRecord(string equipmentId, string state, DateTime dateTime)
         {
@@ -333,38 +333,40 @@ namespace PVDEMCS.Services.Repositories.Impl
                     TotalAlarmTime = f.Sum(f => f.TotalAlarmTime),
                     TotalStopTime = f.Sum(f => f.TotalStopTime),
                 }).ToList();
-                if (values.Count > 0)
+                if (values.Count == 0)
                 {
-                    if (list.IsNullOrEmpty())
+                    return new Result("没有汇总数据");
+                }
+
+                if (list.IsNullOrEmpty())
+                {
+                    foreach (var item in values)
                     {
-                        foreach (var item in values)
-                        {
-                            item.Create();
-                        }
-                        context.EquipmentRecordTotals.AddRange(values);
+                        item.Create();
                     }
-                    else
+                    context.EquipmentRecordTotals.AddRange(values);
+                }
+                else
+                {
+                    foreach (var item in list)
                     {
-                        foreach (var item in list)
+                        var value = values.Where(f => f.EquipmentId == item.EquipmentId).FirstOrDefault();
+                        if (value.IsNullOrEmpty())
                         {
-                            var value = values.Where(f => f.EquipmentId == item.EquipmentId).FirstOrDefault();
-                            if (value.IsNullOrEmpty())
-                            {
-                                value.Create();
-                                context.EquipmentRecordTotals.Add(value);
-                            }
-                            else
-                            {
-                                item.FurnaceNum += value.FurnaceNum;
-                                item.TotalAlarmTime += value.TotalAlarmTime;
-                                item.TotalRunningTime += value.TotalRunningTime;
-                                item.TotalStopTime += value.TotalStopTime;
-                                item.Update();
-                            }
+                            value.Create();
+                            context.EquipmentRecordTotals.Add(value);
+                        }
+                        else
+                        {
+                            item.FurnaceNum += value.FurnaceNum;
+                            item.TotalAlarmTime += value.TotalAlarmTime;
+                            item.TotalRunningTime += value.TotalRunningTime;
+                            item.TotalStopTime += value.TotalStopTime;
+                            item.Update();
                         }
                     }
-                    context.SaveChanges();
                 }
+                context.SaveChanges();
 
                 return new Result();
 
@@ -603,9 +605,6 @@ namespace PVDEMCS.Services.Repositories.Impl
             }
         }
 
-
-
-
         #endregion
     }
 }

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

@@ -8,9 +8,9 @@ using PVDEMCS.Services.Repositories.Entities;
 
 namespace PVDEMCS.Services.Repositories
 {
-    /*
-     * 设备信息 数据层 实现
-     */
+    /// <summary>
+    /// 设备信息 数据层 实现
+    /// </summary>
     internal class EquipmentRepository : IEquipmentRepository
     {
         /// <summary>

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

@@ -7,9 +7,9 @@ using PVDEMCS.Services.Repositories.Entities;
 
 namespace PVDEMCS.Services.Repositories.Impl
 {
-    /*
-     * 系统参数设置 数据层 实现
-     */
+    /// <summary>
+    /// 系统参数设置 数据层 实现
+    /// </summary>
     internal class SysConfigRepository : ISysConfigRepository
     {
         /// <summary>
@@ -101,7 +101,8 @@ namespace PVDEMCS.Services.Repositories.Impl
         /// <summary>
         /// 获取获取系统参数设置明细
         /// </summary>
-        /// <param name="id"></param>
+        /// <param name="name"></param>
+        /// <param name="key"></param>
         /// <returns></returns>
         public Result<SysConfigEntity> GetSysConfigDetailNameOrKey(string name, string key)
         {