新增查询全部车辆接口

HybirdFrameworkDriver/Session/SessionMgr.cs

@@ -1,5 +1,4 @@
 using System.Collections.Concurrent;
-using DotNetty.Buffers;
 using DotNetty.Transport.Channels;
 using log4net;
 

Service/Car/Handler/ElecMsgHandler.cs

@@ -1,8 +1,9 @@
 using DotNetty.Transport.Channels;
 using HybirdFrameworkCore.Autofac.Attribute;
+using HybirdFrameworkDriver.Session;
+using log4net;
 using Service.Car.Msg.Car.Req;
 using Service.Car.Msg.Host.Resp;
-using Service.Car.Server;
 
 namespace Service.Car.Handler;
 
@@ -13,6 +14,7 @@ namespace Service.Car.Handler;
 [Scope("InstancePerDependency")]
 public class ElecMsgHandler : SimpleChannelInboundHandler<ElecMsg>, IBaseHandler
 {
+    private static readonly ILog Log = LogManager.GetLogger(typeof(ElecMsgHandler));
     /// <summary>
     ///
     /// </summary>
@@ -21,8 +23,12 @@ public class ElecMsgHandler : SimpleChannelInboundHandler<ElecMsg>, IBaseHandler
     /// <exception cref="NotImplementedException"></exception>
     protected override void ChannelRead0(IChannelHandlerContext ctx, ElecMsg msg)
     {
-        CarServerMgr.CarServer.Connected = true;
-        CarServerMgr.CarServer.ElecMsg = msg;
+        Log.Info($"receive ElecMsg = {msg}");
+        IoSession? ioSession = SessionMgr.GetSession(msg.CarNo);
+
+        ioSession?.BusinessMap.AddOrUpdate("ElecMsg", msg, ((s, o) => msg));
+        ioSession?.BusinessMap.AddOrUpdate("Connected", true, ((s, o) => true));
+
         ElecMsgResp resp = new ElecMsgResp(0)
         {
             CarNo = msg.CarNo

Service/Car/Handler/HeartBeatMsgHandler.cs

@@ -1,6 +1,7 @@
 using DotNetty.Transport.Channels;
 using HybirdFrameworkCore.Autofac.Attribute;
 using HybirdFrameworkDriver.Session;
+using log4net;
 using Service.Car.Msg.Car.Req;
 using Service.Car.Msg.Host.Resp;
 using Service.Car.Server;
@@ -14,6 +15,8 @@ namespace Service.Car.Handler;
 [Scope("InstancePerDependency")]
 public class HeartBeatMsgHandler : SimpleChannelInboundHandler<HeartBeatMsg>, IBaseHandler
 {
+
+    private static readonly ILog Log = LogManager.GetLogger(typeof(HeartBeatMsgHandler));
     /// <summary>
     ///
     /// </summary>
@@ -22,16 +25,22 @@ public class HeartBeatMsgHandler : SimpleChannelInboundHandler<HeartBeatMsg>, IB
     /// <exception cref="NotImplementedException"></exception>
     protected override void ChannelRead0(IChannelHandlerContext ctx, HeartBeatMsg msg)
     {
-        CarServerMgr.CarServer.Connected = true;
 
+        Log.Info($"receive HeartBeatMsg = {msg}");
         IoSession? ioSession = SessionMgr.GetSession(ctx.Channel.Id.ToString());
         if (ioSession != null && ioSession.Key != msg.CarNo)
         {
             SessionMgr.ChangeSessionKey(ioSession, msg.CarNo);
         }
 
-        CarServerMgr.CarServer.CarNo = msg.CarNo;
-        CarServerMgr.CarServer.HeartBeatMsg = msg;
+        if (ioSession == null)
+        {
+            ioSession = SessionMgr.GetSession(msg.CarNo);
+        }
+
+        ioSession.BusinessMap.AddOrUpdate("HeartBeatMsg", msg, ((s, o) => msg));
+        ioSession?.BusinessMap.AddOrUpdate("Connected", true, ((s, o) => true));
+
         HeartBeatMsgResp resp = new HeartBeatMsgResp(CarServerMgr.CarServer.StationStatus)
         {
             CarNo = msg.CarNo

Service/Car/Handler/LockMsgRespHandler.cs

@@ -1,6 +1,8 @@
 using DotNetty.Transport.Channels;
 using HybirdFrameworkCore.Autofac.Attribute;
+using log4net;
 using Service.Car.Msg.Car.Resp;
+using Service.Car.Msg.Host.Req;
 using Service.Car.Server;
 
 namespace Service.Car.Handler;
@@ -12,6 +14,8 @@ namespace Service.Car.Handler;
 [Scope("InstancePerDependency")]
 public class LockMsgRespHandler : SimpleChannelInboundHandler<LockMsgResp>, IBaseHandler
 {
+    private static readonly ILog Log = LogManager.GetLogger(typeof(LockMsgRespHandler));
+
     /// <summary>
     ///
     /// </summary>
@@ -20,7 +24,12 @@ public class LockMsgRespHandler : SimpleChannelInboundHandler<LockMsgResp>, IBas
     /// <exception cref="NotImplementedException"></exception>
     protected override void ChannelRead0(IChannelHandlerContext ctx, LockMsgResp msg)
     {
-        CarServerMgr.CarServer.Connected = true;
+        LockMsg? lockMsg = CarServerMgr.CarServer.LockMsgPair.Req;
+
+        Log.Info($"receive LockMsgResp = {msg}, lockMsg={lockMsg}");
+        if (lockMsg != null && lockMsg.CarNo == msg.CarNo)
+        {
             CarServerMgr.CarServer.LockMsgPair.SetResp(msg);
         }
     }
+}

Service/Car/Handler/SetParamMsgRespHandler.cs

@@ -1,5 +1,6 @@
 using DotNetty.Transport.Channels;
 using HybirdFrameworkCore.Autofac.Attribute;
+using log4net;
 using Service.Car.Msg.Car.Resp;
 using Service.Car.Server;
 
@@ -12,6 +13,7 @@ namespace Service.Car.Handler;
 [Scope("InstancePerDependency")]
 public class SetParamMsgRespHandler : SimpleChannelInboundHandler<SetParamMsgResp>, IBaseHandler
 {
+    private static readonly ILog Log = LogManager.GetLogger(typeof(SetParamMsgRespHandler));
     /// <summary>
     ///
     /// </summary>
@@ -20,7 +22,7 @@ public class SetParamMsgRespHandler : SimpleChannelInboundHandler<SetParamMsgRes
     /// <exception cref="NotImplementedException"></exception>
     protected override void ChannelRead0(IChannelHandlerContext ctx, SetParamMsgResp msg)
     {
-        CarServerMgr.CarServer.Connected = true;
+        Log.Info($"receive SetParamMsgResp = {msg}");
         CarServerMgr.CarServer.SetParamMsgPair.SetResp(msg);
     }
 }

Service/Car/Handler/SettleConfirmMsgRespHandler.cs

@@ -1,5 +1,6 @@
 using DotNetty.Transport.Channels;
 using HybirdFrameworkCore.Autofac.Attribute;
+using log4net;
 using Service.Car.Msg.Car.Resp;
 using Service.Car.Server;
 
@@ -12,6 +13,8 @@ namespace Service.Car.Handler;
 [Scope("InstancePerDependency")]
 public class SettleConfirmMsgRespHandler : SimpleChannelInboundHandler<SettleConfirmMsgResp>, IBaseHandler
 {
+
+    private static readonly ILog Log = LogManager.GetLogger(typeof(SettleConfirmMsgRespHandler));
     /// <summary>
     ///
     /// </summary>
@@ -20,7 +23,7 @@ public class SettleConfirmMsgRespHandler : SimpleChannelInboundHandler<SettleCon
     /// <exception cref="NotImplementedException"></exception>
     protected override void ChannelRead0(IChannelHandlerContext ctx, SettleConfirmMsgResp msg)
     {
-        CarServerMgr.CarServer.Connected = true;
+        Log.Info($"receive SettleConfirmMsgResp = {msg}");
         CarServerMgr.CarServer.SettleConfirmMsgPair.SetResp(msg);
     }
 }

Service/Car/Handler/UnLockMsgRespHandler.cs

@@ -1,6 +1,8 @@
 using DotNetty.Transport.Channels;
 using HybirdFrameworkCore.Autofac.Attribute;
+using log4net;
 using Service.Car.Msg.Car.Resp;
+using Service.Car.Msg.Host.Req;
 using Service.Car.Server;
 
 namespace Service.Car.Handler;
@@ -12,6 +14,8 @@ namespace Service.Car.Handler;
 [Scope("InstancePerDependency")]
 public class UnLockMsgRespHandler : SimpleChannelInboundHandler<UnLockMsgResp>, IBaseHandler
 {
+    private static readonly ILog Log = LogManager.GetLogger(typeof(UnLockMsgRespHandler));
+
     /// <summary>
     ///
     /// </summary>
@@ -20,7 +24,11 @@ public class UnLockMsgRespHandler : SimpleChannelInboundHandler<UnLockMsgResp>,
     /// <exception cref="NotImplementedException"></exception>
     protected override void ChannelRead0(IChannelHandlerContext ctx, UnLockMsgResp msg)
     {
-        CarServerMgr.CarServer.Connected = true;
+        UnLockMsg? unLockMsg = CarServerMgr.CarServer.UnLockMsgPair.Req;
+        Log.Info($"receive UnLockMsgResp = {msg} unLockMsg={unLockMsg}");
+        if (unLockMsg != null && unLockMsg.CarNo == msg.CarNo)
+        {
             CarServerMgr.CarServer.UnLockMsgPair.SetResp(msg);
         }
     }
+}

Service/Car/Server/CarServer.cs

@@ -3,7 +3,6 @@ using HybirdFrameworkDriver.Common;
 using HybirdFrameworkDriver.TcpServer;
 using Service.Car.Codec;
 using Service.Car.Handler;
-using Service.Car.Msg.Car.Req;
 using Service.Car.Msg.Car.Resp;
 using Service.Car.Msg.Host.Req;
 
@@ -12,12 +11,6 @@ namespace Service.Car.Server;
 [Scope("SingleInstance")]
 public class CarServer : TcpServer<IBaseHandler, Decoder, Encoder>
 {
-    /// <summary>
-    /// 客户端连接状态
-    /// </summary>
-    public bool Connected { get; set; }
-
-    public string? CarNo { get; set; }
 
     public MsgPair<LockMsg, LockMsgResp> LockMsgPair { get; set; } = new ();
 
@@ -26,17 +19,12 @@ public class CarServer : TcpServer<IBaseHandler, Decoder, Encoder>
     public MsgPair<SetParamMsg, SetParamMsgResp> SetParamMsgPair { get; set; } = new ();
 
     public MsgPair<SettleConfirmMsg, SettleConfirmMsgResp> SettleConfirmMsgPair { get; set; } = new ();
-    public HeartBeatMsg? HeartBeatMsg { get; set; }
 
     /// <summary>
     /// 1 待机 2 换电
     /// </summary>
     public byte StationStatus { get; set; } = 1;
 
-    /// <summary>
-    /// 度电数据车载设备连接上换电站的 Wifi 网络时，主动上送度电数据报文（命令代码： 0x01），发送周期 60s，服务器回复相应的报文(命令代码：0x02)
-    /// </summary>
-    public ElecMsg? ElecMsg { get; set; }
 
     public CarServer() : base()
     {
@@ -49,10 +37,6 @@ public class CarServer : TcpServer<IBaseHandler, Decoder, Encoder>
     /// </summary>
     public void Clean()
     {
-        Connected = false;
-        CarNo = null;
-        HeartBeatMsg = null;
-        ElecMsg = null;
         LockMsgPair.ClearResp();
         UnLockMsgPair.ClearResp();
         SetParamMsgPair.ClearResp();

WebStarter/Controllers/CarController.cs

@@ -1,6 +1,8 @@
 using HybirdFrameworkDriver.Session;
 using log4net;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using Service.Car.Msg.Car.Req;
 using Service.Car.Msg.Host.Req;
 using Service.Car.Server;
 using WebStarter.Dto.Req;
@@ -13,27 +15,73 @@ namespace WebStarter.Controllers;
 /// </summary>
 [ApiController]
 [Route("[controller]")]
-public class CarController : ControllerBase
-{
+public class CarController : ControllerBase{
     private static readonly ILog Log = LogManager.GetLogger(typeof(CarController));
 
     /// <summary>
     /// 获取车辆数据
     /// </summary>
     /// <returns></returns>
-    [HttpGet("/getCarInfo")]
-    public CarInfoResp GetCarInfo()
+    [HttpGet("/getCarInfo/{carNo}")]
+    public CarInfoResp? GetCarInfo(string carNo)
     {
+        IoSession? ioSession = SessionMgr.GetSession(carNo);
         CarInfoResp carInfoResp = new CarInfoResp()
         {
-            Connected = CarServerMgr.CarServer != null && CarServerMgr.CarServer.Connected,
-            CarNo = CarServerMgr.CarServer?.HeartBeatMsg?.CarNo,
-            ElecMsg = CarServerMgr.CarServer?.ElecMsg,
-            HeartBeatMsg = CarServerMgr.CarServer?.HeartBeatMsg
+            Connected = CarServerMgr.CarServer != null && ioSession != null,
         };
+
+        ioSession.BusinessMap.TryGetValue("ElecMsg", out var elecMsg);
+        if (elecMsg != null)
+        {
+            carInfoResp.ElecMsg = (ElecMsg)elecMsg;
+        }
+
+        ioSession.BusinessMap.TryGetValue("HeartBeatMsg", out var heartBeatMsg);
+        if (heartBeatMsg != null)
+        {
+            carInfoResp.HeartBeatMsg = (HeartBeatMsg)heartBeatMsg;
+        }
         return carInfoResp;
     }
 
+
+    /// <summary>
+    /// 获取车辆数据
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("/getCarInfoList")]
+    public List<CarInfoResp> GetCarInfoList()
+    {
+        List<CarInfoResp> result = new List<CarInfoResp>();
+        List<IoSession> sessionList = SessionMgr.GetSessionList();
+        foreach (var ioSession in sessionList)
+        {
+
+            CarInfoResp carInfoResp = new CarInfoResp()
+            {
+                Connected = true,
+                CarNo = ioSession.Key,
+            };
+
+            ioSession.BusinessMap.TryGetValue("ElecMsg", out var elecMsg);
+            if (elecMsg != null)
+            {
+                carInfoResp.ElecMsg = (ElecMsg)elecMsg;
+            }
+
+            ioSession.BusinessMap.TryGetValue("HeartBeatMsg", out var heartBeatMsg);
+            if (heartBeatMsg != null)
+            {
+                carInfoResp.HeartBeatMsg = (HeartBeatMsg)heartBeatMsg;
+            }
+
+            result.Add(carInfoResp);
+
+        }
+        return result;
+    }
+
     /// <summary>
     /// 加锁
     /// </summary>
@@ -42,9 +90,12 @@ public class CarController : ControllerBase
     [HttpGet("/lock/{carNo}")]
     public bool Lock(string carNo)
     {
-        Log.Info("Lock ");
-        if (CarServerMgr.CarServer == null || !CarServerMgr.CarServer.Connected)
+        Log.Info($"Lock {carNo}");
+
+        IoSession? ioSession = SessionMgr.GetSession(carNo);
+        if (CarServerMgr.CarServer == null || ioSession?.Channel == null)
         {
+            Log.Info("ioSession is null return false");
             return false;
         }
 
@@ -53,7 +104,7 @@ public class CarController : ControllerBase
             CarNo = carNo
         };
         CarServerMgr.CarServer.LockMsgPair.Req = lockMsg;
-        SessionMgr.Broadcast(lockMsg);
+        ioSession.Channel.WriteAndFlushAsync(lockMsg);
 
         return CarServerMgr.CarServer.LockMsgPair.GetResp(TimeSpan.FromSeconds(5))?.Result == 0;
     }
@@ -66,9 +117,11 @@ public class CarController : ControllerBase
     [HttpGet("/unLock/{carNo}")]
     public bool UnLock(string carNo)
     {
-        Log.Info("UnLock ");
-        if (CarServerMgr.CarServer == null || !CarServerMgr.CarServer.Connected)
+        Log.Info($"UnLock {carNo} ");
+        IoSession? ioSession = SessionMgr.GetSession(carNo);
+        if (CarServerMgr.CarServer == null || ioSession?.Channel == null)
         {
+            Log.Info("ioSession is null return false");
             return false;
         }
 
@@ -78,7 +131,7 @@ public class CarController : ControllerBase
         };
 
         CarServerMgr.CarServer.UnLockMsgPair.Req = unLockMsg;
-        SessionMgr.Broadcast(unLockMsg);
+        ioSession.Channel.WriteAndFlushAsync(unLockMsg);
 
         return CarServerMgr.CarServer.UnLockMsgPair.GetResp(TimeSpan.FromSeconds(5))?.Result == 0;
     }
@@ -91,15 +144,17 @@ public class CarController : ControllerBase
     [HttpGet("/SettleConfirm/{carNo}")]
     public bool SettleConfirm(string carNo)
     {
-        Log.Info("SettleConfirm ");
-        if (CarServerMgr.CarServer == null || !CarServerMgr.CarServer.Connected)
+        Log.Info($"SettleConfirm {carNo}");
+        IoSession? ioSession = SessionMgr.GetSession(carNo);
+        if (CarServerMgr.CarServer == null || ioSession?.Channel == null)
         {
+            Log.Info("ioSession is null return false");
             return false;
         }
 
         var settleConfirmMsg = new SettleConfirmMsg() { CarNo = carNo };
         CarServerMgr.CarServer.SettleConfirmMsgPair.Req = settleConfirmMsg;
-        SessionMgr.Broadcast(settleConfirmMsg);
+        ioSession.Channel.WriteAndFlushAsync(settleConfirmMsg);
 
         return CarServerMgr.CarServer.SettleConfirmMsgPair.GetResp(TimeSpan.FromSeconds(5))?.Result == 0;
     }
@@ -111,9 +166,11 @@ public class CarController : ControllerBase
     [HttpPost("/setParam")]
     public bool SetParam(SetParam setParam)
     {
-        Log.Info("SetParam");
-        if (CarServerMgr.CarServer == null || !CarServerMgr.CarServer.Connected)
+        Log.Info($"SetParam  {JsonConvert.SerializeObject(setParam)}");
+        IoSession? ioSession = SessionMgr.GetSession(setParam.CarNo);
+        if (CarServerMgr.CarServer == null || ioSession?.Channel == null)
         {
+            Log.Info("ioSession is null return false");
             return false;
         }
 
@@ -143,16 +200,16 @@ public class CarController : ControllerBase
     /// 清空数据
     /// </summary>
     /// <returns></returns>
-    [HttpGet("/clear")]
-    public bool Clear()
+    [HttpGet("/clear/{carNo}")]
+    public bool Clear(string carNo)
     {
-        if (CarServerMgr.CarServer?.CarNo == null)
+        if (CarServerMgr.CarServer == null)
         {
             CarServerMgr.CarServer.Clean();
             return true;
         }
 
-        IoSession? session = SessionMgr.GetSession(CarServerMgr.CarServer.CarNo);
+        IoSession? session = SessionMgr.GetSession(carNo);
         if (session == null)
         {
             CarServerMgr.CarServer.Clean();

WebStarter/Dto/Req/SetParam.cs

@@ -2,6 +2,10 @@
 
 public class SetParam
 {
+    /// <summary>
+    /// 车vin
+    /// </summary>
+    public string CarNo { get; set; }
     /// <summary>
     /// 车辆累计放电量
     /// </summary>