From 5c5e6177b8a22f2a763bab4ad4862abfdd1935b7 Mon Sep 17 00:00:00 2001
From: xjl <2595686544@qq.com>
Date: Wed, 25 Sep 2024 16:29:20 +0800
Subject: [PATCH] =?UTF-8?q?tbox=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Service/Car/Handler/HeartBeatMsgHandler.cs |  4 +++-
 Service/Car/Msg/Car/Req/ElecBaseMsg.cs     |  2 +-
 Service/Car/Server/CarServer.cs            |  3 ++-
 WebStarter/Controllers/CarController.cs    | 22 ++++++++++++++++++++++
 nhetCnAgvVehicle.sln => nhetCnVehicle.sln  |  0
 5 files changed, 28 insertions(+), 3 deletions(-)
 rename nhetCnAgvVehicle.sln => nhetCnVehicle.sln (100%)

diff --git a/Service/Car/Handler/HeartBeatMsgHandler.cs b/Service/Car/Handler/HeartBeatMsgHandler.cs
index 8032951..6ceb140 100644
--- a/Service/Car/Handler/HeartBeatMsgHandler.cs
+++ b/Service/Car/Handler/HeartBeatMsgHandler.cs
@@ -42,7 +42,9 @@ public class HeartBeatMsgHandler : SimpleChannelInboundHandler<HeartBeatMsg>, IB
         ioSession.BusinessMap.AddOrUpdate("HeartBeatMsg", msg, ((s, o) => msg));
         ioSession?.BusinessMap.AddOrUpdate("Connected", true, ((s, o) => true));
 
-        HeartBeatMsgResp resp = new HeartBeatMsgResp(CarServerMgr.CarServer.StationStatus)
+        byte stationStatus = msg.CarNo == CarServerMgr.CarServer.VIN ? CarServerMgr.CarServer.StationStatus :(byte)1;
+       
+        HeartBeatMsgResp resp = new HeartBeatMsgResp(stationStatus)
         {
             CarNo = msg.CarNo
         };
diff --git a/Service/Car/Msg/Car/Req/ElecBaseMsg.cs b/Service/Car/Msg/Car/Req/ElecBaseMsg.cs
index 7c1c87e..bf9a619 100644
--- a/Service/Car/Msg/Car/Req/ElecBaseMsg.cs
+++ b/Service/Car/Msg/Car/Req/ElecBaseMsg.cs
@@ -15,7 +15,7 @@ namespace Service.Car.Msg.Car.Req
         [Property(248, 192)]
         public string BatteryCode { get; set; }
         /// <summary>
-        /// 电池编码
+        /// 电池厂家
         /// </summary>
         [Property(340, 8)]
         public byte BatteryManufacturer { get; set; }
diff --git a/Service/Car/Server/CarServer.cs b/Service/Car/Server/CarServer.cs
index 1f4c4be..74c4eec 100644
--- a/Service/Car/Server/CarServer.cs
+++ b/Service/Car/Server/CarServer.cs
@@ -24,8 +24,9 @@ public class CarServer : TcpServer<IBaseHandler, Decoder, Encoder>
     /// 1 待机 2 换电
     /// </summary>
     public byte StationStatus { get; set; } = 1;
+    public string VIN { get; set; };
 
-
+    
     public CarServer() : base()
     {
         this.ChannelInActiveAction = Clean;
diff --git a/WebStarter/Controllers/CarController.cs b/WebStarter/Controllers/CarController.cs
index f985277..20f88d5 100644
--- a/WebStarter/Controllers/CarController.cs
+++ b/WebStarter/Controllers/CarController.cs
@@ -156,6 +156,28 @@ public class CarController : ControllerBase{
         return CarServerMgr.CarServer.UnLockMsgPair.GetResp(TimeSpan.FromSeconds(5))?.Result == 0;
     }
 
+
+    /// <summary>
+    /// 设置心跳返回信息
+    /// </summary>
+    /// <param name="status">
+    /// 1 换电站待机
+    /// 2 开始换电
+    /// 3 换电进行中
+    /// 4 换电完成
+    /// 5 换电站故障</param>
+    /// <returns></returns>
+    [HttpGet("Vin/{VIN}/SetStatus/{status}")]
+    public bool SetStatus(string VIN, byte status)
+    {
+        if (CarServerMgr.CarServer != null)
+        {
+            CarServerMgr.CarServer.VIN = VIN;
+            CarServerMgr.CarServer.StationStatus = status;
+            return true;
+        }
+        return false;
+    }
     /// <summary>
     /// 结算
     /// </summary>
diff --git a/nhetCnAgvVehicle.sln b/nhetCnVehicle.sln
similarity index 100%
rename from nhetCnAgvVehicle.sln
rename to nhetCnVehicle.sln