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 | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
index ae15fb6..e4fce43 100644
--- a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
@@ -106,7 +106,7 @@
[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>
@@ -124,9 +124,9 @@
.ToListAsync();
foreach (var modPlc in listPlc)
{
- 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);
modPlc.IsConn = cachePlc.IsConn;
}
else
@@ -138,5 +138,16 @@
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