From fbc6fae6c793220d0b67ac603ce9bbf22837de79 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 19 六月 2025 17:50:47 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs | 102 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 84 insertions(+), 18 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs"
index 8ccdaeb..66a3a70 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs"
@@ -22,7 +22,7 @@
//using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Caches;
-namespace WIDESEAWCS_WCSServer.Controllers.System
+namespace WIDESEAWCS_Server.Controllers.System
{
[Route("api/Sys_Dictionary")]
[ApiController]
@@ -44,20 +44,20 @@
try
{
List<string> cacheDicNos = new List<string>();
- //foreach (string n in dicNos)
- //{
- // string str = _cacheService.Get(n);
- // if (!string.IsNullOrEmpty(str))
- // {
- // VueDictionaryDTO? vueDictionary = JsonConvert.DeserializeObject<VueDictionaryDTO>(str);
+ foreach (string n in dicNos)
+ {
+ string str = _cacheService.Get(n);
+ if (!string.IsNullOrEmpty(str))
+ {
+ VueDictionaryDTO? vueDictionary = JsonConvert.DeserializeObject<VueDictionaryDTO>(str);
- // if (vueDictionary != null)
- // {
- // vueDictionaryDTOs.Add(vueDictionary);
- // cacheDicNos.Add(n);
- // }
- // }
- //}
+ if (vueDictionary != null && vueDictionaryDTOs.Where(x => x.DicNo == vueDictionary.DicNo).FirstOrDefault() == null)
+ {
+ vueDictionaryDTOs.Add(vueDictionary);
+ cacheDicNos.Add(n);
+ }
+ }
+ }
List<string> dicList = dicNos.ToList();
if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0)
{
@@ -97,7 +97,7 @@
return Json(vueDictionaryDTOs);
}
- private VueDictionaryDTO? GetVueDictionary(string key)
+ public static VueDictionaryDTO? GetVueDictionary(string key)
{
VueDictionaryDTO? result = null;
try
@@ -162,7 +162,7 @@
DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
if (description != null)
{
- data.Add(new { key = index , value = description.Description });
+ data.Add(new { key = index, value = description.Description });
}
else
{
@@ -273,7 +273,7 @@
{
List<object> data = new List<object>();
- #region TaskInStatusEnum
+ #region TaskInStatusEnum/鍏ュ簱浠诲姟鐘舵��
{
Type type = typeof(TaskInStatusEnum);
List<int> enums = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().ToList();
@@ -295,7 +295,7 @@
}
#endregion
- #region TaskOutStatusEnum
+ #region TaskOutStatusEnum/鍑哄簱浠诲姟鐘舵��
{
Type type = typeof(TaskOutStatusEnum);
List<int> enums = Enum.GetValues(typeof(TaskOutStatusEnum)).Cast<int>().ToList();
@@ -317,6 +317,72 @@
}
#endregion
+ #region TaskRelocationStatusEnum/绉诲簱浠诲姟鐘舵��
+ {
+ Type type = typeof(TaskRelocationStatusEnum);
+ List<int> enums = Enum.GetValues(typeof(TaskRelocationStatusEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(TaskRelocationStatusEnum).GetField(((TaskRelocationStatusEnum)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item.ToString(), value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item.ToString(), value = item.ToString() });
+ }
+ index++;
+ }
+ }
+ #endregion
+
+ #region TaskCarStatusEnum/绉昏溅浠诲姟鐘舵��
+ {
+ Type type = typeof(TaskCarStatusEnum);
+ List<int> enums = Enum.GetValues(typeof(TaskCarStatusEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(TaskCarStatusEnum).GetField(((TaskCarStatusEnum)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item.ToString(), value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item.ToString(), value = item.ToString() });
+ }
+ index++;
+ }
+ }
+ #endregion
+
+ #region CarChargingTaskEnum/绌挎杞﹀厖鐢典换鍔＄姸鎬�
+ {
+ Type type = typeof(CarChargingTaskEnum);
+ List<int> enums = Enum.GetValues(typeof(CarChargingTaskEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(CarChargingTaskEnum).GetField(((CarChargingTaskEnum)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item.ToString(), value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item.ToString(), value = item.ToString() });
+ }
+ index++;
+ }
+ }
+ #endregion
+
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
--
Gitblit v1.9.3