更新提交

main
xiaoguo 1 year ago
parent 2b92fce764
commit 56f63993fc

Binary file not shown.

@ -106,6 +106,7 @@ namespace PVDEMCS.Controllers
public Result<string> AddDevice(DeviceInfo entity)
{
var result = _deviceService.AddDevice(entity);
_deviceRun.Run();
return result;
}
@ -117,6 +118,7 @@ namespace PVDEMCS.Controllers
public Result UpdateDevice(DeviceInfo entity)
{
var result = _deviceService.UpdateDevice(entity);
_deviceRun.Run();
return result;
}
@ -128,6 +130,7 @@ namespace PVDEMCS.Controllers
public Result DeleteDevice(string id)
{
var result = _deviceService.DeleteDevice(id);
_deviceRun.Run();
return result;
}
@ -214,6 +217,7 @@ namespace PVDEMCS.Controllers
public Result<string> AddDevicePoint(DevicePoint entity)
{
var result = _deviceService.AddDevicePoint(entity);
_deviceRun.Run();
return result;
}
@ -226,6 +230,7 @@ namespace PVDEMCS.Controllers
public Result UpdateDevicePoint(DevicePoint entity)
{
var result = _deviceService.UpdateDevicePoint(entity);
_deviceRun.Run();
return result;
}
@ -238,6 +243,7 @@ namespace PVDEMCS.Controllers
public Result DeleteDevicePoint(string id)
{
var result = _deviceService.DeleteDevicePoint(id);
_deviceRun.Run();
return result;
}

@ -20,11 +20,12 @@ namespace PVDEMCS.Controllers
public class EquipmentController : Controller
{
private IEquipmentService _equipmentService;
private IDeviceRun _deviceRun;
public EquipmentController(IEquipmentService equipmentService)
public EquipmentController(IEquipmentService equipmentService, IDeviceRun deviceRun)
{
this._equipmentService = equipmentService;
_deviceRun = deviceRun;
}
/// <summary>
/// 获取设备分页列表
@ -80,6 +81,7 @@ namespace PVDEMCS.Controllers
public Result AddEquipment(EquipmentInfo info)
{
var result = this._equipmentService.AddEquipment(info);
_deviceRun.Run();
return result;
}
@ -92,6 +94,7 @@ namespace PVDEMCS.Controllers
public Result UpdateEquipment(EquipmentInfo info)
{
var result = this._equipmentService.UpdateEquipment(info);
_deviceRun.Run();
return result;
}
@ -104,6 +107,7 @@ namespace PVDEMCS.Controllers
public Result DeleteEquipment(string id)
{
var result = this._equipmentService.DeleteEquipment(id);
_deviceRun.Run();
return result;
}
}

@ -86,7 +86,7 @@ public partial class DevicePoint
public String Model { get; set; }
/// <summary>
/// 是否报警true 报警false 不报警(自由model为Auto)
/// 是否报警true 报警false 不报警(为Auto)
/// </summary>
public bool IsAlarm { get; set; }

@ -49,7 +49,7 @@ public partial class EquipmentInfo
public String Model { get; set; }
/// <summary>
/// 是否报警true 报警false 不报警(自由model为Auto)
/// 是否报警true 报警false 不报警(model为Auto)
/// </summary>
public bool IsAlarm { get; set; }

@ -115,7 +115,7 @@ public partial class EFContext : DbContext
entity.Property(e => e.EquipmentName).HasComment("设备名称");
entity.Property(e => e.EquipmentType).HasComment("设备类型IonbondBalzersCemecon");
entity.Property(e => e.Model).HasComment("模式Auto 自动Manual手动");
entity.Property(e => e.IsAlarm).HasComment("是否报警1 报警0 不报警(自由model为Auto");
entity.Property(e => e.IsAlarm).HasComment("是否报警1 报警0 不报警(model为Auto");
entity.Property(e => e.OrdrNo).HasComment("排序号");
entity.Property(e => e.IsDelete)
.HasDefaultValueSql("b'0'")

@ -51,7 +51,7 @@ public partial class EquipmentInfoEntity : CUDBaseEntity
public String Model { get; set; }
/// <summary>
/// 是否报警true 报警false 不报警(自由model为Auto)
/// 是否报警true 报警false 不报警(model为Auto)
/// </summary>
[Column("isAlarm", TypeName = "bit(1)")]
public bool IsAlarm { get; set; }

Loading…
Cancel
Save