From 6e66601ef184642382711c94731286a361567b76 Mon Sep 17 00:00:00 2001
From: lch <1627445470@qq.com>
Date: Fri, 31 May 2024 16:16:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=B5=E6=B1=A0=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=95=B0=E9=87=8F=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Entity/DbModel/Station/BinInfo.cs          |  6 ++++++
 Entity/Dto/Req/DistributeElecPriceReq.cs   | 13 ------------
 Entity/Dto/Resp/BatteryStatusInfoResp.cs   | 17 ++++++++++++++++
 Service/Charger/ChargerService.cs          | 23 +++++++++++++++++++++-
 WebStarter/Controllers/ChargeController.cs | 17 +++++++++++++---
 5 files changed, 59 insertions(+), 17 deletions(-)
 delete mode 100644 Entity/Dto/Req/DistributeElecPriceReq.cs
 create mode 100644 Entity/Dto/Resp/BatteryStatusInfoResp.cs

diff --git a/Entity/DbModel/Station/BinInfo.cs b/Entity/DbModel/Station/BinInfo.cs
index dbaffd2..2fbaca6 100644
--- a/Entity/DbModel/Station/BinInfo.cs
+++ b/Entity/DbModel/Station/BinInfo.cs
@@ -43,6 +43,12 @@ namespace Entity.DbModel.Station
         /// </summary>
         [SugarColumn(ColumnName = "name")]
         public string Name { get; set; }
+        
+        /// <summary>
+        /// 在位状态：0-不在位；1-在位；其他-无效
+        /// </summary>
+        [SugarColumn(ColumnName = "exists")]
+        public int Exists { get; set; }
 
         /// <summary>
         /// Desc:电池编号
diff --git a/Entity/Dto/Req/DistributeElecPriceReq.cs b/Entity/Dto/Req/DistributeElecPriceReq.cs
deleted file mode 100644
index ad72250..0000000
--- a/Entity/Dto/Req/DistributeElecPriceReq.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Entity.Dto.Req;
-
-public class DistributeElecPriceReq
-{
-    /// <summary>
-    /// 充电机号
-    /// </summary>
-    public string BinNo { get; set; }
-    /// <summary>
-    /// 电价模型详情：版本
-    /// </summary>
-    public int Version { get; set; }
-}
\ No newline at end of file
diff --git a/Entity/Dto/Resp/BatteryStatusInfoResp.cs b/Entity/Dto/Resp/BatteryStatusInfoResp.cs
new file mode 100644
index 0000000..8b4211e
--- /dev/null
+++ b/Entity/Dto/Resp/BatteryStatusInfoResp.cs
@@ -0,0 +1,17 @@
+namespace Entity.Dto.Resp;
+
+public class BatteryStatusInfoResp
+{
+    /// <summary>
+    /// 电池总数
+    /// </summary>
+    public  int btyTotalCount { get;set; }
+    /// <summary>
+    /// 正在充电数量
+    /// </summary>
+    public  int chargingCount  { get;set; }
+    /// <summary>
+    /// 满足换电数量
+    /// </summary>
+    public  int canSwapCount  { get;set; }
+}
\ No newline at end of file
diff --git a/Service/Charger/ChargerService.cs b/Service/Charger/ChargerService.cs
index 56ba458..f05783b 100644
--- a/Service/Charger/ChargerService.cs
+++ b/Service/Charger/ChargerService.cs
@@ -1,9 +1,11 @@
 using Entity.DbModel.Station;
+using Entity.Dto.Resp;
 using HybirdFrameworkCore.Autofac.Attribute;
 using HybirdFrameworkCore.Entity;
 using Repository.Station;
 using Service.Charger.Client;
 using Service.Charger.Msg.Host.Req;
+using Service.Init;
 using SqlSugar;
 
 namespace Service.Charger;
@@ -77,7 +79,7 @@ public class ChargerService
     /// </summary>
     /// <param name="binNo"></param>
     /// <returns></returns>
-    public Result<bool> DistributeElecPriceForCharge(string binNo,int version)
+    public Result<bool> DistributeElecPriceForCharge(int version)
     {
         Dictionary<string,ChargerClient> chargerClients = ClientMgr.Dictionary;
         if (chargerClients.Values.Count <= 0)
@@ -131,4 +133,23 @@ public class ChargerService
         };
         return setPeakValleyTime;
     }
+
+    /// <summary>
+    /// 电池状态信息：电池总数 满电数量、充电中、故障电池、维护中电池
+    /// </summary>
+    /// <returns></returns>
+    public Result<BatteryStatusInfoResp> BatteryStatusInfo()
+    {
+        BatteryStatusInfoResp batteryStatusInfoResp = new BatteryStatusInfoResp();
+        List<BinInfo> binInfos = BinInfoRepository.QueryListByClause(i => i.Exists == 1 && i.Status == 1);
+        if (binInfos.Count > 0)
+            batteryStatusInfoResp.btyTotalCount = binInfos.Count();
+        List<BinInfo> canSwapCounts = BinInfoRepository.QueryListByClause(i => i.Exists == 1 && i.Status == 1&&i.Soc > Convert.ToDecimal(StaticStationInfo.SwapSoc));
+        if (canSwapCounts.Count > 0)
+            batteryStatusInfoResp.canSwapCount = canSwapCounts.Count();
+        List<BinInfo> chargingCounts = BinInfoRepository.QueryListByClause(i => i.Exists == 1 && i.Status == 1&&i.ChargeStatus==1);
+        if (chargingCounts.Count > 0)
+            batteryStatusInfoResp.chargingCount = chargingCounts.Count(); 
+        return Result<BatteryStatusInfoResp>.Fail();
+    }
 }
\ No newline at end of file
diff --git a/WebStarter/Controllers/ChargeController.cs b/WebStarter/Controllers/ChargeController.cs
index 6a18ebb..ab42d13 100644
--- a/WebStarter/Controllers/ChargeController.cs
+++ b/WebStarter/Controllers/ChargeController.cs
@@ -110,10 +110,21 @@ public class ChargeController : ControllerBase
     /// </summary>
     /// <param name="version"></param>
     [HttpGet]
-    [Route("DistributeElecPriceForCharge")]
-    public Result<bool> DistributeElecPriceForCharge([FromBody] DistributeElecPriceReq input )
+    [Route("DistributeElecPriceForCharge/{Version}")]
+    public Result<bool> DistributeElecPriceForCharge(int Version)
     {
-        return _chargerService.DistributeElecPriceForCharge(input.BinNo,input.Version);
+        return _chargerService.DistributeElecPriceForCharge(Version);
     }
+    //BatteryStatusInfo
 
+    /// <summary>
+    /// 电池状态信息：电池总数 满电数量、充电中、故障电池、维护中电池
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet]
+    [Route("BatteryStatusInfo")]
+    public Result<BatteryStatusInfoResp> BatteryStatusInfo()
+    {
+        return _chargerService.BatteryStatusInfo();
+    }
 }
\ No newline at end of file