新增查询

lixiaojun

2024-05-08 920f3164474befe4721a4365e19638ff2e2aabda

新增查询

 Yw.Application.Run.Core/02-record/RunRealRecord_StdController.cs

@@ -1,4 +1,6 @@
namespace Yw.Application
using Yw.Dto.Run;

namespace Yw.Application
{
    /// <summary>
    /// RunRealRecord
@@ -32,6 +34,101 @@
            return vmList;
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–
        /// </summary>
        [Route("GetByObjectTypeAndObjectID@V1.0")]
        [HttpGet]
        public List<RunRealRecordStdDto> GetByObjectTypeAndObjectID([FromQuery][Required] ObjectOfNullableTimeRangeAndNullableRunInput input)
        {
            var list = new Yw.Service.RunRealRecord().GetByObjectTypeAndObjectID(input.ObjectType, input.ObjectID, input.StartTime, input.EndTime, input.Run);
            var vmList = list?.Select(x => new RunRealRecordStdDto(x)).ToList();
            return vmList;
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å– (限制数量)
        /// </summary>
        [Route("GetLimitByObjectTypeAndObjectID@V1.0")]
        [HttpGet]
        public List<RunRealRecordStdDto> GetLimitByObjectTypeAndObjectID([FromQuery][Required] ObjectLimitOfNullableTimeRangeAndNullableRunInput input)
        {
            var list = new Yw.Service.RunRealRecord().GetLimitByObjectTypeAndObjectID(input.ObjectType, input.ObjectID, input.StartTime, input.EndTime, input.Limit, input.Run);
            var vmList = list?.Select(x => new RunRealRecordStdDto(x)).ToList();
            return vmList;
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–某日的数据
        /// </summary>
        [Route("GetByObjectTypeAndObjectIDOfDay@V1.0")]
        [HttpGet]
        public List<RunRealRecordStdDto> GetByObjectTypeAndObjectIDOfDay([FromQuery][Required] ObjectOfDayAndNullableRunInput input)
        {
            var list = new Yw.Service.RunRealRecord().GetByObjectTypeAndObjectIDOfDay(input.ObjectType, input.ObjectID, input.Day, input.Run);
            var vmList = list?.Select(x => new RunRealRecordStdDto(x)).ToList();
            return vmList;
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–某日的数据 (限制数量)
        /// </summary>
        [Route("GetLimitByObjectTypeAndObjectIDOfDay@V1.0")]
        [HttpGet]
        public List<RunRealRecordStdDto> GetLimitByObjectTypeAndObjectIDOfDay([FromQuery][Required] ObjectLimitOfDayAndNullableRunInput input)
        {
            var list = new Yw.Service.RunRealRecord().GetLimitByObjectTypeAndObjectIDOfDay(input.ObjectType, input.ObjectID, input.Day, input.Limit, input.Run);
            var vmList = list?.Select(x => new RunRealRecordStdDto(x)).ToList();
            return vmList;
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–日期区间的数据
        /// </summary>
        [Route("GetByObjectTypeAndObjectIDOfDayRange@V1.0")]
        [HttpGet]
        public List<RunRealRecordStdDto> GetByObjectTypeAndObjectIDOfDayRange([FromQuery][Required] ObjectOfDayRangeAndNullableRunInput input)
        {
            var list = new Yw.Service.RunRealRecord().GetByObjectTypeAndObjectIDOfDayRange(input.ObjectType, input.ObjectID, input.StartDay, input.EndDay, input.Run);
            var vmList = list?.Select(x => new RunRealRecordStdDto(x)).ToList();
            return vmList;
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–日期区间的数据 (限制数量)
        /// </summary>
        [Route("GetLimitByObjectTypeAndObjectIDOfDayRange@V1.0")]
        [HttpGet]
        public List<RunRealRecordStdDto> GetLimitByObjectTypeAndObjectIDOfDayRange([FromQuery][Required] ObjectLimitOfDayRangeAndNullableRunInput input)
        {
            var list = new Yw.Service.RunRealRecord().GetLimitByObjectTypeAndObjectIDOfDayRange(input.ObjectType, input.ObjectID, input.StartDay, input.EndDay, input.Limit, input.Run);
            var vmList = list?.Select(x => new RunRealRecordStdDto(x)).ToList();
            return vmList;
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–时间区间的数据
        /// </summary>
        [Route("GetByObjectTypeAndObjectIDOfTimeRange@V1.0")]
        [HttpGet]
        public List<RunRealRecordStdDto> GetByObjectTypeAndObjectIDOfTimeRange([FromQuery][Required] ObjectOfTimeRangeAndNullableRunInput input)
        {
            var list = new Yw.Service.RunRealRecord().GetByObjectTypeAndObjectIDOfTimeRange(input.ObjectType, input.ObjectID, input.StartTime, input.EndTime, input.Run);
            var vmList = list?.Select(x => new RunRealRecordStdDto(x)).ToList();
            return vmList;
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–时间区间的数据 (限制数量)
        /// </summary>
        [Route("GetLimitByObjectTypeAndObjectIDOfTimeRange@V1.0")]
        [HttpGet]
        public List<RunRealRecordStdDto> GetLimitByObjectTypeAndObjectIDOfTimeRange([FromQuery][Required] ObjectLimitOfTimeRangeAndNullableRunInput input)
        {
            var list = new Yw.Service.RunRealRecord().GetLimitByObjectTypeAndObjectIDOfTimeRange(input.ObjectType, input.ObjectID, input.StartTime, input.EndTime, input.Limit, input.Run);
            var vmList = list?.Select(x => new RunRealRecordStdDto(x)).ToList();
            return vmList;
        }


    }

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

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-04-30T05:48:09.3970916Z;True|2024-04-26T11:52:38.6381832+08:00;True|2024-04-01T11:40:26.8126073+08:00;True|2024-03-26T09:54:08.7672773+08:00;True|2024-02-01T15:13:33.2518157+08:00;True|2024-01-27T11:05:20.5193198+08:00;True|2024-01-21T14:54:51.3939785+08:00;True|2024-01-08T17:00:51.0941947+08:00;True|2023-12-16T15:43:21.8065953+08:00;True|2023-12-11T11:56:46.3121435+08:00;True|2023-12-11T11:27:23.3317604+08:00;True|2023-12-11T11:27:14.6709240+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-08T06:57:38.9700807Z;True|2024-04-30T13:48:09.3970916+08:00;True|2024-04-26T11:52:38.6381832+08:00;True|2024-04-01T11:40:26.8126073+08:00;True|2024-03-26T09:54:08.7672773+08:00;True|2024-02-01T15:13:33.2518157+08:00;True|2024-01-27T11:05:20.5193198+08:00;True|2024-01-21T14:54:51.3939785+08:00;True|2024-01-08T17:00:51.0941947+08:00;True|2023-12-16T15:43:21.8065953+08:00;True|2023-12-11T11:56:46.3121435+08:00;True|2023-12-11T11:27:23.3317604+08:00;True|2023-12-11T11:27:14.6709240+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.Run.Core/Yw.Application.Run.Core.csproj

@@ -7,7 +7,7 @@
    <RootNamespace>Yw.Application</RootNamespace>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
    <Version>3.0.6</Version>
    <Version>3.0.8</Version>
  </PropertyGroup>

  <ItemGroup>
@@ -26,8 +26,8 @@
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Application.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Dto.Run.Core" Version="3.0.6" />
    <PackageReference Include="Yw.Application.Core" Version="3.0.6" />
    <PackageReference Include="Yw.Dto.Run.Core" Version="3.0.8" />
  </ItemGroup>

</Project>

 Yw.Dto.Run.Core/09-models/object/day/ObjectLimitOfDayAndNullableRunInput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
namespace Yw.Dto.Run
{
    /// <summary>
    /// 
    /// </summary>
    public class ObjectLimitOfDayAndNullableRunInput : ObjectOfDayAndNullableRunInput
    {
        /// <summary>
        /// 
        /// </summary>
        [Required]
        public int Limit { get; set; }
    }
}

 Yw.Dto.Run.Core/09-models/object/day/ObjectOfDayAndNullableRunInput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
namespace Yw.Dto.Run
{
    /// <summary>
    /// 
    /// </summary>
    public class ObjectOfDayAndNullableRunInput : ObjectOfDayInput
    {
        /// <summary>
        /// 
        /// </summary>
        public bool? Run { get; set; }
    }
}

 Yw.Dto.Run.Core/09-models/object/dayrange/ObjectLimitOfDayRangeAndNullableRunInput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
namespace Yw.Dto.Run
{
    /// <summary>
    /// 
    /// </summary>
    public class ObjectLimitOfDayRangeAndNullableRunInput : ObjectOfDayRangeAndNullableRunInput
    {
        /// <summary>
        /// 
        /// </summary>
        [Required]
        public int Limit { get; set; }
    }
}

 Yw.Dto.Run.Core/09-models/object/dayrange/ObjectOfDayRangeAndNullableRunInput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
namespace Yw.Dto.Run
{
    /// <summary>
    /// 
    /// </summary>
    public class ObjectOfDayRangeAndNullableRunInput : ObjectOfDayRangeInput
    {
        /// <summary>
        /// 
        /// </summary>
        public bool? Run { get; set; }
    }
}

 Yw.Dto.Run.Core/09-models/object/nullable/ObjectLimitOfNullableTimeRangeAndNullableRunInput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
namespace Yw.Dto.Run
{
    /// <summary>
    /// 
    /// </summary>
    public class ObjectLimitOfNullableTimeRangeAndNullableRunInput : ObjectOfNullableTimeRangeAndNullableRunInput
    {
        /// <summary>
        /// 
        /// </summary>
        [Required]
        public int Limit { get; set; }
    }
}

 Yw.Dto.Run.Core/09-models/object/nullable/ObjectOfNullableTimeRangeAndNullableRunInput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
namespace Yw.Dto.Run
{
    /// <summary>
    /// 
    /// </summary>
    public class ObjectOfNullableTimeRangeAndNullableRunInput : ObjectOfNullableTimeRangeInput
    {
        /// <summary>
        /// 
        /// </summary>
        public bool? Run { get; set; }
    }
}

 Yw.Dto.Run.Core/09-models/object/timerange/ObjectLimitOfTimeRangeAndNullableRunInput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
namespace Yw.Dto.Run
{
    /// <summary>
    /// 
    /// </summary>
    public class ObjectLimitOfTimeRangeAndNullableRunInput : ObjectOfTimeRangeAndNullableRunInput
    {
        /// <summary>
        /// 
        /// </summary>
        [Required]
        public int Limit { get; set; }
    }
}

 Yw.Dto.Run.Core/09-models/object/timerange/ObjectOfTimeRangeAndNullableRunInput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
namespace Yw.Dto.Run
{
    /// <summary>
    /// 
    /// </summary>
    public class ObjectOfTimeRangeAndNullableRunInput : ObjectOfTimeRangeInput
    {
        /// <summary>
        /// 
        /// </summary>
        public bool? Run { get; set; }
    }
}

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

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-04-30T05:46:18.9575803Z;True|2024-04-30T11:29:49.6927256+08:00;True|2024-04-26T11:51:11.4880401+08:00;True|2024-04-26T11:50:49.7392651+08:00;True|2024-04-26T11:50:39.7372723+08:00;True|2024-04-01T11:39:12.7290526+08:00;True|2024-03-26T09:51:34.4055575+08:00;</History>
    <History>True|2024-05-08T06:56:51.2185908Z;True|2024-05-08T14:25:43.7997185+08:00;True|2024-04-30T13:46:18.9575803+08:00;True|2024-04-30T11:29:49.6927256+08:00;True|2024-04-26T11:51:11.4880401+08:00;True|2024-04-26T11:50:49.7392651+08:00;True|2024-04-26T11:50:39.7372723+08:00;True|2024-04-01T11:39:12.7290526+08:00;True|2024-03-26T09:51:34.4055575+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 Yw.Dto.Run.Core/Yw.Dto.Run.Core.csproj

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

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

</Project>

 Yw.Service.Run.Core/04-dal/01-interface/IRunRealRecord.cs

@@ -68,9 +68,19 @@
        List<Entity.RunRealRecord> GetByObjectTypeAndObjectID(string ObjectType, long ObjectID, DateTime? StartTime, DateTime? EndTime, bool? Run = null);

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å– (限制数量)
        /// </summary>
        List<Entity.RunRealRecord> GetLimitByObjectTypeAndObjectID(string ObjectType, long ObjectID, DateTime? StartTime, DateTime? EndTime, int limit, bool? Run = null);

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–某日的数据
        /// </summary>
        List<Entity.RunRealRecord> GetByObjectTypeAndObjectIDOfDay(string ObjectType, long ObjectID, DateTime Day, bool? Run = null);

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–某日的数据 (限制数量)
        /// </summary>
        List<Entity.RunRealRecord> GetLimitByObjectTypeAndObjectIDOfDay(string ObjectType, long ObjectID, DateTime Day, int limit, bool? Run = null);

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–日期区间内的数据
@@ -78,11 +88,21 @@
        List<Entity.RunRealRecord> GetByObjectTypeAndObjectIDOfDayRange(string ObjectType, long ObjectID, DateTime StartDay, DateTime EndDay, bool? Run = null);

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–日期区间内的数据 (限制数量)
        /// </summary>
        List<Entity.RunRealRecord> GetLimitByObjectTypeAndObjectIDOfDayRange(string ObjectType, long ObjectID, DateTime StartDay, DateTime EndDay, int limit, bool? Run = null);

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–时间区间内的数据
        /// </summary>
        List<Entity.RunRealRecord> GetByObjectTypeAndObjectIDOfTimeRange(string ObjectType, long ObjectID, DateTime StartTime, DateTime EndTime, bool? Run = null);

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–时间区间内的数据(限制数量)
        /// </summary>
        List<Entity.RunRealRecord> GetLimitByObjectTypeAndObjectIDOfTimeRange(string ObjectType, long ObjectID, DateTime StartTime, DateTime EndTime, int limit, bool? Run = null);

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–分页列表
        /// </summary>
        List<Entity.RunRealRecord> GetPageListByObjectTypeAndObjectID(string ObjectType, long ObjectID, DateTime? StartTime, DateTime? EndTime, bool? Run, int PageIndex, int PageSize, ref int Total);

 Yw.Service.Run.Core/04-dal/02-postgresql/RunRealRecord.cs

@@ -301,6 +301,36 @@
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å– (限制数量)
        /// </summary>
        public List<Entity.RunRealRecord> GetLimitByObjectTypeAndObjectID(string ObjectType, long ObjectID, DateTime? StartTime, DateTime? EndTime, int Limit, bool? Run = null)
        {
            if (StartTime.HasValue && EndTime.HasValue)
            {
                if (StartTime.Value > EndTime.Value)
                {
                    return default;
                }
            }
            var exp = Expressionable.Create<Entity.RunRealRecord>();
            exp.AndIF(StartTime.HasValue, x => x.DataTime >= StartTime.Value);
            exp.AndIF(EndTime.HasValue, x => x.DataTime <= EndTime.Value);
            exp.And(x => x.ObjectType == ObjectType);
            exp.And(x => x.ObjectID == ObjectID);
            exp.AndIF(Run.HasValue && Run.Value, x => x.RSa == RunStatus.Run);
            exp.AndIF(Run.HasValue && !Run.Value, x => x.RSa == RunStatus.Shut);

            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                var list = db.Queryable<Entity.RunRealRecord>()
                    .Where(exp.ToExpression())
                    .OrderBy(x => x.DataTime, OrderByType.Asc)
                    .ToList();
                return list?.ToLimitList(Limit);
            }
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–某日的数据
        /// </summary>
        public List<Entity.RunRealRecord> GetByObjectTypeAndObjectIDOfDay(string ObjectType, long ObjectID, DateTime Day, bool? Run = null)
@@ -318,6 +348,28 @@
                    .Where(exp.ToExpression())
                    .OrderBy(x => x.DataTime, OrderByType.Asc)
                    .ToList();
            }
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–某日的数据 (限制数量)
        /// </summary>
        public List<Entity.RunRealRecord> GetLimitByObjectTypeAndObjectIDOfDay(string ObjectType, long ObjectID, DateTime Day, int Limit, bool? Run = null)
        {
            var exp = Expressionable.Create<Entity.RunRealRecord>();
            exp.And(x => x.DataTime >= Day.Date && x.DataTime < Day.AddDays(1).Date);
            exp.And(x => x.ObjectType == ObjectType);
            exp.And(x => x.ObjectID == ObjectID);
            exp.AndIF(Run.HasValue && Run.Value, x => x.RSa == RunStatus.Run);
            exp.AndIF(Run.HasValue && !Run.Value, x => x.RSa == RunStatus.Shut);

            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                var list = db.Queryable<Entity.RunRealRecord>()
                    .Where(exp.ToExpression())
                    .OrderBy(x => x.DataTime, OrderByType.Asc)
                    .ToList();
                return list?.ToLimitList(Limit);
            }
        }

@@ -347,6 +399,32 @@
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–日期区间内的数据 (限制数量)
        /// </summary>
        public List<Entity.RunRealRecord> GetLimitByObjectTypeAndObjectIDOfDayRange(string ObjectType, long ObjectID, DateTime StartDay, DateTime EndDay, int Limit, bool? Run = null)
        {
            if (StartDay.Date > EndDay.Date)
            {
                return default;
            }
            var exp = Expressionable.Create<Entity.RunRealRecord>();
            exp.And(x => x.DataTime >= StartDay.Date && x.DataTime < EndDay.AddDays(1).Date);
            exp.And(x => x.ObjectType == ObjectType);
            exp.And(x => x.ObjectID == ObjectID);
            exp.AndIF(Run.HasValue && Run.Value, x => x.RSa == RunStatus.Run);
            exp.AndIF(Run.HasValue && !Run.Value, x => x.RSa == RunStatus.Shut);

            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                var list = db.Queryable<Entity.RunRealRecord>()
                    .Where(exp.ToExpression())
                    .OrderBy(x => x.DataTime, OrderByType.Asc)
                    .ToList();
                return list?.ToLimitList(Limit);
            }
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–时间区间内的数据
        /// </summary>
        public List<Entity.RunRealRecord> GetByObjectTypeAndObjectIDOfTimeRange(string ObjectType, long ObjectID, DateTime StartTime, DateTime EndTime, bool? Run = null)
@@ -372,6 +450,32 @@
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–时间区间内的数据 (限制数量)
        /// </summary>
        public List<Entity.RunRealRecord> GetLimitByObjectTypeAndObjectIDOfTimeRange(string ObjectType, long ObjectID, DateTime StartTime, DateTime EndTime, int Limit, bool? Run = null)
        {
            if (StartTime > EndTime)
            {
                return default;
            }
            var exp = Expressionable.Create<Entity.RunRealRecord>();
            exp.And(x => x.DataTime >= StartTime && x.DataTime <= EndTime);
            exp.And(x => x.ObjectType == ObjectType);
            exp.And(x => x.ObjectID == ObjectID);
            exp.AndIF(Run.HasValue && Run.Value, x => x.RSa == RunStatus.Run);
            exp.AndIF(Run.HasValue && !Run.Value, x => x.RSa == RunStatus.Shut);

            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                var list = db.Queryable<Entity.RunRealRecord>()
                    .Where(exp.ToExpression())
                    .OrderBy(x => x.DataTime, OrderByType.Asc)
                    .ToList();
                return list?.ToLimitList(Limit);
            }
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–分页列表
        /// </summary>
        public List<Entity.RunRealRecord> GetPageListByObjectTypeAndObjectID(string ObjectType, long ObjectID, DateTime? StartTime, DateTime? EndTime, bool? Run, int PageIndex, int PageSize, ref int Total)

 Yw.Service.Run.Core/04-dal/03-sqlite/RunRealRecord.cs

@@ -301,6 +301,36 @@
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å– (限制数量)
        /// </summary>
        public List<Entity.RunRealRecord> GetLimitByObjectTypeAndObjectID(string ObjectType, long ObjectID, DateTime? StartTime, DateTime? EndTime, int Limit, bool? Run = null)
        {
            if (StartTime.HasValue && EndTime.HasValue)
            {
                if (StartTime.Value > EndTime.Value)
                {
                    return default;
                }
            }
            var exp = Expressionable.Create<Entity.RunRealRecord>();
            exp.AndIF(StartTime.HasValue, x => x.DataTime >= StartTime.Value);
            exp.AndIF(EndTime.HasValue, x => x.DataTime <= EndTime.Value);
            exp.And(x => x.ObjectType == ObjectType);
            exp.And(x => x.ObjectID == ObjectID);
            exp.AndIF(Run.HasValue && Run.Value, x => x.RSa == RunStatus.Run);
            exp.AndIF(Run.HasValue && !Run.Value, x => x.RSa == RunStatus.Shut);

            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                var list = db.Queryable<Entity.RunRealRecord>()
                    .Where(exp.ToExpression())
                    .OrderBy(x => x.DataTime, OrderByType.Asc)
                    .ToList();
                return list?.ToLimitList(Limit);
            }
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–某日的数据
        /// </summary>
        public List<Entity.RunRealRecord> GetByObjectTypeAndObjectIDOfDay(string ObjectType, long ObjectID, DateTime Day, bool? Run = null)
@@ -318,6 +348,28 @@
                    .Where(exp.ToExpression())
                    .OrderBy(x => x.DataTime, OrderByType.Asc)
                    .ToList();
            }
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–某日的数据 (限制数量)
        /// </summary>
        public List<Entity.RunRealRecord> GetLimitByObjectTypeAndObjectIDOfDay(string ObjectType, long ObjectID, DateTime Day, int Limit, bool? Run = null)
        {
            var exp = Expressionable.Create<Entity.RunRealRecord>();
            exp.And(x => x.DataTime >= Day.Date && x.DataTime < Day.AddDays(1).Date);
            exp.And(x => x.ObjectType == ObjectType);
            exp.And(x => x.ObjectID == ObjectID);
            exp.AndIF(Run.HasValue && Run.Value, x => x.RSa == RunStatus.Run);
            exp.AndIF(Run.HasValue && !Run.Value, x => x.RSa == RunStatus.Shut);

            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                var list = db.Queryable<Entity.RunRealRecord>()
                    .Where(exp.ToExpression())
                    .OrderBy(x => x.DataTime, OrderByType.Asc)
                    .ToList();
                return list?.ToLimitList(Limit);
            }
        }

@@ -347,6 +399,32 @@
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–日期区间内的数据 (限制数量)
        /// </summary>
        public List<Entity.RunRealRecord> GetLimitByObjectTypeAndObjectIDOfDayRange(string ObjectType, long ObjectID, DateTime StartDay, DateTime EndDay, int Limit, bool? Run = null)
        {
            if (StartDay.Date > EndDay.Date)
            {
                return default;
            }
            var exp = Expressionable.Create<Entity.RunRealRecord>();
            exp.And(x => x.DataTime >= StartDay.Date && x.DataTime < EndDay.AddDays(1).Date);
            exp.And(x => x.ObjectType == ObjectType);
            exp.And(x => x.ObjectID == ObjectID);
            exp.AndIF(Run.HasValue && Run.Value, x => x.RSa == RunStatus.Run);
            exp.AndIF(Run.HasValue && !Run.Value, x => x.RSa == RunStatus.Shut);

            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                var list = db.Queryable<Entity.RunRealRecord>()
                    .Where(exp.ToExpression())
                    .OrderBy(x => x.DataTime, OrderByType.Asc)
                    .ToList();
                return list?.ToLimitList(Limit);
            }
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–时间区间内的数据
        /// </summary>
        public List<Entity.RunRealRecord> GetByObjectTypeAndObjectIDOfTimeRange(string ObjectType, long ObjectID, DateTime StartTime, DateTime EndTime, bool? Run = null)
@@ -372,6 +450,32 @@
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–时间区间内的数据 (限制数量)
        /// </summary>
        public List<Entity.RunRealRecord> GetLimitByObjectTypeAndObjectIDOfTimeRange(string ObjectType, long ObjectID, DateTime StartTime, DateTime EndTime, int Limit, bool? Run = null)
        {
            if (StartTime > EndTime)
            {
                return default;
            }
            var exp = Expressionable.Create<Entity.RunRealRecord>();
            exp.And(x => x.DataTime >= StartTime && x.DataTime <= EndTime);
            exp.And(x => x.ObjectType == ObjectType);
            exp.And(x => x.ObjectID == ObjectID);
            exp.AndIF(Run.HasValue && Run.Value, x => x.RSa == RunStatus.Run);
            exp.AndIF(Run.HasValue && !Run.Value, x => x.RSa == RunStatus.Shut);

            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                var list = db.Queryable<Entity.RunRealRecord>()
                    .Where(exp.ToExpression())
                    .OrderBy(x => x.DataTime, OrderByType.Asc)
                    .ToList();
                return list?.ToLimitList(Limit);
            }
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–分页列表
        /// </summary>
        public List<Entity.RunRealRecord> GetPageListByObjectTypeAndObjectID(string ObjectType, long ObjectID, DateTime? StartTime, DateTime? EndTime, bool? Run, int PageIndex, int PageSize, ref int Total)

 Yw.Service.Run.Core/07-service/02-record/RunRealRecord.cs

@@ -228,12 +228,39 @@
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å– (限制数量)
        /// </summary>
        public List<Model.RunRealRecord> GetLimitByObjectTypeAndObjectID(string ObjectType, long ObjectID, DateTime? StartTime, DateTime? EndTime, int Limit, bool? Run = null)
        {
            if (StartTime.HasValue && EndTime.HasValue)
            {
                if (StartTime.Value > EndTime.Value)
                {
                    return default;
                }
            }
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
            var entityList = dal.GetLimitByObjectTypeAndObjectID(ObjectType, ObjectID, StartTime, EndTime, Limit, Run);
            return Entity2Models(entityList);
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–某日的数据
        /// </summary>
        public List<Model.RunRealRecord> GetByObjectTypeAndObjectIDOfDay(string ObjectType, long ObjectID, DateTime Day, bool? Run = null)
        {
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
            var entityList = dal.GetByObjectTypeAndObjectIDOfDay(ObjectType, ObjectID, Day, Run);
            return Entity2Models(entityList);
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–某日的数据 (限制数量)
        /// </summary>
        public List<Model.RunRealRecord> GetLimitByObjectTypeAndObjectIDOfDay(string ObjectType, long ObjectID, DateTime Day, int Limit, bool? Run = null)
        {
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
            var entityList = dal.GetLimitByObjectTypeAndObjectIDOfDay(ObjectType, ObjectID, Day, Limit, Run);
            return Entity2Models(entityList);
        }

@@ -252,6 +279,20 @@
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–日期区间内的数据(限制数量)
        /// </summary>
        public List<Model.RunRealRecord> GetLimitByObjectTypeAndObjectIDOfDayRange(string ObjectType, long ObjectID, DateTime StartDay, DateTime EndDay, int Limit, bool? Run = null)
        {
            if (StartDay.Date > EndDay.Date)
            {
                return default;
            }
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
            var entityList = dal.GetLimitByObjectTypeAndObjectIDOfDayRange(ObjectType, ObjectID, StartDay, EndDay, Limit, Run);
            return Entity2Models(entityList);
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–时间区间内的数据
        /// </summary>
        public List<Model.RunRealRecord> GetByObjectTypeAndObjectIDOfTimeRange(string ObjectType, long ObjectID, DateTime StartTime, DateTime EndTime, bool? Run = null)
@@ -266,6 +307,20 @@
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–时间区间内的数据 (限制数量)
        /// </summary>
        public List<Model.RunRealRecord> GetLimitByObjectTypeAndObjectIDOfTimeRange(string ObjectType, long ObjectID, DateTime StartTime, DateTime EndTime, int Limit, bool? Run = null)
        {
            if (StartTime > EndTime)
            {
                return default;
            }
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
            var entityList = dal.GetLimitByObjectTypeAndObjectIDOfTimeRange(ObjectType, ObjectID, StartTime, EndTime, Limit, Run);
            return Entity2Models(entityList);
        }

        /// <summary>
        /// é€šè¿‡ ObjectType å’Œ ObjectID èŽ·å–分页列表
        /// </summary>
        public List<Model.RunRealRecord> GetPageListByObjectTypeAndObjectID(string ObjectType, long ObjectID, DateTime? StartTime, DateTime? EndTime, bool? Run, int PageIndex, int PageSize, ref int Total)

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

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-04-30T05:45:44.5067765Z;True|2024-04-30T11:25:45.6839060+08:00;True|2024-04-30T11:25:41.5354173+08:00;True|2024-04-26T11:47:42.9605330+08:00;True|2024-04-01T11:38:17.4702370+08:00;True|2024-03-26T09:45:14.8395625+08:00;True|2024-01-21T14:51:15.9123805+08:00;True|2024-01-08T16:59:10.2219250+08:00;True|2023-12-16T15:42:50.6196932+08:00;True|2023-12-11T11:51:25.0044564+08:00;True|2023-12-11T11:25:16.9392998+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-08T06:21:37.5917430Z;True|2024-04-30T13:45:44.5067765+08:00;True|2024-04-30T11:25:45.6839060+08:00;True|2024-04-30T11:25:41.5354173+08:00;True|2024-04-26T11:47:42.9605330+08:00;True|2024-04-01T11:38:17.4702370+08:00;True|2024-03-26T09:45:14.8395625+08:00;True|2024-01-21T14:51:15.9123805+08:00;True|2024-01-08T16:59:10.2219250+08:00;True|2023-12-16T15:42:50.6196932+08:00;True|2023-12-11T11:51:25.0044564+08:00;True|2023-12-11T11:25:16.9392998+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.Run.Core/Yw.Service.Run.Core.csproj

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