1

dengjunjie

5 天以前 fbc6fae6c793220d0b67ac603ce9bbf22837de79

 ÏîÄ¿´úÂë/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;