From 2f75b4c0a67ccc3a443e7cc4f2f0f909defd9a92 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期五, 01 十一月 2024 09:49:23 +0800
Subject: [PATCH] 版本更新
---
WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs b/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs
index c759c5b..db7dab4 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs
+++ b/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
{
@@ -43,10 +44,11 @@
List<VueDictionaryDTO> vueDictionaryDTOs = Service.GetVueDictionary(dicNos);
try
{
+ List<string> selectDicNos = vueDictionaryDTOs.Select(x => x.DicNo).ToList();
List<string> cacheDicNos = new List<string>();
- foreach (string n in dicNos)
+ foreach (string n in dicNos.Where(x => !selectDicNos.Contains(x)))
{
- string str = _cacheService.Get(n);
+ string? str = _cacheService.Get(n);
if (!string.IsNullOrEmpty(str))
{
VueDictionaryDTO? vueDictionary = JsonConvert.DeserializeObject<VueDictionaryDTO>(str);
@@ -59,7 +61,8 @@
}
}
List<string> dicList = dicNos.ToList();
- if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0)
+ List<string> otherDicNos = dicNos.Where(x => !cacheDicNos.Contains(x) && !selectDicNos.Contains(x)).ToList();
+ if (otherDicNos.Count() > 0)
{
string str = AppSettings.Configuration["dics"];
if (!string.IsNullOrEmpty(str))
@@ -68,15 +71,17 @@
List<string> dics = str.Split(",").ToList();
- foreach (var item in dics)
+ foreach (var item in otherDicNos)
{
- dicList.Remove(item);
- cusDics.Add(item);
+ if (dics.Contains(item))
+ {
+ cusDics.Add(item);
+ }
}
foreach (var item in cusDics)
{
- VueDictionaryDTO vueDictionaryDTO = GetVueDictionary(item.Trim());
+ VueDictionaryDTO? vueDictionaryDTO = GetVueDictionary(item.Trim());
if (vueDictionaryDTO != null)
{
vueDictionaryDTOs.Add(vueDictionaryDTO);
@@ -107,9 +112,7 @@
{
Type type = typeof(IDevice);
var basePath = AppContext.BaseDirectory;
- string path = Path.Combine(basePath, Assembly.GetExecutingAssembly().GetName().Name);
- Assembly assembly = Assembly.LoadFrom(path);
- List<Type> types = assembly.GetTypes().Where(x => type.IsAssignableFrom(x) && !x.IsAbstract && !x.IsInterface).ToList();
+ List<Type> types = type.Assembly.GetTypes().Where(x => type.IsAssignableFrom(x) && !x.IsAbstract && !x.IsInterface).ToList();
List<object> data = new List<object>();
foreach (var deviceType in types)
{
@@ -123,6 +126,8 @@
data.Add(new { key = deviceType.Name, value = deviceType.Name });
}
}
+
+ data.Add(new { key = "", value = "鏃�" });
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
@@ -147,12 +152,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