调整注释

main
xiaoguo 2 years ago
parent 7617ba5065
commit ad012d602b

Binary file not shown.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save