编码更新，用于数据迁移

lixiaojun

2024-05-21 dc5bfa19ffc92dada57bdd6b052de6dfd25a010a

编码更新，用于数据迁移

 Yw.Application.Unit.Core/01-lang/SysUnitLang_Controller.cs

ÎļþÃû´Ó Yw.Application.Unit.Core/01-sys-unit-lang/SysUnitLang_Controller.cs ÐÞ¸Ä
@@ -80,14 +80,14 @@
        [HttpPut]
        public bool Update([Required] UpdateSysUnitLangInput input)
        {
            if (_service.IsExistCodeExceptID(input.Code, input.ID))
            {
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
            }
            var model = _service.GetByID(input.ID);
            if (model == null)
            {
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            if (_service.IsExistCodeExceptID(input.Code, input.ID))
            {
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
            }
            var rhs = new Model.SysUnitLang(model);
            input.Adapt(rhs);
@@ -118,6 +118,23 @@
            return bol;
        }

        /// <summary>
        /// æ›´æ–°ç¼–码
        /// </summary>
        [Route("UpdateCode@V1.0")]
        [HttpPut]
        public bool UpdateCode([Required] UpdateCodeInput input)
        {
            if (_service.IsExistCodeExceptID(input.Code, input.ID))
            {
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
            }
            var bol = _service.UpdateCode(input.ID, input.Code);
            return bol;
        }



        #endregion

        #region Exist

 Yw.Application.Unit.Core/01-lang/SysUnitLang_StdController.cs

 Yw.Application.Unit.Core/02-type/SysUnitType_Controller.cs

@@ -130,6 +130,21 @@
            return bol;
        }

        /// <summary>
        /// æ›´æ–°ç¼–码
        /// </summary>
        [Route("UpdateCode@V1.0")]
        [HttpPut]
        public bool UpdateCode([Required] UpdateCodeInput input)
        {
            if (_service.IsExistCodeExceptID(input.Code, input.ID))
            {
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
            }
            var bol = _service.UpdateCode(input.ID, input.Code);
            return bol;
        }

        #endregion

        #region Exist

 Yw.Application.Unit.Core/03-value/SysUnitValue_Controller.cs

@@ -59,10 +59,6 @@
            return vm_list;
        }





        #endregion

        #region Insert
@@ -139,6 +135,26 @@
            return bol;
        }

        /// <summary>
        /// æ›´æ–°ç¼–码
        /// </summary>
        [Route("UpdateCode@V1.0")]
        [HttpPut]
        public bool UpdateCode([Required] UpdateCodeInput input)
        {
            var model = _service.GetByID(input.ID);
            if (model == null)
            {
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            if (_service.IsExistCodeExceptID(model.TypeID, input.Code, input.ID))
            {
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
            }
            var bol = _service.UpdateCode(input.ID, input.Code);
            return bol;
        }

        #endregion

        #region Exist

 Yw.Application.Unit.Core/04-name/SysUnitName_Controller.cs

@@ -32,7 +32,9 @@
        {
            var model = _service.GetByID(input.ID);
            if (model == null)
            {
                return default;
            }
            return new SysUnitNameDto(model);
        }

@@ -56,21 +58,6 @@

        #region Set

        /// <summary>
        /// è®¾ç½® ï¼ˆè€ƒè™‘作废）
        /// </summary>
        [Route("SetOfValue@V1.0")]
        [HttpPost]
        public bool SetOfValue([Required] SetSysUnitNameValueInput input)
        {
            var list = input.Setters?.Select(x =>
            {
                var model = x.Adapt<SysUnitNameValueSetter, Model.SysUnitNameValueSetter>();
                return model;
            }).ToList();
            var bol = _service.SetByValueID(input.ValueID, list);
            return bol;
        }

        /// <summary>
        /// é€šè¿‡ ValueID è®¾ç½®

 Yw.Application.Unit.Core/05-transfer/SysUnitTransfer_Controller.cs

@@ -57,22 +57,6 @@
        #region Set

        /// <summary>
        /// è®¾ç½® ï¼ˆè€ƒè™‘作废）
        /// </summary>
        [Route("SetOfType@V1.0")]
        [HttpPost]
        public bool SetOfType([Required] SetSysUnitTransferTypeInput input)
        {
            var list = input.Setters?.Select(x =>
            {
                var model = x.Adapt<SysUnitTransferTypeSetter, Model.SysUnitTransferTypeSetter>();
                return model;
            }).ToList();
            var bol = _service.SetByTypeID(input.TypeID, list);
            return bol;
        }

        /// <summary>
        /// é€šè¿‡ TypeID è®¾ç½®
        /// </summary>
        [Route("SetByTypeID@V1.0")]

 Yw.Application.Unit.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-05-13T01:32:47.5202940Z;True|2024-05-08T15:06:02.4935916+08:00;True|2024-04-11T11:48:27.6911791+08:00;True|2024-04-03T09:21:17.2938358+08:00;True|2024-03-30T14:43:35.7624433+08:00;True|2024-03-24T16:04:31.1520708+08:00;True|2024-03-20T13:28:31.4429012+08:00;True|2024-03-08T16:08:21.6186021+08:00;True|2024-01-27T09:16:19.1123592+08:00;True|2024-01-21T14:04:53.3821335+08:00;True|2024-01-20T18:00:33.8425629+08:00;True|2024-01-20T17:58:31.8270324+08:00;True|2024-01-20T12:19:49.4239246+08:00;True|2024-01-14T13:50:48.6498781+08:00;True|2023-12-02T14:29:46.1910954+08:00;True|2023-11-15T09:23:23.1277615+08:00;True|2023-11-13T11:14:23.7047654+08:00;True|2023-11-07T15:28:54.3174797+08:00;True|2023-10-27T13:22:55.8696581+08:00;True|2023-10-21T18:17:31.4681547+08:00;True|2023-10-18T17:29:57.6963038+08:00;True|2023-09-15T12:09:34.4888678+08:00;True|2023-09-14T15:15:33.6113596+08:00;True|2023-08-21T13:09:54.7440181+08:00;True|2023-07-25T15:08:42.3375388+08:00;True|2023-07-17T10:31:53.5181752+08:00;True|2023-07-17T10:31:44.6652344+08:00;True|2023-07-13T12:10:11.2591498+08:00;True|2023-05-25T18:02:16.3580168+08:00;True|2023-05-25T15:44:32.4909866+08:00;</History>
    <History>True|2024-05-21T06:19:57.0327597Z;True|2024-05-13T09:32:47.5202940+08:00;True|2024-05-08T15:06:02.4935916+08:00;True|2024-04-11T11:48:27.6911791+08:00;True|2024-04-03T09:21:17.2938358+08:00;True|2024-03-30T14:43:35.7624433+08:00;True|2024-03-24T16:04:31.1520708+08:00;True|2024-03-20T13:28:31.4429012+08:00;True|2024-03-08T16:08:21.6186021+08:00;True|2024-01-27T09:16:19.1123592+08:00;True|2024-01-21T14:04:53.3821335+08:00;True|2024-01-20T18:00:33.8425629+08:00;True|2024-01-20T17:58:31.8270324+08:00;True|2024-01-20T12:19:49.4239246+08:00;True|2024-01-14T13:50:48.6498781+08:00;True|2023-12-02T14:29:46.1910954+08:00;True|2023-11-15T09:23:23.1277615+08:00;True|2023-11-13T11:14:23.7047654+08:00;True|2023-11-07T15:28:54.3174797+08:00;True|2023-10-27T13:22:55.8696581+08:00;True|2023-10-21T18:17:31.4681547+08:00;True|2023-10-18T17:29:57.6963038+08:00;True|2023-09-15T12:09:34.4888678+08:00;True|2023-09-14T15:15:33.6113596+08:00;True|2023-08-21T13:09:54.7440181+08:00;True|2023-07-25T15:08:42.3375388+08:00;True|2023-07-17T10:31:53.5181752+08:00;True|2023-07-17T10:31:44.6652344+08:00;True|2023-07-13T12:10:11.2591498+08:00;True|2023-05-25T18:02:16.3580168+08:00;True|2023-05-25T15:44:32.4909866+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 Yw.Application.Unit.Core/Yw.Application.Unit.Core.csproj

@@ -7,7 +7,7 @@
    <RootNamespace>Yw.Application</RootNamespace>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
    <Version>3.0.6</Version>
    <Version>3.0.7</Version>
    <Description>引用升级</Description>
  </PropertyGroup>

@@ -34,7 +34,7 @@

  <ItemGroup>
    <PackageReference Include="Yw.Application.Core" Version="3.0.7" />
    <PackageReference Include="Yw.Dto.Unit.Core" Version="3.0.6" />
    <PackageReference Include="Yw.Dto.Unit.Core" Version="3.0.7" />
  </ItemGroup>

</Project>

 Yw.Dto.Unit.Core/01-lang/AddSysUnitLangInput.cs

 Yw.Dto.Unit.Core/01-lang/SysUnitLangDto.cs

 Yw.Dto.Unit.Core/01-lang/SysUnitLangStdDto.cs

 Yw.Dto.Unit.Core/01-lang/UpdateSysUnitLangInput.cs

 Yw.Dto.Unit.Core/02-type/AddSysUnitTypeInput.cs

 Yw.Dto.Unit.Core/02-type/SysUnitTypeDto.cs

 Yw.Dto.Unit.Core/02-type/SysUnitTypeStdDto.cs

 Yw.Dto.Unit.Core/02-type/UpdateSysUnitTypeInput.cs

 Yw.Dto.Unit.Core/03-value/AddSysUnitValueInput.cs

 Yw.Dto.Unit.Core/03-value/SysUnitValueDto.cs

 Yw.Dto.Unit.Core/03-value/SysUnitValueStdDto.cs

 Yw.Dto.Unit.Core/03-value/UpdateSysUnitValueInput.cs

 Yw.Dto.Unit.Core/04-name/SetSysUnitNameValueInput.cs

 Yw.Dto.Unit.Core/04-name/SysUnitNameDto.cs

 Yw.Dto.Unit.Core/04-name/SysUnitNameValueSetter.cs

 Yw.Dto.Unit.Core/05-transfer/SetSysUnitTransferTypeInput.cs

 Yw.Dto.Unit.Core/05-transfer/SysUnitTransferDto.cs

 Yw.Dto.Unit.Core/05-transfer/SysUnitTransferTypeSetter.cs

 Yw.Dto.Unit.Core/06-helper/CalcuSysUnitTransferInput.cs

 Yw.Dto.Unit.Core/06-helper/QuerySysUnitDictInput.cs

 Yw.Dto.Unit.Core/06-helper/QuerySysUnitNameInput.cs

 Yw.Dto.Unit.Core/06-helper/QuerySysUnitNameListInput.cs

 Yw.Dto.Unit.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-05-13T01:32:01.1736078Z;True|2024-05-08T15:05:05.7504044+08:00;True|2024-05-08T15:04:50.5790715+08:00;True|2024-04-11T11:47:05.2985116+08:00;True|2024-04-03T09:20:17.1118683+08:00;True|2024-04-03T09:20:14.2889343+08:00;True|2024-03-30T14:42:12.5290823+08:00;True|2024-03-24T15:58:01.8436381+08:00;True|2024-03-20T13:14:26.0945194+08:00;</History>
    <History>True|2024-05-21T06:13:16.7771524Z;True|2024-05-13T09:32:01.1736078+08:00;True|2024-05-08T15:05:05.7504044+08:00;True|2024-05-08T15:04:50.5790715+08:00;True|2024-04-11T11:47:05.2985116+08:00;True|2024-04-03T09:20:17.1118683+08:00;True|2024-04-03T09:20:14.2889343+08:00;True|2024-03-30T14:42:12.5290823+08:00;True|2024-03-24T15:58:01.8436381+08:00;True|2024-03-20T13:14:26.0945194+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 Yw.Dto.Unit.Core/Yw.Dto.Unit.Core.csproj

@@ -4,13 +4,13 @@
    <TargetFramework>net6.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>disable</Nullable>
    <Version>3.0.6</Version>
    <Version>3.0.7</Version>
    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Dto.Core" Version="3.0.7" />
    <PackageReference Include="Yw.Service.Unit.Core" Version="3.0.3" />
    <PackageReference Include="Yw.Service.Unit.Core" Version="3.0.5" />
  </ItemGroup>

</Project>

 Yw.Service.Unit.Core/03-settings/00-core/UnitFileHelper.cs

 Yw.Service.Unit.Core/03-settings/00-core/UnitParasHelper.cs

 Yw.Service.Unit.Core/03-settings/01-paras/00-core/Paras_Unit.cs

 Yw.Service.Unit.Core/03-settings/01-paras/00-core/UnitParas.cs

 Yw.Service.Unit.Core/03-settings/01-paras/01-database/Paras_Unit_DataBase.cs

ÎļþÃû´Ó Yw.Service.Unit.Core/03-settings/paras/Paras_Unit_DataBase.cs ÐÞ¸Ä
@@ -11,6 +11,11 @@
        public string DbType { get; set; }

        /// <summary>
        /// å·¥åŽ‚
        /// </summary>
        public Paras_Unit_DataBase_Factory Factory { get; set; }

        /// <summary>
        /// PostgreSql
        /// </summary>
        public Paras_Unit_DataBase_PostgreSql PostgreSql { get; set; }

 Yw.Service.Unit.Core/03-settings/01-paras/01-database/Paras_Unit_DataBase_Factory.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
namespace Yw.Settings
{
    /// <summary>
    /// 
    /// </summary>
    public class Paras_Unit_DataBase_Factory
    {
        /// <summary>
        /// æ˜¯å¦å¼€å¯ç¼“å­˜
        /// </summary>
        public bool EnableCache { get; set; }

        /// <summary>
        /// ç¼“存时间（秒）
        /// </summary>
        public int CacheTime { get; set; }
    }
}

 Yw.Service.Unit.Core/03-settings/01-paras/01-database/Paras_Unit_DataBase_PostgreSql.cs

 Yw.Service.Unit.Core/03-settings/01-paras/01-database/Paras_Unit_DataBase_SQLite.cs

 Yw.Service.Unit.Core/03-settings/01-paras/02-cal/Paras_Unit_CAL.cs

 Yw.Service.Unit.Core/03-settings/01-paras/02-cal/Paras_Unit_CAL_HttpClient.cs

 Yw.Service.Unit.Core/03-settings/01-paras/02-cal/Paras_Unit_CAL_LocalClient.cs

 Yw.Service.Unit.Core/05-service/00-core/01-dal/DALCreateHelper.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
namespace Yw.Service.Unit
{
    /// <summary>
    /// DAL辅助类
    /// </summary>
    internal class DALCreateHelper
    {

        /// <summary>
        /// åˆ›å»ºDAL
        /// </summary>
        /// <typeparam name="T"></typeparam>
        /// <returns></returns>
        public static T CreateDAL<T>()
        {
            var dbType = Settings.UnitParasHelper.Unit.DataBase.DbType;
            var enableCache = Settings.UnitParasHelper.Unit.DataBase.Factory.EnableCache;
            var cacheTime = Settings.UnitParasHelper.Unit.DataBase.Factory.CacheTime;
            return Yw.DALFactory.CreateDAL<T>(dbType, enableCache, cacheTime);
        }

    }
}

 Yw.Service.Unit.Core/05-service/00-core/02-cache/CacheHelper.cs

 Yw.Service.Unit.Core/05-service/00-core/03-extensions/Extensions.cs

 Yw.Service.Unit.Core/05-service/00-core/04-helper/SysUnitHelper.cs

 Yw.Service.Unit.Core/05-service/00-helper/DALHelper.cs

ÎļþÒÑɾ³ý

 Yw.Service.Unit.Core/05-service/01-lang/SysUnitLang.cs

@@ -12,7 +12,7 @@
        {
            var all = SysUnitLangCacheHelper.GetSet(() =>
            {
                var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
                var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
                var entityList = dal.GetAll();
                var modelList = Entity2Models(entityList);
                if (modelList == null)
@@ -27,7 +27,7 @@
        //通过 ID æ›´æ–°ç¼“å­˜
        private static void UpdateCache(long ID)
        {
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var entityDb = dal.GetByID(ID);
            var modelDb = Entity2Model(entityDb);
            var all = GetCache();
@@ -50,7 +50,7 @@
            {
                return;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var entityList = dal.GetByIds(Ids);
            var modelList = Entity2Models(entityList);
            var all = GetCache();
@@ -178,7 +178,7 @@
                return default;
            }
            var entity = Model2Entity(model);
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var id = dal.Insert(entity);
            if (id > 0)
            {
@@ -196,7 +196,7 @@
            {
                return default;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var entityList = Model2Entities(list);
            var ids = dal.InsertsR(entityList);
            if (ids != null && ids.Count > 0)
@@ -218,10 +218,14 @@
        {
            if (model == null)
            {
                return default;
                return false;
            }
            if (model.ID < 1)
            {
                return false;
            }
            var entity = Model2Entity(model);
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var bol = dal.Update(entity);
            if (bol)
            {
@@ -237,10 +241,14 @@
        {
            if (list == null || list.Count < 1)
            {
                return default;
                return false;
            }
            if (list.Exists(x => x.ID < 1))
            {
                return false;
            }
            var entityList = Model2Entities(list.ToList());
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var bol = dal.Updates(entityList);
            if (bol)
            {
@@ -256,9 +264,9 @@
        {
            if (ID < 1)
            {
                return default;
                return false;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var bol = dal.UpdateSortCode(ID, SortCode);
            if (bol)
            {
@@ -274,9 +282,13 @@
        {
            if (sorters == null || sorters.Count < 1)
            {
                return default;
                return false;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            if (sorters.Exists(x => x.ID < 1))
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var bol = dal.UpdateSorter(sorters.ToEntityList());
            if (bol)
            {
@@ -284,6 +296,25 @@
            }
            return bol;
        }

        /// <summary>
        /// æ›´æ–°ç¼–码
        /// </summary>
        public bool UpdateCode(long ID, string Code)
        {
            if (ID < 1)
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var bol = dal.UpdateCode(ID, Code);
            if (bol)
            {
                UpdateCache(ID);
            }
            return bol;
        }


        #endregion

@@ -301,7 +332,7 @@
            var all = GetAll();
            if (all == null || all.Count < 1)
            {
                return default;
                return false;
            }
            return all.Exists(x => x.Code == Code);
        }
@@ -318,7 +349,7 @@
            var all = GetAll();
            if (all == null || all.Count < 1)
            {
                return default;
                return false;
            }
            return all.Exists(x => x.Code == Code && x.ID != ExceptID);
        }
@@ -338,7 +369,7 @@
                Msg = "已配置单位名称";
                return false;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitLang>();
            var bol = dal.DeleteByID(ID);
            if (bol)
            {

 Yw.Service.Unit.Core/05-service/02-type/SysUnitType.cs

@@ -12,7 +12,7 @@
        {
            var all = SysUnitTypeCacheHelper.GetSet(() =>
            {
                var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitType>();
                var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitType>();
                var entityList = dal.GetAll();
                var modelList = Entity2Models(entityList);
                if (modelList == null)
@@ -27,7 +27,7 @@
        //通过 ID æ›´æ–°ç¼“å­˜
        private static void UpdateCache(long ID)
        {
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var entityDb = dal.GetByID(ID);
            var modelDb = Entity2Model(entityDb);
            var all = GetCache();
@@ -50,7 +50,7 @@
            {
                return;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var entityList = dal.GetByIds(Ids);
            var modelList = Entity2Models(entityList);
            var all = GetCache();
@@ -177,7 +177,7 @@
                return default;
            }
            var entity = Model2Entity(model);
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var id = dal.Insert(entity);
            if (id > 0)
            {
@@ -195,7 +195,7 @@
            {
                return default;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var entityList = Model2Entities(list);
            var ids = dal.InsertsR(entityList);
            if (ids != null && ids.Count > 0)
@@ -217,10 +217,14 @@
        {
            if (model == null)
            {
                return default;
                return false;
            }
            if (model.ID < 1)
            {
                return false;
            }
            var entity = Model2Entity(model);
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var bol = dal.Update(entity);
            if (bol)
            {
@@ -236,10 +240,14 @@
        {
            if (list == null || list.Count < 1)
            {
                return default;
                return false;
            }
            if (list.Exists(x => x.ID < 1))
            {
                return false;
            }
            var entityList = Model2Entities(list.ToList());
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var bol = dal.Updates(entityList);
            if (bol)
            {
@@ -257,7 +265,7 @@
            {
                return default;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var bol = dal.UpdateSortCode(ID, SortCode);
            if (bol)
            {
@@ -275,7 +283,11 @@
            {
                return default;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            if (sorters.Exists(x => x.ID < 1))
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var bol = dal.UpdateSorter(sorters.ToEntityList());
            if (bol)
            {
@@ -283,6 +295,25 @@
            }
            return bol;
        }

        /// <summary>
        /// æ›´æ–°ç¼–码
        /// </summary>
        public bool UpdateCode(long ID, string Code)
        {
            if (ID < 1)
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var bol = dal.UpdateCode(ID, Code);
            if (bol)
            {
                UpdateCache(ID);
            }
            return bol;
        }


        #endregion

@@ -300,7 +331,7 @@
            var all = GetAll();
            if (all == null || all.Count < 1)
            {
                return default;
                return false;
            }
            return all.Exists(x => x.Code == Code);
        }
@@ -317,7 +348,7 @@
            var all = GetAll();
            if (all == null || all.Count < 1)
            {
                return default;
                return false;
            }
            return all.Exists(x => x.Code == Code && x.ID != ExceptID);
        }
@@ -337,7 +368,7 @@
                Msg = "已配置单位值";
                return false;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitType>();
            var bol = dal.DeleteByID(ID);
            if (bol)
            {

 Yw.Service.Unit.Core/05-service/03-value/SysUnitValue.cs

@@ -12,7 +12,7 @@
        {
            var all = SysUnitValueCacheHelper.GetSet(() =>
            {
                var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
                var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
                var entityList = dal.GetAll();
                var modelList = Entity2Models(entityList);
                if (modelList == null)
@@ -27,7 +27,7 @@
        //通过 ID æ›´æ–°ç¼“å­˜
        private static void UpdateCache(long ID)
        {
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var entityDb = dal.GetByID(ID);
            var modelDb = Entity2Model(entityDb);
            var all = GetCache();
@@ -50,7 +50,7 @@
            {
                return;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var entityList = dal.GetByIds(Ids);
            var modelList = Entity2Models(entityList);
            var all = GetCache();
@@ -209,7 +209,7 @@
                return default;
            }
            var entity = Model2Entity(model);
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var id = dal.Insert(entity);
            if (id > 0)
            {
@@ -227,7 +227,7 @@
            {
                return default;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var entityList = Model2Entities(list);
            var ids = dal.InsertsR(entityList);
            if (ids != null && ids.Count > 0)
@@ -249,10 +249,14 @@
        {
            if (model == null)
            {
                return default;
                return false;
            }
            if (model.ID < 1)
            {
                return false;
            }
            var entity = Model2Entity(model);
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var bol = dal.Update(entity);
            if (bol)
            {
@@ -268,10 +272,14 @@
        {
            if (list == null || list.Count < 1)
            {
                return default;
                return false;
            }
            if (list.Exists(x => x.ID < 1))
            {
                return false;
            }
            var entityList = Model2Entities(list.ToList());
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var bol = dal.Updates(entityList);
            if (bol)
            {
@@ -287,9 +295,9 @@
        {
            if (ID < 1)
            {
                return default;
                return false;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var bol = dal.UpdateSortCode(ID, SortCode);
            if (bol)
            {
@@ -305,13 +313,35 @@
        {
            if (sorters == null || !sorters.Any())
            {
                return default;
                return false;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            if (sorters.Exists(x => x.ID < 1))
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var bol = dal.UpdateSorter(sorters.ToEntityList());
            if (bol)
            {
                UpdateCache(sorters.Select(x => x.ID).ToList());
            }
            return bol;
        }

        /// <summary>
        /// æ›´æ–°ç¼–码
        /// </summary>
        public bool UpdateCode(long ID, string Code)
        {
            if (ID < 1)
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var bol = dal.UpdateCode(ID, Code);
            if (bol)
            {
                UpdateCache(ID);
            }
            return bol;
        }
@@ -341,7 +371,7 @@
            var all = GetAll();
            if (all == null || all.Count < 1)
            {
                return default;
                return false;
            }

            return all.Exists(x => x.TypeID == TypeID && x.Code == Code);
@@ -359,7 +389,7 @@
            var all = GetAll();
            if (all == null || all.Count < 1)
            {
                return default;
                return false;
            }
            return all.Exists(x => x.TypeID == TypeID && x.Code == Code && x.ID != ExceptID);
        }
@@ -384,7 +414,7 @@
                Msg = "已配置单位转换";
                return false;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var bol = dal.DeleteByID(ID);
            if (bol)
            {

 Yw.Service.Unit.Core/05-service/04-name/SysUnitName.cs

@@ -12,7 +12,7 @@
        {
            var all = SysUnitNameCacheHelper.GetSet(() =>
            {
                var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitName>();
                var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitName>();
                var entityList = dal.GetAll();
                var modelList = Entity2Models(entityList);
                if (modelList == null)
@@ -27,7 +27,7 @@
        //通过 ID æ›´æ–°ç¼“å­˜
        private static void UpdateCache(long ID)
        {
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitName>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitName>();
            var entityDb = dal.GetByID(ID);
            var modelDb = Entity2Model(entityDb);
            var all = GetCache();
@@ -50,7 +50,7 @@
            {
                return;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitName>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitName>();
            var entityList = dal.GetByIds(Ids);
            var modelList = Entity2Models(entityList);
            var all = GetCache();
@@ -65,7 +65,7 @@
        //通过 ValueID æ›´æ–°ç¼“å­˜
        private static void UpdateCacheByValueID(long ValueID)
        {
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitName>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitName>();
            var entityList = dal.GetByValueID(ValueID);
            var modelList = Entity2Models(entityList);
            var all = GetCache();
@@ -199,7 +199,7 @@
        /// </summary>
        public bool SetByValueID(long ValueID, List<Model.SysUnitNameValueSetter> list)
        {
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitName>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitName>();
            var entityList = list?.ToEntityList();
            var bol = dal.SetByValueID(ValueID, entityList);
            if (bol)

 Yw.Service.Unit.Core/05-service/05-transfer/SysUnitTransfer.cs

@@ -12,7 +12,7 @@
        {
            var all = SysUnitTransferCacheHelper.GetSet(() =>
            {
                var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitTransfer>();
                var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitTransfer>();
                var entityList = dal.GetAll();
                var modelList = Entity2Models(entityList);
                if (modelList == null)
@@ -27,7 +27,7 @@
        //通过 ID æ›´æ–°ç¼“å­˜
        private static void UpdateCache(long ID)
        {
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitTransfer>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitTransfer>();
            var entityDb = dal.GetByID(ID);
            var modelDb = Entity2Model(entityDb);
            var all = GetCache();
@@ -50,7 +50,7 @@
            {
                return;
            }
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitTransfer>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitTransfer>();
            var entityList = dal.GetByIds(Ids);
            var modelList = Entity2Models(entityList);
            var all = GetCache();
@@ -65,7 +65,7 @@
        //通过 TypeID æ›´æ–°ç¼“å­˜
        private static void UpdateCacheByTypeID(long TypeID)
        {
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitTransfer>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitTransfer>();
            var entityList = dal.GetByTypeID(TypeID);
            var modelList = Entity2Models(entityList);
            var all = GetCache();
@@ -208,7 +208,7 @@
        /// </summary>
        public bool SetByTypeID(long TypeID, List<Model.SysUnitTransferTypeSetter> list)
        {
            var dal = DALHelper.CreateDAL<Yw.DAL.ISysUnitTransfer>();
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitTransfer>();
            var entityList = list?.ToEntityList();
            var bol = dal.SetByTypeID(TypeID, entityList);
            if (bol)

 Yw.Service.Unit.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,6 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-04-11T03:46:08.7351336Z;True|2024-04-03T09:19:28.3206735+08:00;True|2024-03-30T14:40:53.5629250+08:00;True|2024-03-24T15:57:00.6285019+08:00;True|2024-03-20T20:29:28.4545096+08:00;True|2024-03-20T11:57:05.1553144+08:00;True|2024-03-08T16:07:15.2641115+08:00;True|2024-01-21T14:04:10.1964644+08:00;True|2024-01-20T17:53:52.5924005+08:00;True|2024-01-20T12:18:53.6738460+08:00;True|2024-01-14T13:38:56.7132086+08:00;True|2023-12-02T14:19:36.0851107+08:00;True|2023-11-13T11:13:38.2876503+08:00;True|2023-11-07T15:26:15.8664916+08:00;True|2023-10-27T13:21:57.8245827+08:00;True|2023-10-21T18:15:57.8975745+08:00;True|2023-10-18T17:28:42.7347523+08:00;True|2023-09-15T12:08:33.6892307+08:00;True|2023-09-14T15:13:47.6095636+08:00;True|2023-08-21T13:08:28.2298969+08:00;True|2023-07-17T10:30:15.0370305+08:00;True|2023-07-13T11:54:33.7989040+08:00;True|2023-07-13T11:54:23.3967174+08:00;True|2023-07-06T09:49:52.7407983+08:00;True|2023-05-25T15:37:23.5406830+08:00;False|2023-05-25T15:36:09.3589239+08:00;</History>
    <History>True|2024-05-21T06:10:07.7011142Z;True|2024-04-11T11:46:08.7351336+08:00;True|2024-04-03T09:19:28.3206735+08:00;True|2024-03-30T14:40:53.5629250+08:00;True|2024-03-24T15:57:00.6285019+08:00;True|2024-03-20T20:29:28.4545096+08:00;True|2024-03-20T11:57:05.1553144+08:00;True|2024-03-08T16:07:15.2641115+08:00;True|2024-01-21T14:04:10.1964644+08:00;True|2024-01-20T17:53:52.5924005+08:00;True|2024-01-20T12:18:53.6738460+08:00;True|2024-01-14T13:38:56.7132086+08:00;True|2023-12-02T14:19:36.0851107+08:00;True|2023-11-13T11:13:38.2876503+08:00;True|2023-11-07T15:26:15.8664916+08:00;True|2023-10-27T13:21:57.8245827+08:00;True|2023-10-21T18:15:57.8975745+08:00;True|2023-10-18T17:28:42.7347523+08:00;True|2023-09-15T12:08:33.6892307+08:00;True|2023-09-14T15:13:47.6095636+08:00;True|2023-08-21T13:08:28.2298969+08:00;True|2023-07-17T10:30:15.0370305+08:00;True|2023-07-13T11:54:33.7989040+08:00;True|2023-07-13T11:54:23.3967174+08:00;True|2023-07-06T09:49:52.7407983+08:00;True|2023-05-25T15:37:23.5406830+08:00;False|2023-05-25T15:36:09.3589239+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 Yw.Service.Unit.Core/Yw.Service.Unit.Core.csproj

@@ -7,7 +7,7 @@
        <RootNamespace>Yw</RootNamespace>
        <GenerateDocumentationFile>True</GenerateDocumentationFile>
        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
        <Version>3.0.3</Version>
        <Version>3.0.5</Version>
        <Description>引用升级</Description>
    </PropertyGroup>


 Yw.Service.Unit.Core/paras_unit_settings.json

@@ -1,10 +1,13 @@
{
  "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",


  "Unit": {
    "DataBase": {
      "DbType": "PostgreSql", //PostgreSql、SQLite
      "DbType": "PostgreSql", //PostgreSql/SQLite
      "Factory": {
        "EnableCache": true,
        "CacheTime": 10
      },
      "PostgreSql": {
        "ConnectString": "PORT=5432;DATABASE=yw_unit;HOST=localhost;PASSWORD=123456;USER ID=postgres;"
      },
@@ -13,7 +16,7 @@
      }
    },
    "CAL": {
      "CALType": "HttpClient", //HttpClient、LocalClient
      "CALType": "HttpClient", //HttpClient/LocalClient
      "HttpClient": {
        "HttpUrl": "http://47.100.245.85:8190"
      },