From 443277878eebd903f82cc32ed30f91d580942e14 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 03 九月 2024 14:24:57 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 145 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 109 insertions(+), 36 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 78a963c..9576ac4 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -1,4 +1,5 @@
锘縰sing Admin.NET.Core.Service;
+using DocumentFormat.OpenXml.Drawing;
using Furion.Logging;
using Microsoft.AspNetCore.SignalR;
@@ -16,12 +17,13 @@
private static readonly SysCacheService sysCacheService = App.GetRequiredService<SysCacheService>();
private static readonly IHubContext<PlcHub, IPlcHub> _plcHubContext = App.GetService<IHubContext<PlcHub, IPlcHub>>();
- private static List<WcsPlc> listPlc;
- private static List<WcsDevice> listPlcDevice;
- private static List<WcsPosition> listPlcStation;
+ private static List<WcsPlc> listPlc = new List<WcsPlc>();
+ private static List<WcsDevice> listPlcDevice = new List<WcsDevice>();
+ private static List<WcsPosition> listPlcStation = new List<WcsPosition>();
+ private static List<WcsAlarmInfo> listAlarmInfo = new List<WcsAlarmInfo>();
private static List<PLCUtil> listPlcUtil = new List<PLCUtil>();
- private static CancellationTokenSource cts;//鍙栨秷绾跨▼鏍囪瘑
+ private static CancellationTokenSource cts = new CancellationTokenSource();//鍙栨秷绾跨▼鏍囪瘑
//瀵瑰鍏竷杩炴帴鐘舵��
public static List<PLCUtil> listPlcConn
{
@@ -32,10 +34,6 @@
{
//璁㈤槄浜嬩欢
DeviceValueChangeEvent += PLCService.OnChangeEvent;
-
- listPlc = _db.Queryable<WcsPlc>().ToList();
- listPlcDevice = _db.Queryable<WcsDevice>().ToList();
- listPlcStation = _db.Queryable<WcsPosition>().ToList();
}
/// <summary>
/// 鍒濆鍖朠LC杩炴帴
@@ -48,6 +46,7 @@
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)
@@ -64,6 +63,8 @@
cts = new CancellationTokenSource();
boRunningState = true;
StartRead();
+ ConnectionStatus();
+ StartWatchAlarm();
}
/// <summary>
/// 寮�鍚鍙杙lc绾跨▼
@@ -82,9 +83,11 @@
{
foreach (var modPlcUtil in listPlcUtil)
{
- modPlcUtil.Close();
+ if (modPlcUtil != null && modPlcUtil.Connected)
+ modPlcUtil.Close();
}
- throw new OperationCanceledException();
+ break;
+ //throw new OperationCanceledException();
}
try
{
@@ -94,7 +97,7 @@
modPlcUtil = new PLCUtil(modPlc);
listPlcUtil.Add(modPlcUtil);
}
- var listDevice = listPlcDevice.Where(s => s.PlcId == _modplc.Id).ToList();
+ var listDevice = listPlcDevice.Where(s => s.PlcId == _modplc.Id && s.DeviceType == DeviceTypeEnum.Business).ToList();
//寰幆璇昏澶�
foreach (var modDevice in listDevice.Where(s => s.Level == DeviceLevelEnum.DB))
{
@@ -109,9 +112,9 @@
dto.Type = _modplc.Type;
dto.PLCUtil = modPlcUtil;
dto.listStation = listPlcStation.Where(s => s.DeviceId == modDevice.Id).ToList();
- dto.listDevice = listDevice.Where(s => s.StationNum == modDevice.StationNum).ToList();
+ dto.listDevice = listDevice.Where(s => s.StationNum == modDevice.StationNum && s.Level == DeviceLevelEnum.Station).ToList();
//杩欓噷瑙﹀彂鍊煎彉鏇翠簨浠�
- DeviceValueChangeEvent?.Invoke(dto, EventArgs.Empty);
+ //DeviceValueChangeEvent?.Invoke(dto, EventArgs.Empty);
}
else
{
@@ -146,35 +149,41 @@
{
try
{
- //鍙栨秷绾跨▼ 鍏抽棴PLC杩炴帴
- if (cts.Token.IsCancellationRequested)
+ while (true)
{
- foreach (var modPlcUtil in listPlcUtil)
+
+ //鍙栨秷绾跨▼ 鍏抽棴PLC杩炴帴
+ if (cts.Token.IsCancellationRequested)
{
- modPlcUtil.Close();
- }
- throw new OperationCanceledException();
- }
- //鑾峰彇姣忎釜PLC杩炴帴鐘舵��
- foreach (var modPlc in listPlc)
- {
- var modPlcUtil = listPlcUtil.FirstOrDefault(s => s.PlcId == modPlc.Id);
- if (modPlcUtil == null)
- modPlc.IsConn = false;
- else
- modPlc.IsConn = modPlcUtil.Connected;
- if (sysCacheService.ExistKey("PLCCONN" + modPlc.Id))
- {
- var cachePlc = sysCacheService.Get<WcsPlc>("PLCCONN" + modPlc.Id);
- if (cachePlc.IsConn != modPlc.IsConn)
+ foreach (var modPlcUtil in listPlcUtil)
{
- //杩炴帴鐘舵�佸彉鏇� 閫氱煡鍓嶇
- _plcHubContext.Clients.All.PublicPlcConn(modPlc);
+ if (modPlcUtil != null && modPlcUtil.Connected)
+ modPlcUtil.Close();
}
+ break;
+ //throw new OperationCanceledException();
}
- sysCacheService.Set("PLCCONN" + modPlc.Id, modPlc);
+ //鑾峰彇姣忎釜PLC杩炴帴鐘舵��
+ foreach (var modPlc in listPlc)
+ {
+ var modPlcUtil = listPlcUtil.FirstOrDefault(s => s.PlcId == modPlc.Id);
+ if (modPlcUtil == null)
+ modPlc.IsConn = false;
+ else
+ modPlc.IsConn = modPlcUtil.Connected;
+ if (sysCacheService.ExistKey("PLCCONN" + modPlc.Id))
+ {
+ var cachePlc = sysCacheService.Get<WcsPlc>("PLCCONN" + modPlc.Id);
+ if (cachePlc.IsConn != modPlc.IsConn)
+ {
+ //杩炴帴鐘舵�佸彉鏇� 閫氱煡鍓嶇
+ _plcHubContext.Clients.All.PublicPlcConn(modPlc);
+ }
+ }
+ sysCacheService.Set("PLCCONN" + modPlc.Id, modPlc);
+ }
+ Thread.Sleep(1000);
}
- Thread.Sleep(3000);
}
catch (OperationCanceledException)
{
@@ -189,6 +198,70 @@
});
}
+
+ /// <summary>
+ /// 寮�鍚姤璀︾洃鎺�
+ /// </summary>
+ public static void StartWatchAlarm()
+ {
+ Task.Run(() =>
+ {
+ var listPlc = listAlarmInfo.GroupBy(s => new { s.PlcIP, s.PlcPort }).ToList();
+ List<PLCUtil> listPlcUtil = new List<PLCUtil>();
+ int i = 0;
+ foreach (var modPlc in listPlc)
+ {
+ listPlcUtil.Add(new PLCUtil(new WcsPlc() { Id = i++, IP = modPlc.Key.PlcIP, Port = modPlc.Key.PlcPort, PLCType = PLCEnum.S7_1500 }));
+ }
+ while (true)
+ {
+ //鍙栨秷绾跨▼ 鍏抽棴PLC杩炴帴
+ if (cts.Token.IsCancellationRequested)
+ {
+ foreach (var modPlcUtil in listPlcUtil)
+ {
+ if (modPlcUtil != null && modPlcUtil.Connected)
+ modPlcUtil.Close();
+ }
+ break;
+ //throw new OperationCanceledException();
+ }
+ foreach (var modUtil in listPlcUtil)
+ {
+ //鎶ヨ鐐逛綅
+ var listAlarm = listAlarmInfo.Where(s => s.PlcIP == modUtil.PlcId.ToString());
+ foreach (var modAlarm in listAlarm)
+ {
+ (var result, var value) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Short, modAlarm.AlarmCode, "");
+ if (result.IsSucceed)
+ {
+ //鍋囪涓嶄负0灏辩畻鎶ヨ
+ if (value != 0)
+ {
+ //淇敼鎶ヨ鐘舵�佸悓鏃惰褰曟姤璀︽棩蹇�
+ 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>());
+ }
+ //鍙栨秷鎶ヨ
+ else if (modAlarm.Status == YesNoEnum.Y)
+ {
+ modAlarm.AlarmTime = null;
+ modAlarm.Status = YesNoEnum.N;
+ _db.Updateable(modAlarm).ExecuteCommand();
+ }
+ }
+ }
+
+ }
+ Thread.Sleep(1000);
+ }
+ }, cts.Token);
+ }
/// <summary>
/// 鍋滄鏈嶅姟
/// </summary>
--
Gitblit v1.8.0