现场问题修改

Entity/Ammeter/EmeterDayEnergy.cs

@@ -15,25 +15,34 @@ namespace Entity.Ammeter
     {
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnName = "id")]
         public long Id { get; set; }
+
         /// <summary>
         /// 电表编码
         /// </summary>
         [SugarColumn(ColumnName = "code")]
         public string Code { get; set; }
+
         /// <summary>
-        /// 天变化值 千瓦时
+        /// 累计值
         /// </summary>
         [SugarColumn(ColumnName = "value")]
         public float Value { get; set; }
+
         /// <summary>
         /// 时间
         /// </summary>
         [SugarColumn(ColumnName = "st")]
-        public DateTime St { get; set; }
+        public string Time { get; set; }
+
         /// <summary>
-        /// 时间
+        ///  实时值（取末端）
+        /// </summary>
+        [SugarColumn(ColumnName = "real_time_value")]
+        public float RealTimeValue { get; set; }
+        /// <summary>
+        ///  1:直流表 2：j交流表
         /// </summary>
-        [SugarColumn(ColumnName = "et")]
-        public DateTime Et { get; set; }
+        [SugarColumn(ColumnName = "type")]
+        public int Type { get; set; }
     }
-}
+}

Entity/Ammeter/EmeterEnergy.cs

@@ -27,7 +27,7 @@ public class EmeterEnergy
     /// 充电机上报时间
     /// </summary>
     [SugarColumn(ColumnName = "upload_time")]
-    public virtual string UploadTime { get; set; }
+    public virtual DateTime UploadTime { get; set; }
 
     /// <summary>
     /// 上报标识：0未上传 1上传

Entity/Ammeter/EmeterHourEnergy.cs

@@ -15,25 +15,34 @@ namespace Entity.Ammeter
     {
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnName = "id")]
         public long Id { get; set; }
+
         /// <summary>
         /// 电表编码
         /// </summary>
         [SugarColumn(ColumnName = "code")]
         public string Code { get; set; }
+
         /// <summary>
-        /// 小时变化值 千瓦时
+        /// 累计值
         /// </summary>
         [SugarColumn(ColumnName = "value")]
         public float Value { get; set; }
+
         /// <summary>
         /// 时间
         /// </summary>
         [SugarColumn(ColumnName = "st")]
-        public DateTime St { get; set; }
+        public float Time { get; set; }
+
         /// <summary>
-        /// 时间
+        ///  实时值（取末端）
+        /// </summary>
+        [SugarColumn(ColumnName = "real_time_value")]
+        public float RealTimeValue { get; set; }
+        /// <summary>
+        ///  1:直流表 2：j交流表
         /// </summary>
-        [SugarColumn(ColumnName = "et")]
-        public DateTime Et { get; set; }
+        [SugarColumn(ColumnName = "type")]
+        public int Type { get; set; }
     }
 }

Entity/Ammeter/EmeterMinutesEnergy.cs

@@ -16,21 +16,35 @@ namespace Entity.Ammeter
     {
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnName = "id")]
         public long Id { get; set; }
+
         /// <summary>
         /// 电表编码
         /// </summary>
         [SugarColumn(ColumnName = "code")]
         public string Code { get; set; }
+
         /// <summary>
-        /// 千瓦时
+        /// 累计值
         /// </summary>
         [SugarColumn(ColumnName = "value")]
         public float Value { get; set; }
+
         /// <summary>
         /// 时间
         /// </summary>
-        [SugarColumn(ColumnName = "time")]
-        public DateTime Time { get; set; }
+        [SugarColumn(ColumnName = "st")]
+        public string Time { get; set; }
+
+        /// <summary>
+        ///  实时值（取末端）
+        /// </summary>
+        [SugarColumn(ColumnName = "real_time_value")]
+        public float RealTimeValue { get; set; }
+        /// <summary>
+        ///  1:直流表 2：j交流表
+        /// </summary>
+        [SugarColumn(ColumnName = "type")]
+        public int Type { get; set; }
 
 
     }

Entity/Ammeter/EmeterMinutesEnergyChange.cs

@@ -1,39 +0,0 @@
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Entity.Ammeter
-{
-    /// <summary>
-    /// 点表15分钟数据
-    /// </summary>
-    [SugarTable("emeter_minutes_energy_change")]
-    public class EmeterMinutesEnergyChange
-    {
-        [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnName = "id")]
-        public long Id { get; set; }
-        /// <summary>
-        /// 电表编码
-        /// </summary>
-        [SugarColumn(ColumnName = "code")]
-        public string Code { get; set; }
-        /// <summary>
-        /// 小时变化值 千瓦时
-        /// </summary>
-        [SugarColumn(ColumnName = "value")]
-        public float Hv { get; set; }
-        /// <summary>
-        /// 时间
-        /// </summary>
-        [SugarColumn(ColumnName = "st")]
-        public DateTime St { get; set; }
-        /// <summary>
-        /// 时间
-        /// </summary>
-        [SugarColumn(ColumnName = "et")]
-        public DateTime Et { get; set; }
-    }
-}

Repository/Ammeter/EmeterMinutesEnergyChangeRepository.cs

@@ -1,21 +0,0 @@
-using Entity.Ammeter;
-using HybirdFrameworkCore.Autofac.Attribute;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Repository.Ammeter
-{
-    [Scope("SingleInstance")]
-    public class EmeterMinutesEnergyChangeRepository : BaseRepository<EmeterMinutesEnergyChange>
-    {
-        private ISqlSugarClient DbBaseClient;
-        public EmeterMinutesEnergyChangeRepository(ISqlSugarClient sqlSugar) : base(sqlSugar)
-        {
-            DbBaseClient = sqlSugar;
-        }
-    }
-}

Repository/BaseRepository.cs

@@ -614,6 +614,8 @@ public abstract class BaseRepository<T> where T : class, new()
             .Select(expression2)
             .ToListAsync();
     }
+    
+
     public async Task<List<long>> QueryByClauseAsync(Expression<Func<T, bool>> predicate, Expression<Func<T, long>> selectExpression, bool blUseNoLock = false)
     {
         return await DbBaseClient

Service/Ammeter/EmeterMinutesEnergyChangeService.cs

@@ -1,33 +0,0 @@
-using Entity.Ammeter;
-using Entity.Dto.Req;
-using HybirdFrameworkCore.Autofac.Attribute;
-using HybirdFrameworkCore.Entity;
-using Repository.Ammeter;
-
-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(PageAmmeterReq queryPageModel)
-        {
-            QueryPageModel queryPageModel1 = new QueryPageModel
-            {
-                PageNum = queryPageModel.PageNum,
-                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/Execute/Invoker.cs

@@ -1,4 +1,4 @@
-using log4net;
+using log4net;
 
 namespace Service.Execute;
 
@@ -13,6 +13,7 @@ public class Invoker
         int hvPwrOffTimes = 0;
         while (!done())
         {
+            Log.Info($"begin {name}");
             Thread.Sleep(duration);
             if (cancel())
             {
@@ -40,6 +41,7 @@ public class Invoker
             }
         }
 
+        Log.Info($" {name} done");
         return InvokeStatus.Done;
     }
 
@@ -51,6 +53,7 @@ public class Invoker
         int count = 0;
         while (!done())
         {
+            Log.Info($"begin {name}");
             Thread.Sleep(duration);
             if (cancel())
             {
@@ -69,6 +72,7 @@ public class Invoker
             }
         }
 
+        Log.Info($" {name} done");
         return InvokeStatus.Done;
     }
 
@@ -80,6 +84,7 @@ public class Invoker
         int count = 0;
         while (!done())
         {
+            Log.Info($"begin {name}");
             Thread.Sleep(duration);
             if (cancel())
             {
@@ -111,6 +116,7 @@ public class Invoker
             }
         }
 
+        Log.Info($" {name} done");
         return InvokeStatus.Done;
     }
     
@@ -123,6 +129,7 @@ public class Invoker
         int count = 0;
         while (!done())
         {
+            Log.Info($"begin {name}");
             Thread.Sleep(duration);
             if (cancel())
             {
@@ -159,6 +166,7 @@ public class Invoker
             }
         }
 
+        Log.Info($" {name} done");
         return InvokeStatus.Done;
     }
    
@@ -176,6 +184,7 @@ public class Invoker
         int count = 0;
         while (!done())
         {
+            Log.Info($"begin {name}");
             Thread.Sleep(duration);
             try
             {
@@ -201,6 +210,7 @@ public class Invoker
             }
         }
 
+        Log.Info($" {name} done");
         return InvokeStatus.Done;
     }
 
@@ -213,6 +223,7 @@ public class Invoker
         int count = 0;
         while (!done())
         {
+            Log.Info($"begin {name}");
             Thread.Sleep(duration);
             try
             {
@@ -235,6 +246,7 @@ public class Invoker
             }
         }
 
+        Log.Info($" {name} done");
         return InvokeStatus.Done;
     }
 
@@ -244,6 +256,7 @@ public class Invoker
         int hvPwrOffTimes = 0;
         while (!done())
         {
+            Log.Info($"begin {name}");
             Thread.Sleep(duration);
             if (cancel())
             {
@@ -261,6 +274,7 @@ public class Invoker
             }
         }
 
+        Log.Info($" {name} done");
         return InvokeStatus.Done;
     }
 }

Service/MyJob/EmeterMinuteJob.cs

@@ -0,0 +1,67 @@
+using Autofac;
+using Entity.Ammeter;
+using HybirdFrameworkCore.Autofac;
+using HybirdFrameworkCore.Autofac.Attribute;
+using HybirdFrameworkCore.Job;
+using log4net;
+using Repository.Ammeter;
+using Repository.System;
+
+namespace Service.Job;
+
+/// <summary>
+/// 分钟统计
+/// </summary>
+[Scope]
+public class EmeterMinuteJob : AbstrackCronJob
+{
+    private static readonly ILog Log = LogManager.GetLogger(typeof(EmeterMinuteJob));
+
+
+    public EmeterEnergyRepository EmeterEnergyRepository { get; set; }
+
+    public EmeterEnergyChangeRepository EmeterEnergyChangeRepository { get; set; }
+
+    public EmeterMinutesEnergyRepository EmeterMinutesEnergyRepository { get; set; }
+
+
+    protected override Task Handle()
+    {
+        /*var now = DateTime.Now;
+        Log.Info($"EmeterMinuteJob execute time={now}");
+        //查询上一分钟的数据
+        string dateTime = now.AddMinutes(-1).ToString("yyyy-MM-dd HH:mm");
+
+        List<EmeterEnergy> emeterEnergies = EmeterEnergyRepository.QueryListByClause(i =>
+            dateTime.Equals(i.UploadTime.ToString("yyyy-MM-dd HH:mm")), "upload_time desc");
+
+        List<EmeterEnergyChange> emeterEnergiesChange = EmeterEnergyChangeRepository.QueryListByClause(i =>
+            dateTime.Equals(i.UploadTime.ToString("yyyy-MM-dd HH:mm")), "upload_time desc");
+
+        if (emeterEnergies.Count > 0)
+        {
+            Dictionary<string, List<EmeterEnergy>> dictionary =
+                emeterEnergies.GroupBy(i => i.Code).ToDictionary(i => i.Key, i => i.ToList());
+
+            foreach (var keyValuePair in dictionary)
+            {
+                EmeterMinutesEnergy emeterMinutesEnergy = new EmeterMinutesEnergy();
+                emeterMinutesEnergy.Code = keyValuePair.Key;
+                emeterMinutesEnergy.Time = dateTime;
+            }
+        }
+
+        if (emeterEnergiesChange.Count > 0)
+        {
+            Dictionary<string, List<EmeterEnergyChange>> dictionaryChange =
+                emeterEnergiesChange.GroupBy(i => i.Code).ToDictionary(i => i.Key, i => i.ToList());
+        }*/
+
+        return Task.CompletedTask;
+    }
+
+    protected override string Cron()
+    {
+        return "0 0/1 * * * ?";
+    }
+}

Service/Service.csproj

@@ -19,6 +19,8 @@
         <PackageReference Include="HslCommunication" Version="11.1.1" />
         <PackageReference Include="log4net" Version="2.0.15" />
         <PackageReference Include="MQTTnet.AspNetCore" Version="3.1.2" />
+        <PackageReference Include="Quartz" Version="3.8.1" />
+        <PackageReference Include="Quartz.Serialization.Json" Version="3.8.1" />
         <PackageReference Include="SqlSugarCore" Version="5.1.4.115" />
         <PackageReference Include="DotNetty.Buffers" Version="0.7.5" />
         <PackageReference Include="DotNetty.Codecs" Version="0.7.5" />

WebStarter/Controllers/Ammeter/AmmeterController.cs

@@ -1,12 +1,10 @@
 using AutoMapper;
 using Entity.Ammeter;
 using Entity.Api.Resp;
-using Entity.Dto.Req;
 using HybirdFrameworkCore.Entity;
 using Microsoft.AspNetCore.Mvc;
 using Service.Ammeter;
 using Service.Station;
-using SqlSugar;
 
 namespace WebStarter.Controllers.Ammeter
 {
@@ -20,13 +18,15 @@ namespace WebStarter.Controllers.Ammeter
         private EmeterDayEnergyService _emeterDayEnergyService;
         private EmeterHourEnergyService _emeterHourEnergyService;
         private EmeterMinutesEnergyService _emeterMinutesEnergyService;
-        private EmeterMinutesEnergyChangeService _emeterMinutesEnergyChangeService;
         private EquipInfoService _equipInfoService;
+
         /// <summary>
         /// 直流电
         /// </summary>
         private EmeterEnergyService _emeterEnergyService;
+
         private EmeterEnergyChangeService _emeterEnergyChangeService;
+
         /// <summary>
         /// 查询电表信息
         /// </summary>
@@ -35,8 +35,9 @@ namespace WebStarter.Controllers.Ammeter
         /// <param name="emeterMinutesEnergyService"></param>
         /// <param name="emeterMinutesEnergyChangeService"></param>
         /// <param name="equipInfoService"></param>
-        public AmmeterController(EmeterDayEnergyService emeterDayEnergyService, EmeterHourEnergyService emeterHourEnergyService,
-            EmeterMinutesEnergyService emeterMinutesEnergyService, EmeterMinutesEnergyChangeService emeterMinutesEnergyChangeService,
+        public AmmeterController(EmeterDayEnergyService emeterDayEnergyService,
+            EmeterHourEnergyService emeterHourEnergyService,
+            EmeterMinutesEnergyService emeterMinutesEnergyService,
             EquipInfoService equipInfoService,
             EmeterEnergyService emeterEnergyService,
             EmeterEnergyChangeService emeterEnergyChangeService)
@@ -44,12 +45,11 @@ namespace WebStarter.Controllers.Ammeter
             _emeterDayEnergyService = emeterDayEnergyService;
             _emeterHourEnergyService = emeterHourEnergyService;
             _emeterMinutesEnergyService = emeterMinutesEnergyService;
-            _emeterMinutesEnergyChangeService = emeterMinutesEnergyChangeService;
             _equipInfoService = equipInfoService;
             _emeterEnergyService = emeterEnergyService;
             _emeterEnergyChangeService = emeterEnergyChangeService;
         }
-        
+
         /// <summary>
         /// 七天电表用量
         /// </summary>
@@ -61,18 +61,17 @@ namespace WebStarter.Controllers.Ammeter
             // 获取直流和交流表数据
             List<EmeterEnergy> sevenDaysElectrical = await _emeterEnergyService.SevenDaysElectrical();
             List<EmeterEnergyChange> emeterEnergyChanges = await _emeterEnergyChangeService.SevenDaysElectrical();
-            
+
             EmeterEnergyResp resp = new EmeterEnergyResp();
-            
-            
+
+
             ChargeAssignment(sevenDaysElectrical, emeterEnergyChanges, resp);
 
-            
-            return Result<EmeterEnergyResp>.Success(resp,"成功");
+
+            return Result<EmeterEnergyResp>.Success(resp, "成功");
         }
-        #region 统计分析/电能表累计值信息
-        
-        
+
+
         /// <summary>
         /// 30天累计能耗
         /// </summary>
@@ -82,15 +81,14 @@ namespace WebStarter.Controllers.Ammeter
         {
             List<EmeterEnergy> emeterEnergy = await _emeterEnergyService.GetAllElectricalData();
             List<EmeterEnergyChange> emeterEnergyChanges = await _emeterEnergyChangeService.GetAllElectricalData();
-            
+
             EmeterEnergyResp resp = new EmeterEnergyResp();
 
             ChargeAssignment(emeterEnergy, emeterEnergyChanges, resp);
 
-            return Result<EmeterEnergyResp>.Success(resp,"成功");
+            return Result<EmeterEnergyResp>.Success(resp, "成功");
         }
 
-        
 
         /// <summary>
         /// 最近一天电表数据
@@ -101,16 +99,17 @@ namespace WebStarter.Controllers.Ammeter
         {
             // 获取最近一天直流和交流表数据
             List<EmeterEnergy> daysElectrical = await _emeterEnergyService.GetTodayHourlyElectricalData();
-            List<EmeterEnergyChange> daysElectricalChange = await _emeterEnergyChangeService.GetTodayHourlyElectricalData();
-            
+            List<EmeterEnergyChange> daysElectricalChange =
+                await _emeterEnergyChangeService.GetTodayHourlyElectricalData();
+
             EmeterEnergyResp resp = new EmeterEnergyResp();
 
             ChargeAssignment(daysElectrical, daysElectricalChange, resp);
 
-            
-            return Result<EmeterEnergyResp>.Success(resp,"成功");
+
+            return Result<EmeterEnergyResp>.Success(resp, "成功");
         }
-        
+
         /// <summary>
         /// 直流电能表小时统计
         /// </summary>
@@ -119,10 +118,10 @@ namespace WebStarter.Controllers.Ammeter
         public async Task<Result<List<EmeterEnergy>>> GetTodayHourlyElectricalData()
         {
             // 直流表数据
-            return Result<List<EmeterEnergy>>.Success(await _emeterEnergyService.GetTodayHourlyElectricalData(),"成功");
+            return Result<List<EmeterEnergy>>.Success(await _emeterEnergyService.GetTodayHourlyElectricalData(), "成功");
         }
-        
-        
+
+
         /// <summary>
         /// 交流电能表小时统计
         /// </summary>
@@ -131,9 +130,10 @@ namespace WebStarter.Controllers.Ammeter
         public async Task<Result<List<EmeterEnergyChange>>> GetTodayHourlyElectricalChangeData()
         {
             // 交流表数据
-            return Result<List<EmeterEnergyChange>>.Success(await _emeterEnergyChangeService.GetTodayHourlyElectricalData(),"成功");
+            return Result<List<EmeterEnergyChange>>.Success(
+                await _emeterEnergyChangeService.GetTodayHourlyElectricalData(), "成功");
         }
-        
+
         /// <summary>
         /// 最近一小时电表数据
         /// </summary>
@@ -143,16 +143,17 @@ namespace WebStarter.Controllers.Ammeter
         {
             // 获取最近一个小时直流和交流表数据
             List<EmeterEnergy> minutesElectrical = await _emeterEnergyService.GetTodayMinutelyElectricalData();
-            List<EmeterEnergyChange> minutesElectricalChange = await _emeterEnergyChangeService.GetTodayMinutelyElectricalData();
-            
+            List<EmeterEnergyChange> minutesElectricalChange =
+                await _emeterEnergyChangeService.GetTodayMinutelyElectricalData();
+
             EmeterEnergyResp resp = new EmeterEnergyResp();
 
             ChargeAssignment(minutesElectrical, minutesElectricalChange, resp);
 
-            
-            return Result<EmeterEnergyResp>.Success(resp,"成功");
+
+            return Result<EmeterEnergyResp>.Success(resp, "成功");
         }
-        
+
         /// <summary>
         /// 获取直流交流电表实时数据
         /// </summary>
@@ -165,23 +166,25 @@ namespace WebStarter.Controllers.Ammeter
             {
                 parsedEndTime = DateTime.Now;
             }
-    
+
             endTime = parsedEndTime.ToString("yyyy-MM-dd HH:mm:ss");
-            
+
             // 获取实时直流和交流表数据
             List<EmeterEnergy> minutesElectrical = await _emeterEnergyService.GetEnergyMeterRealTime(endTime);
-            List<EmeterEnergyChange> minutesElectricalChange = await _emeterEnergyChangeService.GetEnergyMeterRealTime(endTime);
-            
+            List<EmeterEnergyChange> minutesElectricalChange =
+                await _emeterEnergyChangeService.GetEnergyMeterRealTime(endTime);
+
             EmeterEnergyResp resp = new EmeterEnergyResp();
 
             ChargeAssignment(minutesElectrical, minutesElectricalChange, resp);
 
-            
-            return Result<EmeterEnergyResp>.Success(resp,"成功");
+
+            return Result<EmeterEnergyResp>.Success(resp, "成功");
         }
-        
-        
-        private static void ChargeAssignment(List<EmeterEnergy> emeterEnergy, List<EmeterEnergyChange> emeterEnergyChanges, EmeterEnergyResp resp)
+
+
+        private static void ChargeAssignment(List<EmeterEnergy> emeterEnergy,
+            List<EmeterEnergyChange> emeterEnergyChanges, EmeterEnergyResp resp)
         {
             var config = new MapperConfiguration(cfg =>
             {
@@ -197,193 +200,9 @@ namespace WebStarter.Controllers.Ammeter
             List<EmeterResp> EnergyChangeList = mapper.Map<List<EmeterResp>>(emeterEnergyChanges);
             // 类型赋值交流
             EnergyChangeList?.ForEach(emeterResp => emeterResp.Type = 1);
-            
-            resp.emeterEnergy = EnergyList.OrderBy(i=>i.Code).ToList();
-            resp.emeterEnergyChange = EnergyChangeList.OrderBy(i=>i.Code).ToList();
-        }
-        
-        /// <summary>
-        /// 统计分析/电能表累计值信息
-        /// </summary>
-        [HttpGet("TEgEmeterTotalEnergyValue/{Code}")]
-        public async Task<Result<List<EmeterMinutesEnergy>>> GetNewEmeterMinutesEnergy(string Code)
-        {
-            var query = @"
-            SELECT t1.*
-            FROM 
-            (
-                SELECT code, MAX(time) AS latest_time
-                FROM emeter_minutes_energy
-                WHERE code = @Code
-                GROUP BY code
-            ) AS latest_records
-            JOIN emeter_minutes_energy t1
-            ON latest_records.code = t1.code
-            AND latest_records.latest_time = t1.time;";
-
-            var parameters = new List<SugarParameter>
-            {
-                new SugarParameter("@Code", Code)
-            };
-            var result = await Task.Run(() => _emeterMinutesEnergyService.SqlQuery(query, parameters));
-            
-            return Result<List<EmeterMinutesEnergy>>.Success(result);
-        }
-
-        /// <summary>
-        /// 删除电能表累计值信息
-        /// </summary>
-        [HttpGet("delete/TEgEmeterTotalEnergyValue/{id}")]
-        public Result<bool> DeleteOneEmeterMinutesEnergy(long id)
-        {
-            return Result<bool>.Success(_emeterMinutesEnergyService.DeleteById(id));
-        }
-        /// <summary>
-        /// 删除电能表累计值信息
-        /// </summary>
-        [HttpPost("TEgEmeterTotalEnergyValue/BatchDelete")]
-        public Result<bool> DeleteMoreEmeterMinutesEnergy(int[] ids)
-        {
-            return Result<bool>.Success(_emeterMinutesEnergyService.DeleteByIds(ids));
-        }
-
-        #endregion
 
-        #region 统计分析/电能表变化值信息
-
-        /// <summary>
-        /// 统计分析/电能表变化值信息
-        /// </summary>
-        [HttpPost("TEgEmeterRealEnergyValue")]
-        public async  Task<Result<PageResult<EmeterMinutesEnergyChange>>> GetEmeterMinutesEnergyChange([FromBody] PageAmmeterReq queryPageModel)
-        {
-            return Result<PageResult<EmeterMinutesEnergyChange>>.Success(await _emeterMinutesEnergyChangeService.Page(queryPageModel));
+            resp.emeterEnergy = EnergyList.OrderBy(i => i.Code).ToList();
+            resp.emeterEnergyChange = EnergyChangeList.OrderBy(i => i.Code).ToList();
         }
-
-        /// <summary>
-        /// 删除电能表变化值信息
-        /// </summary>
-        [HttpGet("TEgEmeterRealEnergyValue/{id}")]
-        public Result<bool> DeleteEmeterMinutesEnergyChange(long id)
-        {
-            return Result<bool>.Success(_emeterMinutesEnergyChangeService.DeleteById(id));
-        }
-        /// <summary>
-        /// 批量删除电能表变化值信息
-        /// </summary>
-        [HttpPost("TEgEmeterRealEnergyValue/BatchDelete")]
-        public Result<bool> DeleteEmeterMinutesEnergyChange(int[] ids)
-        {
-            return Result<bool>.Success(_emeterMinutesEnergyChangeService.DeleteByIds(ids));
-        }
-
-        #endregion
-
-        #region 统计分析/电能表小时能耗值 
-        /// <summary>
-        /// 统计分析/电能表小时能耗值
-        /// </summary>
-        [HttpPost("TEgEmeterHourEnergyValue")]
-        public async Task<Result<PageResult<EmeterHourEnergy>>> GetEmeterHourEnergy([FromBody] PageAmmeterReq queryPageModel)
-        {
-            return await _emeterHourEnergyService.Page(queryPageModel);
-        }
-
-        /// <summary>
-        /// 删除电能表小时能耗值
-        /// </summary>
-        [HttpGet("TEgEmeterHourEnergyValue/{id}")]
-        public Result<bool> DeleteEmeterHourEnergy(long id)
-        {
-            return Result<bool>.Success(_emeterHourEnergyService.DeleteById(id));
-        }
-        /// <summary>
-        /// 批量删除电能表小时能耗值
-        /// </summary>
-        [HttpPost("TEgEmeterHourEnergyValue/BatchDelete")]
-        public Result<bool> DeleteListEmeterHourEnergy(int[] ids)
-        {
-            return Result<bool>.Success(_emeterHourEnergyService.DeleteByIds(ids));
-        }
-        #endregion
-
-        #region 统计分析/电能表每天能耗值 
-        /// <summary>
-        /// 统计分析/电能表每天能耗值
-        /// </summary>
-        [HttpPost("TEgEmeterDayEnergyValue")]
-        public async Task<Result<PageResult<EmeterDayEnergy>>> GetEmeterDayEnergy([FromBody] PageAmmeterReq queryPageModel)
-        {
-            return Result<PageResult<EmeterDayEnergy>>.Success(await _emeterDayEnergyService.Page(queryPageModel));
-        }
-
-        /// <summary>
-        /// 删除电能表每天能耗值
-        /// </summary>
-        [HttpGet("TEgEmeterDayEnergyValue/{id}")]
-        public Result<bool> DeleteEmeterDayEnergy(long id)
-        {
-            return Result<bool>.Success(_emeterDayEnergyService.DeleteById(id));
-        }
-        /// <summary>
-        /// 批量删除电能表每天能耗值
-        /// </summary>
-        [HttpPost("TEgEmeterDayEnergyValue/BatchDelete")]
-        public Result<bool> DeleteListEmeterDayEnergy(int[] ids)
-        {
-            return Result<bool>.Success(_emeterDayEnergyService.DeleteByIds(ids));
-        }
-        #endregion
-
-        #region 统计分析/换电站分时用电统计信息
-        //TODO::
-        //小时计算总能耗值，小时计算充电能耗值，小时计算换电能耗值，小时计算其他能耗值，开始时间，结束时间
-
-        #endregion
-
-        #region 统计分析/换电站每天用电统计信息
-        //TODO::
-        //每天计算总能耗值，每天计算充电能耗值，每天计算换电能耗值，每天计算其他能耗值，开始时间，结束时间
-
-        #endregion
-
-        #region 电能监控/交流电能监控
-
-        /// <summary>
-        /// 电能监控/交流电能监控
-        /// </summary>
-        [HttpGet("ElecMeterParam/GetElecMeterParamValue")]
-        public Result<List<EmeterMinutesEnergy>> GetElecMeterParamValue()
-        {
-            var EquipInfo = _equipInfoService.QueryListByClause(i => i.TypeCode == 0);
-            List<string> strings = new List<string>();
-            foreach (var kvp in EquipInfo)
-            {
-                strings.Add(kvp.Code);
-            }
-            //TODO::过滤,确保编码相同只出现一次
-            return Result<List<EmeterMinutesEnergy>>.Success(_emeterMinutesEnergyService.QueryListByClause(i => strings.Contains(i.Code)).ToList());
-        }
-
-        #endregion
-
-        #region 电能监控/直流电能监控
-        /// <summary>
-        /// 电能监控/直流电能监控
-        /// </summary>
-        [HttpGet("ManualSwap/GetDcCurrentInfo")]
-        public Result<List<EmeterMinutesEnergy>> GetDcCurrentInfo()
-        {
-            var EquipInfo = _equipInfoService.QueryListByClause(i => i.TypeCode == 1);
-            List<string> strings = new List<string>();
-            foreach (var kvp in EquipInfo)
-            {
-                strings.Add(kvp.Code);
-            }
-            //TODO::过滤,确保编码相同只出现一次
-            return Result<List<EmeterMinutesEnergy>>.Success(_emeterMinutesEnergyService.QueryListByClause(i => strings.Contains(i.Code)).ToList());
-        }
-        #endregion
-
     }
-}
+}