From d3e1346d52806f00d21eba23cabf9cfa4f61d7d4 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 05 九月 2024 16:34:00 +0800
Subject: [PATCH] 测试页面，修复bug
---
Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
index 20f41a3..e4fce43 100644
--- a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
@@ -1,4 +1,6 @@
锘�
+using Admin.NET.Core.Service;
+
namespace WCS.Application;
/// <summary>
@@ -8,9 +10,11 @@
public class WcsPlcService : IDynamicApiController, ITransient
{
private readonly SqlSugarRepository<WcsPlc> _wcsPlcRep;
- public WcsPlcService(SqlSugarRepository<WcsPlc> wcsPlcRep)
+ private readonly SysCacheService _sysCacheService;
+ public WcsPlcService(SqlSugarRepository<WcsPlc> wcsPlcRep, SysCacheService sysCacheService)
{
_wcsPlcRep = wcsPlcRep;
+ _sysCacheService = sysCacheService;
}
/// <summary>
@@ -102,11 +106,48 @@
[DisplayName("鑾峰彇PLC鍒楄〃")]
public async Task<List<WcsPlcOutput>> List([FromQuery] PageWcsPlcInput input)
{
- return await _wcsPlcRep.AsQueryable().Select<WcsPlcOutput>().ToListAsync();
+ return await _wcsPlcRep.AsQueryable().WhereIF(input.Type != null, s => s.Type == input.Type).Select<WcsPlcOutput>().ToListAsync();
}
-
-
-
-
+ /// <summary>
+ /// 鑾峰彇PLC杩炴帴鐘舵�佸拰鏈嶅姟鐘舵��
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "ListStatus")]
+ [DisplayName("鑾峰彇PLC杩炴帴鐘舵��")]
+ public async Task<dynamic> ListStatus([FromQuery] PageWcsPlcInput input)
+ {
+ var listPlc = await _wcsPlcRep.AsQueryable()
+ .Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine)
+ .ToListAsync();
+ foreach (var modPlc in listPlc)
+ {
+ if (_sysCacheService.ExistKey("PLCCONN:" + modPlc.Id))
+ {
+ var cachePlc = _sysCacheService.Get<WcsPlc>("PLCCONN:" + modPlc.Id);
+ modPlc.IsConn = cachePlc.IsConn;
+ }
+ else
+ {
+ modPlc.IsConn = false;
+ }
+ }
+ //鏈嶅姟鐘舵��
+ var modService = new { PLCTaskAction.boRunningState, PLCTaskAction.boOffline, PLCTaskAction.boRefresh };
+ return new { listPlc, modService };
+ }
+ /// <summary>
+ /// 鑾峰彇浣嶇疆淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "ListPosition")]
+ [DisplayName("鑾峰彇浣嶇疆淇℃伅")]
+ public List<PlcPositionInfo> ListPosition()
+ {
+ var list = PLCTaskAction.listPositionInfo.ToList();
+ return list;
+ }
}
--
Gitblit v1.8.0