From afcecb06505032ada09a4a2e33eed1f7979250e9 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 05 九月 2024 11:16:59 +0800
Subject: [PATCH] 报警监控
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 136 +++++++++++++++++++++++++++++++-------------
1 files changed, 95 insertions(+), 41 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 08cbcc6..8a30d4d 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -2,6 +2,7 @@
using DocumentFormat.OpenXml.Drawing;
using Furion.Logging;
using Microsoft.AspNetCore.SignalR;
+using System;
namespace WCS.Application;
public static class PLCTaskAction
@@ -42,21 +43,18 @@
/// </summary>
public static void Init()
{
- if (listPlcUtil.Count != 0)
+ cts.Cancel();
+ listPlc = _db.Queryable<WcsPlc>().Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine).ToList();
+ listPlcDevice = _db.Queryable<WcsDevice>().ToList();
+ listPlcStation = _db.Queryable<WcsPosition>().ToList();
+ listAlarmInfo = _db.Queryable<WcsAlarmInfo>().ToList();
+ //绛夊緟鍑犵閽燂紝鎶婂凡鏈夌嚎绋嬪彇娑堟帀鍐嶈繛鎺�
+ Thread.Sleep(5000);
+ foreach (var modPlcUtil in listPlcUtil)
{
- cts.Cancel();
- listPlc = _db.Queryable<WcsPlc>().Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine).ToList();
- listPlcDevice = _db.Queryable<WcsDevice>().ToList();
- listPlcStation = _db.Queryable<WcsPosition>().ToList();
- listAlarmInfo = _db.Queryable<WcsAlarmInfo>().ToList();
- //绛夊緟鍑犵閽燂紝鎶婂凡鏈夌嚎绋嬪彇娑堟帀鍐嶈繛鎺�
- Thread.Sleep(5000);
- foreach (var modPlcUtil in listPlcUtil)
- {
- modPlcUtil.Close();
- }
- listPlcUtil.Clear();
+ modPlcUtil.Close();
}
+ listPlcUtil.Clear();
foreach (var modPlc in listPlc)
{
var plc = new PLCUtil(modPlc);
@@ -74,6 +72,7 @@
/// </summary>
public static void StartRead()
{
+ Console.WriteLine("寮�鍚鍙杙lc绾跨▼");
foreach (var modPlc in listPlc)
{
Task.Run(() =>
@@ -97,16 +96,33 @@
var modPlcUtil = listPlcUtil.FirstOrDefault(s => s != null && s.PlcId == modPlc.Id);
if (modPlcUtil == null)
{
+ Console.WriteLine($"杩炴帴plc{modPlc.IP}");
modPlcUtil = new PLCUtil(modPlc);
listPlcUtil.Add(modPlcUtil);
+ if (modPlcUtil.Connected)
+ Console.WriteLine($"杩炴帴plc{modPlc.IP}鎴愬姛");
}
- var listDevice = listPlcDevice.Where(s => s.PlcId == _modplc.Id && s.DeviceType == DeviceTypeEnum.Business).ToList();
+ if (!modPlcUtil.Connected)
+ {
+ Thread.Sleep(10000);
+ modPlcUtil.Open();
+ continue;
+ }
+ var listDevice = listPlcDevice
+ .Where(s => s.PlcId == _modplc.Id && s.DeviceType == DeviceTypeEnum.Business)
+ .WhereIF(modPlc.Type == PLCTypeEnum.ConveyorLine, s => s.Level == DeviceLevelEnum.Station)
+ .WhereIF(modPlc.Type == PLCTypeEnum.StackingMachine, s => s.Level == DeviceLevelEnum.DB)
+ .ToList();
+
//寰幆璇昏澶�
- foreach (var modDevice in listDevice.Where(s => s.Level == DeviceLevelEnum.DB))
+ foreach (var modDevice in listDevice)
{
var (result, value) = modPlcUtil.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.PlcPos);
+ //if (!result.IsSucceed)
+ // Console.WriteLine($"{modPlc.IP}閿欒{modDevice.DbNumber}.{modDevice.PlcPos}锛�"+result.Err);
if (result.IsSucceed)
{
+ //Console.WriteLine($"{modPlc.IP}璇诲彇{modDevice.DbNumber}.{modDevice.PlcPos}鐨勫�间负锛歿value}");
//鏃犳祦绋嬭烦鍑�
if (value == 0)
continue;
@@ -119,16 +135,17 @@
//杩欓噷瑙﹀彂鍊煎彉鏇翠簨浠�
//DeviceValueChangeEvent?.Invoke(dto, EventArgs.Empty);
}
- else
+ else if (!modPlcUtil.Connected)
{
- //鍒犻櫎褰撳墠杩炴帴 涓嬩竴娆″惊鐜噸鏂拌繛鎺�
- Console.WriteLine("杩炴帴鏂紑...");
- modPlcUtil.Close();
- listPlcUtil.Remove(modPlcUtil);
+ //Console.WriteLine($"杩炴帴鏂紑...{modPlc.IP}");
+ //閲嶆柊鎵撳紑杩炴帴
+ modPlcUtil.Open();
+ //if (modPlcUtil.Connected)
+ // Console.WriteLine($"閲嶈繛鎴愬姛...{modPlc.IP}");
}
}
- Thread.Sleep(3000);
+ Thread.Sleep(10000);
}
catch (OperationCanceledException)
{
@@ -152,9 +169,9 @@
{
try
{
+ Console.WriteLine("杩炴帴鐘舵�佺嚎绋�");
while (true)
{
-
//鍙栨秷绾跨▼ 鍏抽棴PLC杩炴帴
if (cts.Token.IsCancellationRequested)
{
@@ -174,16 +191,22 @@
modPlc.IsConn = false;
else
modPlc.IsConn = modPlcUtil.Connected;
- if (sysCacheService.ExistKey("PLCCONN" + modPlc.Id))
+ if (sysCacheService.ExistKey("PLCCONN:" + modPlc.Id))
{
- var cachePlc = sysCacheService.Get<WcsPlc>("PLCCONN" + modPlc.Id);
+ var cachePlc = sysCacheService.Get<WcsPlc>("PLCCONN:" + modPlc.Id);
if (cachePlc.IsConn != modPlc.IsConn)
{
//杩炴帴鐘舵�佸彉鏇� 閫氱煡鍓嶇
+ Console.WriteLine($"閫氱煡鍓嶇鍙樻洿{modPlc.Text} {modPlc.IsConn}");
_plcHubContext.Clients.All.PublicPlcConn(modPlc);
}
+ sysCacheService.Set("PLCCONN:" + modPlc.Id, modPlc);
}
- sysCacheService.Set("PLCCONN" + modPlc.Id, modPlc);
+ else
+ {
+ sysCacheService.Set("PLCCONN:" + modPlc.Id, modPlc);
+ _plcHubContext.Clients.All.PublicPlcConn(modPlc);
+ }
}
Thread.Sleep(1000);
}
@@ -231,37 +254,67 @@
}
foreach (var modUtil in listPlcUtil)
{
- //鎶ヨ鐐逛綅
- var listAlarm = listAlarmInfo.Where(s => s.PlcIP == modUtil.PlcId.ToString());
- foreach (var modAlarm in listAlarm)
+ try
{
- (var result, var value) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Bit, modAlarm.AlarmCode, "");
- if (result.IsSucceed)
+ //鎶ヨ鐐逛綅
+ var listAlarm = listAlarmInfo.Where(s => s.PlcIP == modUtil.PlcIP.ToString()).ToList();
+ Console.WriteLine("鎶ヨ鐐逛綅鏁帮細" + listAlarm.Count);
+ var listaddress = new Dictionary<string, PLCDataTypeEnum>();
+ foreach (var modAlarm in listAlarm)
{
- //鍋囪涓嶄负0灏辩畻鎶ヨ
- if (Convert.ToBoolean(value) && modAlarm.Status == YesNoEnum.N)
+ listaddress.Add(modAlarm.AlarmCode, PLCDataTypeEnum.Bit);
+ break;
+ }
+ Console.WriteLine($"璇诲彇鐐逛綅{listaddress.Count}涓�");
+ var result = modUtil.GetPlcBatchDBValue(listaddress);
+ Console.WriteLine("err" + result.Err);
+ var listPulish = new List<WcsAlarmInfo>();
+ //娴嬭瘯鎶ヨ
+ //foreach (var modAlarm in listAlarm)
+ //{
+ // result.Value.Add(modAlarm.AlarmCode, true);
+ //}
+ foreach (var item in result.Value)
+ {
+ var value = Convert.ToBoolean(item.Value);
+ Console.WriteLine(item.Key + "+" + value);
+ var modAlarm = listAlarm.FirstOrDefault(s => s.AlarmCode == item.Key);
+ if (value && modAlarm.Status == YesNoEnum.N)
{
//淇敼鎶ヨ鐘舵�佸悓鏃惰褰曟姤璀︽棩蹇�
modAlarm.AlarmTime = DateTime.Now;
modAlarm.Status = YesNoEnum.Y;
- _db.Updateable(modAlarm).ExecuteCommand();
- WcsAlarmLog modLog = modAlarm.Adapt<WcsAlarmLog>();
- _db.Insertable(modLog).ExecuteCommand();
- //涓嬪彂鎶ヨ鐘舵��
- _plcHubContext.Clients.All.PublicAlarm(modAlarm.Adapt<WcsAlarmInfoOutput>());
+ listPulish.Add(modAlarm);
}
//鍙栨秷鎶ヨ
- else if (Convert.ToBoolean(value) && modAlarm.Status == YesNoEnum.Y)
+ else if (value && modAlarm.Status == YesNoEnum.Y)
{
modAlarm.AlarmTime = null;
modAlarm.Status = YesNoEnum.N;
- _db.Updateable(modAlarm).ExecuteCommand();
+ listPulish.Add(modAlarm);
}
}
+ if (listPulish.Count > 0)
+ {
+ _db.Updateable(listPulish).ExecuteCommand();
+ var listLog = new List<WcsAlarmLog>();
+ foreach (var mod in listPulish.Where(s => s.Status == YesNoEnum.Y))
+ {
+ WcsAlarmLog modLog = mod.Adapt<WcsAlarmLog>();
+ modLog.Id = 0;
+ listLog.Add(modLog);
+ }
+ _db.Insertable(listLog).ExecuteCommand();
+ _plcHubContext.Clients.All.PublicAlarm(listPulish);
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
}
}
- Thread.Sleep(1000);
+ Thread.Sleep(10000);
}
}, cts.Token);
}
@@ -270,6 +323,7 @@
/// </summary>
public static void StartWatchPosition()
{
+ Console.WriteLine("寮�鍚綅缃洃鎺�");
Task.Run(() =>
{
while (true)
@@ -290,7 +344,7 @@
foreach (var modPlcUtil in listPlcUtil)
{
if (modPlcUtil == null)
- break;
+ continue;
var listDevice = listPlcDevice.Where(s => s.PlcId == modPlcUtil.PlcId && s.DeviceType == DeviceTypeEnum.Show).ToList();
foreach (var modDevice in listDevice)
{
--
Gitblit v1.8.0