From 29f20b28392d212c04c0c40a512894f8622cfa53 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 16 四月 2025 09:32:01 +0800
Subject: [PATCH] 合并
---
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs
index c759c5b..8dab7e2 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs
@@ -21,6 +21,7 @@
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Caches;
+using WIDESEAWCS_QuartzJob.DeviceEnum;
namespace WIDESEAWCS_WCSServer.Controllers.System
{
@@ -36,7 +37,6 @@
_httpContextAccessor = httpContextAccessor;
_cacheService = cacheService;
}
-
[HttpPost, Route("GetVueDictionary"), AllowAnonymous]
public IActionResult GetVueDictionary([FromBody] string[] dicNos)
{
@@ -107,8 +107,8 @@
{
Type type = typeof(IDevice);
var basePath = AppContext.BaseDirectory;
- string path = Path.Combine(basePath, Assembly.GetExecutingAssembly().GetName().Name);
- Assembly assembly = Assembly.LoadFrom(path);
+ //string path = Path.Combine("", Assembly.GetAssembly(type).GetName());
+ Assembly assembly = Assembly.GetAssembly(type);
List<Type> types = assembly.GetTypes().Where(x => type.IsAssignableFrom(x) && !x.IsAbstract && !x.IsInterface).ToList();
List<object> data = new List<object>();
foreach (var deviceType in types)
@@ -147,12 +147,12 @@
case "deviceStatus":
{
List<object> data = new List<object>();
- Type type = Type.GetType("WIDESEAWCS_QuartzJob.DeviceEnum.DeviceStatusEnum");
+ Type type = typeof(DeviceStatusEnum);
List<int> enums = Enum.GetValues(type).Cast<int>().ToList();
int index = 0;
foreach (var item in enums)
{
- FieldInfo? fieldInfo = type.GetField((item).ToString());
+ FieldInfo? fieldInfo = type.GetField(((DeviceStatusEnum)item).ToString());
DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
if (description != null)
{
--
Gitblit v1.9.3