BaseRepository 方法更新、增加热管理接口

Entity/Api/Req/SetDayTimeReq.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Entity.Api.Req
+{
+    /// <summary>
+    /// 提交灯光日间时间
+    /// </summary>
+    public class SetDayTimeReq
+    {
+        /// <summary>
+        /// 日 灯光开启时间
+        /// </summary>
+        public string StartTime { get; set; }
+        /// <summary>
+        /// 日 灯光关闭时间
+        /// </summary>
+        public string EndTime { get; set; }
+    }
+}

HybirdFrameworkCore/Entity/QueryPageModel.cs

@@ -10,4 +10,23 @@ public class QueryPageModel
     /// 页数
     /// </summary>
     public int PageSize { get; set; } = 10;
+}
+/// <summary>
+/// 电表统计分析
+/// </summary>
+public class AmmeterQueryPageModel
+{
+    /// <summary>
+    ///页码
+    /// </summary>
+    public int Page { get; set; } = 1;
+    /// <summary>
+    /// 页数
+    /// </summary>
+    public int PageSize { get; set; } = 10;
+
+    /// <summary>
+    /// 电表编码 用于分页查询
+    /// </summary>
+    public string? Code { get; set; } = "";
 }

Repository/BaseRepository.cs

@@ -1480,110 +1480,22 @@ public abstract class BaseRepository<T> where T : class, new()
         return await DbBaseClient.Queryable<T>().Where(predicate).WithNoLockOrNot(blUseNoLock).SumAsync(field);
     }
 
-
-
-    public async Task<List<T>> QueryPageByIncludeAsync<TReturn1>(Expression<Func<T, TReturn1>> include1,
-        Expression<Func<T, bool>> whereExpression, bool isWhere, Expression<Func<T, bool>> expression,
-        bool isWhere1, Expression<Func<T, bool>> expression1,
-        Expression<Func<T, object>> orderExpression,
-        //TODO::
-        int pageIndex = 1, int pageSize = 20, RefAsync<int> totalNumber = null, bool blUseNoLock = false)
-    {
-        var page = await DbBaseClient
-            .Queryable<T>()
-            .Includes(include1)
-            .Where(whereExpression)
-            .WhereIF(isWhere, expression)
-            .WhereIF(isWhere1, expression1)
-            .OrderBy(orderExpression, OrderByType.Asc)
-            .WithNoLockOrNot(blUseNoLock)
-            .ToPageListAsync(pageIndex, pageSize, totalNumber);
-        return page;
-    }
-
-
-
-
-    public async Task<List<T>> QueryPageAsync(
-        bool isWhere1, Expression<Func<T, bool>> expression1,
-        bool isWhere2, Expression<Func<T, bool>> expression2,
-        Expression<Func<T, object>> orderBy,
-        int pageNumber, int pageSize, RefAsync<int> totalNumber,
-        bool blUseNoLock = false)
-    {
-        var page = await DbBaseClient
-            .Queryable<T>()
-            .OrderBy(orderBy, OrderByType.Asc)
-            .WhereIF(isWhere1, expression1)
-            .WhereIF(isWhere2, expression2)
-            .WithNoLockOrNot(blUseNoLock)
-            .ToPageListAsync(pageNumber, pageSize, totalNumber);
-        return page;
-    }
-
     public async Task<List<T>> QueryPageAsync(
+    Expression<Func<T, bool>> whereExpression,
     bool isWhere1, Expression<Func<T, bool>> expression1,
     bool isWhere2, Expression<Func<T, bool>> expression2,
+    bool isWhere3, Expression<Func<T, bool>> expression3,
+    Expression<Func<T, object>> orderBy,
     int pageNumber, int pageSize, RefAsync<int> totalNumber,
     bool blUseNoLock = false)
     {
         var page = await DbBaseClient
             .Queryable<T>()
-            .WhereIF(isWhere1, expression1)
-            .WhereIF(isWhere2, expression2)
-            .WithNoLockOrNot(blUseNoLock)
-            .ToPageListAsync(pageNumber, pageSize, totalNumber);
-        return page;
-    }
-
-
-    public async Task<List<T>> QueryPageAsync(
-        bool isWhere1, Expression<Func<T, bool>> expression1,
-        bool isWhere2, Expression<Func<T, bool>> expression2,
-        bool isWhere3, Expression<Func<T, bool>> expression3,
-        Expression<Func<T, object>> orderBy,
-        int pageNumber, int pageSize, RefAsync<int> totalNumber,
-        bool blUseNoLock = false)
-    {
-        var page = await DbBaseClient
-            .Queryable<T>()
-            .OrderBy(orderBy, OrderByType.Asc)
-            .WhereIF(isWhere1, expression1)
-            .WhereIF(isWhere2, expression2)
-            .WhereIF(isWhere3, expression3)
-            .WithNoLockOrNot(blUseNoLock)
-            .ToPageListAsync(pageNumber, pageSize, totalNumber);
-        return page;
-    }
-    public async Task<List<T>> QueryPageAsync(
-        bool isWhere1, Expression<Func<T, bool>> expression1,
-        bool isWhere2, Expression<Func<T, bool>> expression2,
-        int pageNumber, int pageSize, RefAsync<int> totalNumber,
-        PageLogReq input,
-        bool blUseNoLock = false)
-    {
-        var page = await DbBaseClient
-            .Queryable<T>()
-            .WhereIF(isWhere1, expression1)
-            .WhereIF(isWhere2, expression2)
-            .OrderBuilder(input)
-            .WithNoLockOrNot(blUseNoLock)
-            .ToPageListAsync(pageNumber, pageSize, totalNumber);
-        return page;
-    }
-    public async Task<List<T>> QueryPageAsync(
-        bool isWhere1, Expression<Func<T, bool>> expression1,
-        bool isWhere2, Expression<Func<T, bool>> expression2,
-        bool isWhere3, Expression<Func<T, bool>> expression3,
-        int pageNumber, int pageSize, RefAsync<int> totalNumber,
-        PageConfigReq input, bool blUseNoLock = false)
-    {
-        var page = await DbBaseClient
-            .Queryable<T>()
+            .Where(whereExpression)
             .WhereIF(isWhere1, expression1)
             .WhereIF(isWhere2, expression2)
             .WhereIF(isWhere3, expression3)
-            .OrderBuilder(input)
+            .OrderBy(orderBy, OrderByType.Asc)
             .WithNoLockOrNot(blUseNoLock)
             .ToPageListAsync(pageNumber, pageSize, totalNumber);
         return page;

Repository/System/SysConfigRepository.cs

@@ -1,6 +1,8 @@
 using Entity.DbModel.System.SysBaseObject;
+using Entity.Dto.Req;
 using HybirdFrameworkCore.Autofac.Attribute;
 using SqlSugar;
+using System.Linq.Expressions;
 
 namespace Repository.System
 {
@@ -12,5 +14,23 @@ namespace Repository.System
         {
             DbBaseClient = sqlSugar;
         }
+
+        public async Task<List<SysConfig>> SysConfigQueryPageAsync(
+            bool isWhere1, Expression<Func<SysConfig, bool>> expression1,
+            bool isWhere2, Expression<Func<SysConfig, bool>> expression2,
+            bool isWhere3, Expression<Func<SysConfig, bool>> expression3,
+            int pageNumber, int pageSize, RefAsync<int> totalNumber,
+            PageConfigReq input, bool blUseNoLock = false)
+        {
+            var page = await DbBaseClient
+                .Queryable<SysConfig>()
+                .WhereIF(isWhere1, expression1)
+                .WhereIF(isWhere2, expression2)
+                .WhereIF(isWhere3, expression3)
+                .OrderBuilder(input)
+                .WithNoLockOrNot(blUseNoLock)
+                .ToPageListAsync(pageNumber, pageSize, totalNumber);
+            return page;
+        }
     }
 }

Repository/System/SysLogExRepository.cs

@@ -1,9 +1,11 @@
 using Entity.DbModel.System.SysBaseObject;
+using Entity.Dto.Req;
 using HybirdFrameworkCore.Autofac.Attribute;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -17,5 +19,19 @@ namespace Repository.System
         {
             DbBaseClient = sqlSugar;
         }
+
+        public async Task<List<SysLogEx>> SysLogExQueryPageAsync(
+            bool isWhere1, Expression<Func<SysLogEx, bool>> expression1,bool isWhere2, Expression<Func<SysLogEx, bool>> expression2,
+            int pageNumber, int pageSize, RefAsync<int> totalNumber,PageLogReq input,bool blUseNoLock = false)
+        {
+            var page = await DbBaseClient
+                .Queryable<SysLogEx>()
+                .WhereIF(isWhere1, expression1)
+                .WhereIF(isWhere2, expression2)
+                .OrderBuilder(input)
+                .WithNoLockOrNot(blUseNoLock)
+                .ToPageListAsync(pageNumber, pageSize, totalNumber);
+            return page;
+        }
     }
 }

Repository/System/SysLogOpRepository.cs

@@ -1,9 +1,11 @@
 using Entity.DbModel.System.SysBaseObject;
+using Entity.Dto.Req;
 using HybirdFrameworkCore.Autofac.Attribute;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -17,5 +19,18 @@ namespace Repository.System
         {
             DbBaseClient = sqlSugar;
         }
+        public async Task<List<SysLogOp>> SysLogOpQueryPageAsync(
+            bool isWhere1, Expression<Func<SysLogOp, bool>> expression1,bool isWhere2, Expression<Func<SysLogOp, bool>> expression2,
+            int pageNumber, int pageSize, RefAsync<int> totalNumber, PageLogReq input,bool blUseNoLock = false)
+        {
+            var page = await DbBaseClient
+                .Queryable<SysLogOp>()
+                .WhereIF(isWhere1, expression1)
+                .WhereIF(isWhere2, expression2)
+                .OrderBuilder(input)
+                .WithNoLockOrNot(blUseNoLock)
+                .ToPageListAsync(pageNumber, pageSize, totalNumber);
+            return page;
+        }
     }
 }

Service/Ammeter/EmeterDayEnergyService.cs

@@ -1,5 +1,6 @@
 using Entity.Ammeter;
 using HybirdFrameworkCore.Autofac.Attribute;
+using HybirdFrameworkCore.Entity;
 using Repository.Ammeter;
 
 namespace Service.Ammeter
@@ -14,5 +15,17 @@ namespace Service.Ammeter
         {
             this.BaseDal = service;
         }
+        public async Task<PageResult<EmeterDayEnergy>> Page(AmmeterQueryPageModel queryPageModel)
+        {
+            QueryPageModel queryPageModel1 = new QueryPageModel
+            {
+                Page = queryPageModel.Page,
+                PageSize = queryPageModel.PageSize,
+            };
+            if (!string.IsNullOrEmpty(queryPageModel.Code))
+                return PageResult<EmeterDayEnergy>.ConvertPage(this.BaseDal.QueryIPageByCause(queryPageModel1, u => u.Code == queryPageModel.Code));
+            else
+                return PageResult<EmeterDayEnergy>.ConvertPage(this.BaseDal.QueryIPageByCause(queryPageModel1, null));
+        }
     }
 }

Service/Ammeter/EmeterHourEnergyService.cs

@@ -1,5 +1,6 @@
 using Entity.Ammeter;
 using HybirdFrameworkCore.Autofac.Attribute;
+using HybirdFrameworkCore.Entity;
 using Repository.Ammeter;
 
 namespace Service.Ammeter
@@ -14,5 +15,18 @@ namespace Service.Ammeter
         { 
             this.BaseDal = service;
         }
+
+        public async Task<PageResult<EmeterHourEnergy>> Page(AmmeterQueryPageModel queryPageModel)
+        {
+            QueryPageModel queryPageModel1 = new QueryPageModel
+            {
+                Page = queryPageModel.Page,
+                PageSize = queryPageModel.PageSize,
+            };
+            if (!string.IsNullOrEmpty(queryPageModel.Code))
+                return PageResult<EmeterHourEnergy>.ConvertPage(this.BaseDal.QueryIPageByCause(queryPageModel1, u => u.Code == queryPageModel.Code));
+            else
+                return PageResult<EmeterHourEnergy>.ConvertPage(this.BaseDal.QueryIPageByCause(queryPageModel1, null));
+        }
     }
 }

Service/Ammeter/EmeterMinutesEnergyChangeService.cs

@@ -1,5 +1,6 @@
 using Entity.Ammeter;
 using HybirdFrameworkCore.Autofac.Attribute;
+using HybirdFrameworkCore.Entity;
 using Repository;
 using Repository.Ammeter;
 using SqlSugar;
@@ -14,9 +15,25 @@ namespace Service.Ammeter
     [Scope("SingleInstance")]
     public class EmeterMinutesEnergyChangeService : BaseServices<EmeterMinutesEnergyChange>
     {
+        EmeterMinutesEnergyChangeRepository _emeterMinutesEnergyChangeRepository;
         public EmeterMinutesEnergyChangeService(EmeterMinutesEnergyChangeRepository emeterMinutesEnergyChangeRepository)
         {
             this.BaseDal = emeterMinutesEnergyChangeRepository;
+            _emeterMinutesEnergyChangeRepository = emeterMinutesEnergyChangeRepository;
+        }
+
+
+        public async Task<PageResult<EmeterMinutesEnergyChange>> Page(AmmeterQueryPageModel queryPageModel)
+        {
+            QueryPageModel queryPageModel1 = new QueryPageModel
+            {
+                Page = queryPageModel.Page,
+                PageSize = queryPageModel.PageSize,
+            };
+            if (!string.IsNullOrEmpty(queryPageModel.Code))
+                return PageResult<EmeterMinutesEnergyChange>.ConvertPage(_emeterMinutesEnergyChangeRepository.QueryIPageByCause(queryPageModel1, u => u.Code == queryPageModel.Code));
+            else
+                return PageResult<EmeterMinutesEnergyChange>.ConvertPage(_emeterMinutesEnergyChangeRepository.QueryIPageByCause(queryPageModel1, null));
         }
     }
 }

Service/Ammeter/EmeterMinutesEnergyService.cs

@@ -1,5 +1,6 @@
 using Entity.Ammeter;
 using HybirdFrameworkCore.Autofac.Attribute;
+using HybirdFrameworkCore.Entity;
 using Repository.Ammeter;
 
 namespace Service.Ammeter
@@ -8,11 +9,26 @@ namespace Service.Ammeter
     /// 
     /// </summary>
     [Scope("SingleInstance")]
-    public class EmeterMinutesEnergyService: BaseServices<EmeterMinutesEnergy>
+    public class EmeterMinutesEnergyService : BaseServices<EmeterMinutesEnergy>
     {
+        EmeterMinutesEnergyRepository _emeterMinutesEnergyRepository1;
         public EmeterMinutesEnergyService(EmeterMinutesEnergyRepository emeterMinutesEnergyRepository)
         {
             this.BaseDal = emeterMinutesEnergyRepository;
+            _emeterMinutesEnergyRepository1 = emeterMinutesEnergyRepository;
+        }
+
+        public async Task<PageResult<EmeterMinutesEnergy>> Page(AmmeterQueryPageModel queryPageModel)
+        {
+            QueryPageModel queryPageModel1 = new QueryPageModel
+            {
+                Page = queryPageModel.Page,
+                PageSize = queryPageModel.PageSize,
+            };
+            if (!string.IsNullOrEmpty(queryPageModel.Code))
+                return PageResult<EmeterMinutesEnergy>.ConvertPage(_emeterMinutesEnergyRepository1.QueryIPageByCause(queryPageModel1, u => u.Code == queryPageModel.Code));
+            else
+                return PageResult<EmeterMinutesEnergy>.ConvertPage(_emeterMinutesEnergyRepository1.QueryIPageByCause(queryPageModel1, null));
         }
     }
 }

Service/Init/Entity/PlcInfo.cs

@@ -438,63 +438,6 @@ namespace Service.Init.Entity
             return ret;
         }
 
-        /// <summary>
-        /// 灯光控制：全部打开
-        /// </summary>
-        /// <returns></returns>
-        public bool AllLightsOn()
-        {
-            bool bResult = false;
-            if (Connected)
-            {
-                hostToPlc.LightingControl.Value = 1000;
-                bResult = WriteUint16(hostToPlc.LightIn);
-            }
-            return bResult;
-        }
-
-        /// <summary>
-        /// 灯光控制：全部关闭
-        /// </summary>
-        /// <returns></returns>
-        public bool AllLightsOff()
-        {
-            bool bResult = false;
-            if (Connected)
-            {
-                hostToPlc.LightingControl.Value = 1010;
-                bResult = WriteUint16(hostToPlc.LightIn);
-            }
-            return bResult;
-        }
-
-        /// <summary>
-        /// 消防移仓
-        /// </summary>
-        /// <param name="entrySelection">入仓位选择：0-无操作、1-缓存位舱位号、2-20：电池存储仓位</param>
-        /// <returns></returns>
-        public bool FireProtectionRelocation(ushort entrySelection)
-        {
-            bool bResult = false;
-            if (Connected)
-            {
-                hostToPlc.TaskType.Value = 5;
-                hostToPlc.EntrySelection.Value = entrySelection;
-                hostToPlc.ExitSelection.Value = 5;
-                hostToPlc.BatteryPackType.Value = 0;
-                //TODO:: 连续写多个寄存器 是否影响速度
-                bool bResultTaskType = WriteUint16(hostToPlc.TaskType);
-                bool bResultEntrySelection = WriteUint16(hostToPlc.EntrySelection);
-                bool bResultExitSelection = WriteUint16(hostToPlc.ExitSelection);
-                bool bResultBatteryPackType = WriteUint16(hostToPlc.BatteryPackType);
-                if (bResultTaskType && bResultEntrySelection && bResultExitSelection && bResultBatteryPackType)
-                {
-                    bResult = true;
-                }
-            }
-            return bResult;
-        }
-
 
         public PlcInfo(string channelId, int eqmSn)
         {

Service/Plc/Client/PlcMgr.cs

@@ -294,4 +294,77 @@ public class PlcMgr
 
         return (-1);
     }
+
+    /// <summary>
+    /// 灯光控制：全部打开
+    /// </summary>
+    /// <returns></returns>
+    public static bool AllLightsOn()
+    {
+        bool bResult = false;
+        if (PlcClient != null)
+        {
+            HostToPlc writeHostToPlc = new HostToPlc();
+            writeHostToPlc.LightingControl.Value = 1000;
+            bResult = PlcClient.WriteValue(writeHostToPlc.LightIn);
+        }
+        return bResult;
+    }
+    /// <summary>
+    /// 获取当前灯光状态
+    /// </summary>
+    /// <returns></returns>
+    public static ushort GetNowLightsOn()
+    {
+        if (PlcClient != null)
+        {
+            return PlcToHostData.LightStatus.Value;
+        }
+        return default;
+    }
+
+    /// <summary>
+    /// 灯光控制：全部关闭
+    /// </summary>
+    /// <returns></returns>
+    public static bool AllLightsOff()
+    {
+        bool bResult = false;
+        if (PlcClient != null)
+        {
+            HostToPlc writeHostToPlc = new HostToPlc();
+            writeHostToPlc.LightingControl.Value = 1010;
+            bResult = PlcClient.WriteValue(writeHostToPlc.LightIn);
+        }
+        return bResult;
+    }
+
+    /// <summary>
+    /// 消防移仓
+    /// </summary>
+    /// <param name="entrySelection">入仓位选择：0-无操作、1-缓存位舱位号、2-20：电池存储仓位</param>
+    /// <returns></returns>
+    public static bool FireProtectionRelocation(ushort entrySelection)
+    {
+        bool bResult = false;
+        if (PlcClient != null)
+        {
+            HostToPlc writeHostToPlc = new HostToPlc();
+            writeHostToPlc.TaskType.Value = 5;
+            writeHostToPlc.EntrySelection.Value = entrySelection;
+            writeHostToPlc.ExitSelection.Value = 5;
+            writeHostToPlc.BatteryPackType.Value = 0;
+            //TODO:: 连续写多个寄存器 是否影响速度
+            bool bResultTaskType = PlcClient.WriteValue(writeHostToPlc.TaskType);
+            bool bResultEntrySelection = PlcClient.WriteValue(writeHostToPlc.EntrySelection);
+            bool bResultExitSelection = PlcClient.WriteValue(writeHostToPlc.ExitSelection);
+            bool bResultBatteryPackType = PlcClient.WriteValue(writeHostToPlc.BatteryPackType);
+            if (bResultTaskType && bResultEntrySelection && bResultExitSelection && bResultBatteryPackType)
+            {
+                bResult = true;
+            }
+        }
+        return bResult;
+    }
+
 }

Service/Station/BinInfoService.cs

@@ -37,9 +37,10 @@ namespace Service.Station
         {
             RefAsync<int> total = 0;
             var items = await _binInfoRepository.QueryPageAsync(
+                               entity => true, false, entity => true,
                 !string.IsNullOrEmpty(input.No), u => u.No == input.No,
             !string.IsNullOrEmpty(input.Name), u => u.Name == input.Name,
-            input.Page, input.PageSize, total
+            u=>u.Id,input.Page, input.PageSize, total
                 );
             return SqlSugarPagedExtensions.CreateSqlSugarPagedList(items, total, input.Page, input.PageSize);
         }

Service/System/Dict/SysDictTypeService.cs

@@ -31,6 +31,7 @@ namespace Service.System.Dict
         {
             RefAsync<int> total = 0;
             var items = await _sysDictTypeRep.QueryPageAsync(
+               entity => true, false, entity => true,
                 !string.IsNullOrEmpty(input.Code?.Trim()), u => u.Code.Contains(input.Code),
                 !string.IsNullOrEmpty(input.Name?.Trim()), u => u.Name.Contains(input.Name),
                 u => new { u.OrderNo, u.Code }, input.Page, input.PageSize, total);

Service/System/Roles/SysRoleService.cs

@@ -46,6 +46,7 @@ namespace Service.System.Roles
         {
             RefAsync<int> total = 0;
             var items = await _sysRoleRep.QueryPageAsync(
+                               entity => true, false, entity => true,
                 !string.IsNullOrEmpty(input.Name), u => u.Name.Contains(input.Name),
                  !string.IsNullOrEmpty(input.Code), u => u.Code.Contains(input.Code),
                 u => u.OrderNo, input.Page, input.PageSize, total

Service/System/SysConfigService.cs

@@ -42,7 +42,7 @@ namespace Service.System
         public async Task<SqlSugarPagedList<SysConfig>> Page(PageConfigReq input)
         {
             RefAsync<int> total = 0;
-            var items = await _sysConfigRep.QueryPageAsync(
+            var items = await _sysConfigRep.SysConfigQueryPageAsync(
                 !string.IsNullOrEmpty(input.Name), u => u.Name.Contains(input.Name),
                 !string.IsNullOrEmpty(input.Code), u => u.Code.Contains(input.Code),
                 !string.IsNullOrEmpty(input.GroupCode), u => u.GroupCode.Equals(input.GroupCode),

Service/System/SysFileServices.cs

@@ -69,6 +69,7 @@ namespace Service.System
         {
             RefAsync<int> total = 0;
             var items = await _sysFileRep.QueryPageAsync(
+                               entity => true, false, entity => true,
                !string.IsNullOrWhiteSpace(input.FileName), u => u.FileName.Contains(input.FileName.Trim()),
                !string.IsNullOrWhiteSpace(input.StartTime.ToString()) && !string.IsNullOrWhiteSpace(input.EndTime.ToString()),
                             u => u.CreateTime >= input.StartTime && u.CreateTime <= input.EndTime,

Service/System/SysLog/SysLogDiffService.cs

@@ -28,6 +28,7 @@ namespace Service.System.SysLog
         {
             RefAsync<int> total = 0;
             var items = await _sysLogDiffRep.QueryPageAsync(
+                               entity => true, false, entity => true,
                 !string.IsNullOrWhiteSpace(input.StartTime.ToString()), u => u.CreateTime >= input.StartTime,
                 !string.IsNullOrWhiteSpace(input.EndTime.ToString()), u => u.CreateTime <= input.EndTime,
                 u => u.CreateTime, input.Page, input.PageSize, total

Service/System/SysLog/SysLogExService.cs

@@ -30,7 +30,7 @@ namespace Service.System.SysLog
         public async Task<SqlSugarPagedList<SysLogEx>> Page(PageLogReq input)
         {
             RefAsync<int> total = 0;
-            var items = await _sysLogExRep.QueryPageAsync(
+            var items = await _sysLogExRep.SysLogExQueryPageAsync(
                 !string.IsNullOrWhiteSpace(input.StartTime.ToString()), u => u.CreateTime >= input.StartTime,
                 !string.IsNullOrWhiteSpace(input.EndTime.ToString()), u => u.CreateTime <= input.EndTime,
                 input.Page, input.PageSize, total, input

Service/System/SysLog/SysLogOpService.cs

@@ -30,7 +30,7 @@ namespace Service.System.SysLog
         public async Task<SqlSugarPagedList<SysLogOp>> Page(PageLogReq input)
         {
             RefAsync<int> total = 0;
-            var items = await _sysLogOpRep.QueryPageAsync(
+            var items = await _sysLogOpRep.SysLogOpQueryPageAsync(
                 !string.IsNullOrWhiteSpace(input.StartTime.ToString()), u => u.CreateTime >= input.StartTime,
                 !string.IsNullOrWhiteSpace(input.EndTime.ToString()), u => u.CreateTime <= input.EndTime,
                 input.Page, input.PageSize, total, input

Service/System/SysLog/SysLogVisService.cs

@@ -28,6 +28,7 @@ namespace Service.System.SysLog
         {
             RefAsync<int> total = 0;
             var items = await _sysLogVisRep.QueryPageAsync(
+                               entity => true, false, entity => true,
                 !string.IsNullOrWhiteSpace(input.StartTime.ToString()), u => u.CreateTime >= input.StartTime,
                 !string.IsNullOrWhiteSpace(input.EndTime.ToString()), u => u.CreateTime <= input.EndTime,
                 u => u.CreateTime, input.Page, input.PageSize, total

Service/System/SysNoticeService.cs

@@ -45,6 +45,7 @@ namespace Service.System
         {
             RefAsync<int> total = 0;
             var items = await _sysNoticeRep.QueryPageAsync(
+                               entity => true, 
                 !string.IsNullOrWhiteSpace(input.Title), u => u.Title.Contains(input.Title.Trim()),
                 input.Type > 0, u => u.Type == input.Type,
                 !UserManager.SuperAdmin, u => u.CreateUserId == UserManager.UserId,
@@ -143,21 +144,21 @@ namespace Service.System
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [DisplayName("获取接收的通知公告")]
-        public async Task<SqlSugarPagedList<SysNoticeUser>> GetPageReceived([FromQuery] PageNoticeReq input)
-        {
-
-            RefAsync<int> total = 0;
-            var items = await _sysNoticeUserRep.QueryPageByIncludeAsync(
-                u => u.SysNotice,
-                u => u.UserId == UserManager.UserId,
-                !string.IsNullOrWhiteSpace(input.Title), u => u.SysNotice.Title.Contains(input.Title.Trim()),
-                input.Type is > 0, u => u.SysNotice.Type == input.Type,
-                u => u.SysNotice.CreateTime,
-                input.Page, input.PageSize, total);
-            return SqlSugarPagedExtensions.CreateSqlSugarPagedList(items, total, input.Page, input.PageSize);
-
-        }
+        //[DisplayName("获取接收的通知公告")]
+        //public async Task<SqlSugarPagedList<SysNoticeUser>> GetPageReceived([FromQuery] PageNoticeReq input)
+        //{
+
+        //    RefAsync<int> total = 0;
+        //    var items = await _sysNoticeUserRep.QueryPageByIncludeAsync(
+        //        u => u.SysNotice,
+        //        u => u.UserId == UserManager.UserId,
+        //        !string.IsNullOrWhiteSpace(input.Title), u => u.SysNotice.Title.Contains(input.Title.Trim()),
+        //        input.Type is > 0, u => u.SysNotice.Type == input.Type,
+        //        u => u.SysNotice.CreateTime,
+        //        input.Page, input.PageSize, total);
+        //    return SqlSugarPagedExtensions.CreateSqlSugarPagedList(items, total, input.Page, input.PageSize);
+
+        //}
 
         /// <summary>
         /// 获取未读的通知公告 📢

Service/System/SysUserService.cs

@@ -40,6 +40,7 @@ namespace Service.System
         {
             RefAsync<int> total = 0;
             var items = await _sysUserRepository.QueryPageAsync(
+                               entity => true, false, entity => true,
                 !string.IsNullOrEmpty(input.Account), u => u.Account == input.Account,
                 !string.IsNullOrEmpty(input.RealName), u => u.RealName == input.RealName,
                 u => u.CreateTime, input.Page, input.PageSize, total

WebStarter/Controllers/Ammeter/AmmeterController.cs

@@ -49,16 +49,20 @@ namespace WebStarter.Controllers.Ammeter
         /// <summary>
         /// 统计分析/电能表累计值信息
         /// </summary>
-        [HttpGet("TEgEmeterTotalEnergyValue")]
-        public async Task<Result<List<EmeterMinutesEnergy>>> GetNewEmeterMinutesEnergy()
+        [HttpGet("TEgEmeterTotalEnergyValue/{Code}")]
+        public async Task<Result<List<EmeterMinutesEnergy>>> GetNewEmeterMinutesEnergy(string Code)
         {
-            return Result<List<EmeterMinutesEnergy>>.Success(await _emeterMinutesEnergyService.SqlQueryable("SELECT t1.*  \r\nFROM (  \r\n    SELECT code, MAX(time) AS latest_time  \r\n    FROM emeter_minutes_energy  \r\n    GROUP BY code  \r\n) AS latest_records  \r\nJOIN emeter_minutes_energy t1 ON latest_records.code = t1.code AND latest_records.latest_time = t1.time;"));
+            return Result<List<EmeterMinutesEnergy>>.Success(await _emeterMinutesEnergyService.SqlQueryable(
+                "SELECT t1.*  \r\n" +
+                "FROM " +"(  \r\n    SELECT code, MAX(time) AS latest_time  \r\n    " +
+                    "FROM emeter_minutes_energy  \r\n"+" Where code==" + Code+"+ GROUP BY code  \r\n) " +
+                    "AS latest_records  \r\nJOIN emeter_minutes_energy t1 ON latest_records.code = t1.code AND latest_records.latest_time = t1.time;"));
         }
 
         /// <summary>
         /// 删除电能表累计值信息
         /// </summary>
-        [HttpGet("TEgEmeterTotalEnergyValue{id}")]
+        [HttpGet("TEgEmeterTotalEnergyValue/{id}")]
         public Result<bool> DeleteOneEmeterMinutesEnergy(long id)
         {
             return Result<bool>.Success(_emeterMinutesEnergyService.DeleteById(id));
@@ -66,7 +70,7 @@ namespace WebStarter.Controllers.Ammeter
         /// <summary>
         /// 删除电能表累计值信息
         /// </summary>
-        [HttpGet("TEgEmeterTotalEnergyValue/BatchDelete")]
+        [HttpPost("TEgEmeterTotalEnergyValue/BatchDelete")]
         public Result<bool> DeleteMoreEmeterMinutesEnergy(int[] ids)
         {
             return Result<bool>.Success(_emeterMinutesEnergyService.DeleteByIds(ids));
@@ -79,16 +83,16 @@ namespace WebStarter.Controllers.Ammeter
         /// <summary>
         /// 统计分析/电能表变化值信息
         /// </summary>
-        [HttpGet("TEgEmeterRealEnergyValue")]
-        public Result<List<EmeterMinutesEnergyChange>> GetEmeterMinutesEnergyChange()
+        [HttpPost("TEgEmeterRealEnergyValue")]
+        public async  Task<PageResult<EmeterMinutesEnergyChange>> GetEmeterMinutesEnergyChange([FromBody] AmmeterQueryPageModel queryPageModel)
         {
-            return Result<List<EmeterMinutesEnergyChange>>.Success(_emeterMinutesEnergyChangeService.Query());
+            return await _emeterMinutesEnergyChangeService.Page(queryPageModel);
         }
 
         /// <summary>
         /// 删除电能表变化值信息
         /// </summary>
-        [HttpGet("TEgEmeterRealEnergyValue{id}")]
+        [HttpGet("TEgEmeterRealEnergyValue/{id}")]
         public Result<bool> DeleteEmeterMinutesEnergyChange(long id)
         {
             return Result<bool>.Success(_emeterMinutesEnergyChangeService.DeleteById(id));
@@ -96,7 +100,7 @@ namespace WebStarter.Controllers.Ammeter
         /// <summary>
         /// 批量删除电能表变化值信息
         /// </summary>
-        [HttpGet("TEgEmeterRealEnergyValue/BatchDelete")]
+        [HttpPost("TEgEmeterRealEnergyValue/BatchDelete")]
         public Result<bool> DeleteEmeterMinutesEnergyChange(int[] ids)
         {
             return Result<bool>.Success(_emeterMinutesEnergyChangeService.DeleteByIds(ids));
@@ -108,16 +112,16 @@ namespace WebStarter.Controllers.Ammeter
         /// <summary>
         /// 统计分析/电能表小时能耗值
         /// </summary>
-        [HttpGet("TEgEmeterHourEnergyValue")]
-        public Result<List<EmeterHourEnergy>> GetEmeterHourEnergy()
+        [HttpPost("TEgEmeterHourEnergyValue")]
+        public async Task<PageResult<EmeterHourEnergy>> GetEmeterHourEnergy([FromBody] AmmeterQueryPageModel queryPageModel)
         {
-            return Result<List<EmeterHourEnergy>>.Success(_emeterHourEnergyService.Query());
+            return await _emeterHourEnergyService.Page(queryPageModel);
         }
 
         /// <summary>
         /// 删除电能表小时能耗值
         /// </summary>
-        [HttpGet("TEgEmeterHourEnergyValue{id}")]
+        [HttpGet("TEgEmeterHourEnergyValue/{id}")]
         public Result<bool> DeleteEmeterHourEnergy(long id)
         {
             return Result<bool>.Success(_emeterHourEnergyService.DeleteById(id));
@@ -125,7 +129,7 @@ namespace WebStarter.Controllers.Ammeter
         /// <summary>
         /// 批量删除电能表小时能耗值
         /// </summary>
-        [HttpGet("TEgEmeterHourEnergyValue/BatchDelete")]
+        [HttpPost("TEgEmeterHourEnergyValue/BatchDelete")]
         public Result<bool> DeleteListEmeterHourEnergy(int[] ids)
         {
             return Result<bool>.Success(_emeterHourEnergyService.DeleteByIds(ids));
@@ -136,16 +140,16 @@ namespace WebStarter.Controllers.Ammeter
         /// <summary>
         /// 统计分析/电能表每天能耗值
         /// </summary>
-        [HttpGet("TEgEmeterDayEnergyValue")]
-        public Result<List<EmeterDayEnergy>> GetEmeterDayEnergy()
+        [HttpPost("TEgEmeterDayEnergyValue")]
+        public async Task<PageResult<EmeterDayEnergy>> GetEmeterDayEnergy([FromBody] AmmeterQueryPageModel queryPageModel)
         {
-            return Result<List<EmeterDayEnergy>>.Success(_emeterDayEnergyService.Query());
+            return await _emeterDayEnergyService.Page(queryPageModel);
         }
 
         /// <summary>
         /// 删除电能表每天能耗值
         /// </summary>
-        [HttpGet("TEgEmeterDayEnergyValue{id}")]
+        [HttpGet("TEgEmeterDayEnergyValue/{id}")]
         public Result<bool> DeleteEmeterDayEnergy(long id)
         {
             return Result<bool>.Success(_emeterDayEnergyService.DeleteById(id));
@@ -153,7 +157,7 @@ namespace WebStarter.Controllers.Ammeter
         /// <summary>
         /// 批量删除电能表每天能耗值
         /// </summary>
-        [HttpGet("TEgEmeterDayEnergyValue/BatchDelete")]
+        [HttpPost("TEgEmeterDayEnergyValue/BatchDelete")]
         public Result<bool> DeleteListEmeterDayEnergy(int[] ids)
         {
             return Result<bool>.Success(_emeterDayEnergyService.DeleteByIds(ids));

WebStarter/Controllers/BasicConfig/BaseConfigController.cs

@@ -5,16 +5,19 @@ using System.Text;
 using System;
 using Entity.Api.Resp;
 using HybirdFrameworkCore.Entity;
+using Microsoft.VisualBasic;
+using Newtonsoft.Json.Linq;
 
 namespace WebStarter.Controllers.BasicConfig
 {
     /// <summary>
-    /// 基础配置 RFID读写
+    /// 基础配置 
     /// </summary>
-    //[ApiController]
-    //[Route("api/[controller]")]
-    public class RfidReadWriteController
+    [ApiController]
+    [Route("api/[controller]")]
+    public class BaseConfigController
     {
+        #region RFID配置
         //    /// <summary>
         //    /// 预览
         //    /// 车型 的ASCLL、解析后信息
@@ -105,5 +108,16 @@ namespace WebStarter.Controllers.BasicConfig
 
         //        return Result<List<string>>.Success();
         //    }
+        #endregion RFID配置
+
+        /// <summary>
+        /// 日间时间设置
+        /// </summary>
+        [HttpPost("SetDaytime")]
+        public async Task<Result<bool>> SetDaytime([FromBody] SetDayTimeReq input)
+        {
+
+            return Result<bool>.Success();
+        }
     }
 }

WebStarter/Controllers/SwapMonitorController.cs

@@ -119,6 +119,47 @@ public class SwapMonitorController : ControllerBase
         return PlcMgr.WriteEntranceLamp(lampCmd) ? Result<bool>.Success(true) : Result<bool>.Fail();
     }
 
+    /// <summary>
+    /// 灯光控制：全部关闭
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("AllLightsOff")]
+    public async Task<Result<bool>> AllLightsOff()
+    {
+        return Result<bool>.Success(PlcMgr.AllLightsOff());
+    }
+
+    /// <summary>
+    /// 灯光控制：全部打开
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("AllLightsOn")]
+    public async Task<Result<bool>> AllLightsOn()
+    {
+        return Result<bool>.Success(PlcMgr.AllLightsOn());
+    }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("GetNowLightsOn")]
+    public async Task<Result<ushort>> GetNowLightsOn()
+    {
+        return Result<ushort>.Success(PlcMgr.GetNowLightsOn());
+    }
+
+    /// <summary>
+    /// 消防移仓
+    /// </summary>
+    /// <param name="entrySelet">入仓位选择：0-无操作、1-缓存位舱位号、2-20：电池存储仓位</param>
+    /// <returns></returns>
+    [HttpPost("FireProtectionRelocation/{entrySelet}")]
+    public async Task<Result<bool>> FireProtectionRelocation(ushort entrySelet)
+    {
+        return Result<bool>.Success(PlcMgr.FireProtectionRelocation(entrySelet));
+    }
+
+
     /// <summary>
     /// 换电大屏 换电成功 按钮 status :1成功 2：失败
     /// </summary>