消警处理

schangxiang@126.com

7 天以前 525dfb4adc6afd6f6a256150a451a3420588fa8d

消警处理

 iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/Dto/EquipmentBaseInfoInput.cs

@@ -21,6 +21,12 @@
        /// </summary>
        public string AlertType { get; set; }


        /// <summary>
        /// 表v_get_equipment_alert的 id值 【Editby shaocx,2025-12-03】
        /// </summary>
        public long v_get_equipment_alert_id { get; set; }

    }
    /// <summary>
    /// 查询设备告警信息

 iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs

@@ -165,6 +165,8 @@
        [HttpPost("UpdateAlertStatus")]
        public async Task<int> UpdateAlertStatus(EquipmentAlertClose input)
        {
            var v_GetEquipmentAlert = await _v_GetEquipmentAlertRep.FirstAsync(x => x.Id == input.v_get_equipment_alert_id);

            var equipmentBaseInfo = await _equipmentBaseInfoRep.FirstOrDefaultAsync(u => u.EquipmentId == input.EquipmentId && u.IsDeleted == false);

            if (equipmentBaseInfo == null)
@@ -175,17 +177,21 @@
            {
                throw Oops.Oh($"未传入需关闭的告警类型,不能关闭！");
            }
            //告警类型  （1：清洗液更换告警；2：刀具更换告警；3：切削液更换告警；4：设备告警）
            if (input.AlertType.Equals("1"))
            {
                equipmentBaseInfo.Detergentchangetime = DateTime.Now;
                v_GetEquipmentAlert.IsAlertDetergent = false;
            }
            else if (input.AlertType.Equals("2"))
            {
                equipmentBaseInfo.KnifeToolChangeTime = DateTime.Now;
                v_GetEquipmentAlert.IsAlertKnifeTool = false;
            }
            else if (input.AlertType.Equals("3"))
            {
                equipmentBaseInfo.CuttingFluidChangeTime = DateTime.Now;
                v_GetEquipmentAlert.IsAlertCuttingFluid = false;
            }
            else if (input.AlertType.Equals("4"))
            {
@@ -193,12 +199,18 @@
                if (equipmentCurrentMonitor != null)
                {
                    equipmentCurrentMonitor.IsCloseAlert = true;
                    await _equipmentCurrentMonitorRep.UpdateAsync(equipmentCurrentMonitor);
                }
                v_GetEquipmentAlert.IsAlert = false;
            }
            else
            {
                throw Oops.Oh($"设备{input.EquipmentId}传入告警类型{input.AlertType}不存在,不能关闭！");
            }

            var isSucess = await _equipmentBaseInfoRep.UpdateAsync(equipmentBaseInfo);
            await _v_GetEquipmentAlertRep.UpdateAsync(v_GetEquipmentAlert);

            return 0;
        }


 iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml

@@ -1525,6 +1525,11 @@
            告警类型  （1：清洗液更换告警；2：刀具更换告警；3：切削液更换告警；4：设备告警）
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.EquipmentAlertClose.v_get_equipment_alert_id">
            <summary>
            表v_get_equipment_alert的 id值 【Editby shaocx,2025-12-03】
            </summary>
        </member>
        <member name="T:iWare.Wms.Application.EquipmentAlertSearch">
            <summary>
            查询设备告警信息

 iWara.SCADA.Code/iWare.Wms.EntityFramework.Core/dbsettings.json

@@ -15,7 +15,10 @@
    //"MultiTenantConnection": "Data Source=localhost;Database=Admin.NET_SaaS;User ID=root;Password=123456;pooling=true;port=3306;sslmode=none;CharSet=utf8;"

    //MSSQL连接字符串
    "DefaultConnection": "Server=192.168.216.203;Database=iWare.SCADA;User=sa;Password=123abc.com;MultipleActiveResultSets=True;"
    //"DefaultConnection": "Server=.;Database=iWare.WMS;User=sa;Password=123abc.com;MultipleActiveResultSets=True;"
    //"DefaultConnection": "Server=82.156.32.44;Database=iWare.WMS;User=sa;Password=123abc.com;MultipleActiveResultSets=True;"
    //"DefaultConnection": "Server=192.168.216.203;Database=iWare.SCADA;User=sa;Password=123abc.com;MultipleActiveResultSets=True;"
    "DefaultConnection": "Server=localhost\\MSSQLSERVER2022;Database=iWare.SCADA;User=sa;Password=123abc.com;MultipleActiveResultSets=True;"
    //"MultiTenantConnection": "Server=localhost;Database=Admin.NET_SaaS;User=sa;Password=123456;MultipleActiveResultSets=True;"
  }
}