1

dengjunjie

2025-05-28 01030b05f7ea9b14878102718a2004b4f908dcfc

 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs

@@ -25,11 +25,13 @@
    {
        private readonly IUnitOfWorkManage _unitOfWorkManage;
        private readonly ICacheService _cacheService;
        private readonly ISys_RoleService _sys_RoleService;

        public Sys_DictionaryService(ISys_DictionaryRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService) : base(BaseDal)
        public Sys_DictionaryService(ISys_DictionaryRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_RoleService sys_RoleService) : base(BaseDal)
        {
            _unitOfWorkManage = unitOfWorkManage;
            _cacheService = cacheService;
            _sys_RoleService = sys_RoleService;
        }

        public ISys_DictionaryRepository Repository => BaseDal;
@@ -54,6 +56,29 @@
            List<VueDictionaryDTO> vueDictionaryDTOs = new List<VueDictionaryDTO>();

            List<string> cacheDicNos = new List<string>();
            #region 鏌ヨ鏁版嵁搴撲笅鎷夋鏁版嵁
            if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0)
            {
                var selectDics = BaseDal.GetDictionaries(dicNos.Where(x => !cacheDicNos.Contains(x)), _sys_RoleService.GetAllChildren(App.User.RoleId));

                foreach (var item in selectDics)
                {
                    if (!_cacheService.Exists(item.DicNo))
                    {
                        vueDictionaryDTOs.Add(item);
                    }
                    else
                    {
                        VueDictionaryDTO? vueDictionary = JsonConvert.DeserializeObject<VueDictionaryDTO>(_cacheService.Get(item.DicNo));
                        if (vueDictionary != null && vueDictionary.Data.ToJson() != item.Data.ToJson())
                        {
                            vueDictionaryDTOs.Add(item);
                            _cacheService.AddOrUpdate(item.DicNo, item.Serialize());
                        }
                    }
                }
            }
            #endregion
            foreach (string n in dicNos)
            {
                string str = _cacheService.Get(n);
@@ -61,47 +86,13 @@
                {
                    VueDictionaryDTO? vueDictionary = JsonConvert.DeserializeObject<VueDictionaryDTO>(str);

                    if (vueDictionary != null)
                    if (vueDictionary != null && vueDictionaryDTOs.Where(x => x.DicNo == vueDictionary.DicNo).FirstOrDefault() == null)
                    {
                        vueDictionaryDTOs.Add(vueDictionary);
                        cacheDicNos.Add(n);
                    }
                }
            }
            if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0)
            {
                List<VueDictionaryDTO> selectDics = BaseDal.GetDictionaries(dicNos.Where(x => !cacheDicNos.Contains(x))).Select(s => new VueDictionaryDTO
                {
                    DicNo = s.DicNo,
                    Config = s.Config,
                    //dbSql = s.Sql,
                    Data = s.DicList.OrderByDescending(o => o.OrderNo).Select(list => new { key = list.DicValue, value = list.DicName })
                }).ToList();

                foreach (var item in selectDics)
                {
                    if (!_cacheService.Exists(item.DicNo))
                    {
                        _cacheService.Add(item.DicNo, item.Serialize());
                    }
                }
                vueDictionaryDTOs.AddRange(selectDics);
            }

            //object GetSourceData(string dicNo, string dbSql, object data)
            //{
            //    if (string.IsNullOrEmpty(dbSql))
            //    {
            //        return data;
            //    }
            //    return BaseDal.QueryObjectDataBySql(dbSql, null);
            //}
            //List<VueDictionaryDTO> vueDictionaryDTOs = dicConfig.Select(item => new VueDictionaryDTO
            //{
            //    DicNo = item.dicNo,
            //    Config = item.config,
            //    Data = GetSourceData(item.dicNo, item.dbSql, item.list)
            //}).ToList();

            try
            {
@@ -117,8 +108,9 @@

                        foreach (var item in dics)
                        {
                            dicList.Remove(item);
                            if (dicList.Contains(item))
                            cusDics.Add(item);
                            dicList.Remove(item);
                        }

                        foreach (var item in cusDics)