电表统计接口修改

WebStarter/Controllers/Ammeter/AmmeterController.cs

@@ -49,6 +49,7 @@ namespace WebStarter.Controllers.Ammeter
             _emeterEnergyService = emeterEnergyService;
             _emeterEnergyChangeService = emeterEnergyChangeService;
         }
+        
         /// <summary>
         /// 七天电表用量
         /// </summary>
@@ -80,61 +81,52 @@ namespace WebStarter.Controllers.Ammeter
         #region 统计分析/电能表累计值信息
         
         /// <summary>
-        /// 电能表累计值
+        /// 直流电能表累计值
         /// </summary>
         /// <returns></returns>
         [HttpGet("GetAllElectricalData")]
-        public async Task<Result<EmeterEnergyResp>> GetAllElectricalData()
+        public async Task<Result<List<EmeterEnergy>>> GetAllElectricalData()
         {
-            EmeterEnergyResp resp = new EmeterEnergyResp();
-            // 获取直流和交流表数据
-            List<EmeterEnergy> Electrical = await _emeterEnergyService.GetAllElectricalData();
-            List<EmeterEnergyChange> EnergyChanges = await _emeterEnergyChangeService.GetAllElectricalData();
+            // 直流表数据
+            return Result<List<EmeterEnergy>>.Success(await _emeterEnergyService.GetAllElectricalData(),"成功");
+        }
         
-            var config = new MapperConfiguration(cfg =>
+        /// <summary>
+        /// 交流电能表累计值
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("GetAllEmeterEnergyChange")]
+        public async Task<Result<List<EmeterEnergyChange>>> GetAllEmeterEnergyChange()
         {
-                cfg.CreateMap<EmeterResp, EmeterEnergy>().ReverseMap();
-                cfg.CreateMap<EmeterResp, EmeterEnergyChange>().ReverseMap();
-            });
-            IMapper mapper = config.CreateMapper();
-
-            List<EmeterResp> EnergyList = mapper.Map<List<EmeterResp>>(Electrical);
-            List<EmeterResp> EmeterResps = mapper.Map<List<EmeterResp>>(EnergyChanges);
-
-            resp.emeterEnergy = EnergyList;
-            resp.emeterEnergyChange = EmeterResps;
-            
-            return Result<EmeterEnergyResp>.Success(resp,"成功");
+            // 交流表数据
+            return Result<List<EmeterEnergyChange>>.Success(await _emeterEnergyChangeService.GetAllElectricalData(),"成功");
         }
         
         /// <summary>
-        /// 电能根据小时统计
+        /// 直流电能表小时统计
         /// </summary>
         /// <returns></returns>
-        [HttpGet("GetTodayHourlyElectricalData")]
-        public async Task<Result<EmeterEnergyResp>> GetTodayHourlyElectricalData()
+        [HttpGet("GetTodayHourlyEnergy")]
+        public async Task<Result<List<EmeterEnergy>>> GetTodayHourlyElectricalData()
         {
-            EmeterEnergyResp resp = new EmeterEnergyResp();
-            // 获取直流和交流表数据
+            // 直流表数据
+            return Result<List<EmeterEnergy>>.Success(await _emeterEnergyService.GetTodayHourlyElectricalData(),"成功");
+        }
         
-            List<EmeterEnergy> Electrical = await _emeterEnergyService.GetTodayHourlyElectricalData();
-            List<EmeterEnergyChange> EnergyChanges = await _emeterEnergyChangeService.GetTodayHourlyElectricalData();
         
-            var config = new MapperConfiguration(cfg =>
+        /// <summary>
+        /// 交流电能表小时统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("GetTodayHourlyEnergyChange")]
+        public async Task<Result<List<EmeterEnergyChange>>> GetTodayHourlyElectricalChangeData()
         {
-                cfg.CreateMap<EmeterResp, EmeterEnergy>().ReverseMap();
-                cfg.CreateMap<EmeterResp, EmeterEnergyChange>().ReverseMap();
-            });
-            IMapper mapper = config.CreateMapper();
+            // 交流表数据
+            return Result<List<EmeterEnergyChange>>.Success(await _emeterEnergyChangeService.GetTodayHourlyElectricalData(),"成功");
+        }
         
-            List<EmeterResp> EnergyList = mapper.Map<List<EmeterResp>>(Electrical);
-            List<EmeterResp> EmeterResps = mapper.Map<List<EmeterResp>>(EnergyChanges);
         
-            resp.emeterEnergy = EnergyList;
-            resp.emeterEnergyChange = EmeterResps;
         
-            return Result<EmeterEnergyResp>.Success(resp,"成功");
-        }
         /// <summary>
         /// 统计分析/电能表累计值信息
         /// </summary>