From d5d847064a6ebb8281ab50953eb179dcc0593684 Mon Sep 17 00:00:00 2001
From: rszn <645583145@qq.com>
Date: Tue, 4 Jun 2024 19:18:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E7=94=B5=E8=AE=A2=E5=8D=95bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Const}/EquipmentType.cs                   |  7 ++--
 HybirdFrameworkCore/Entity/Result.cs          | 33 ++++++++-----------
 Service/Charger/ChargerService.cs             |  2 +-
 Service/Charger/Client/ChargerClient.cs       | 16 ++++-----
 Service/Charger/Client/ClientMgr.cs           |  2 +-
 5 files changed, 27 insertions(+), 33 deletions(-)
 rename {Service/Equipment => Common/Const}/EquipmentType.cs (51%)

diff --git a/Service/Equipment/EquipmentType.cs b/Common/Const/EquipmentType.cs
similarity index 51%
rename from Service/Equipment/EquipmentType.cs
rename to Common/Const/EquipmentType.cs
index 1633595..7f6f2f4 100644
--- a/Service/Equipment/EquipmentType.cs
+++ b/Common/Const/EquipmentType.cs
@@ -1,8 +1,9 @@
-namespace Service.Equipment;
+namespace Common.Const;
 
 public enum EquipmentType
 {
     Charger,
     Ammeter,
-    WaterCool
-}
\ No newline at end of file
+    WaterCool,
+    Plc
+}
diff --git a/HybirdFrameworkCore/Entity/Result.cs b/HybirdFrameworkCore/Entity/Result.cs
index 3cd3831..21fa9f4 100644
--- a/HybirdFrameworkCore/Entity/Result.cs
+++ b/HybirdFrameworkCore/Entity/Result.cs
@@ -8,12 +8,14 @@
         /// <summary>
         /// 状态码
         /// </summary>
-  
+
         public int Status { get; set; } = 200;
+
         /// <summary>
         /// 操作是否成功
         /// </summary>
         public bool IsSuccess { get; set; } = false;
+
         /// <summary>
         /// 返回信息
         /// </summary>
@@ -29,12 +31,10 @@
         /// </summary>
         /// <param name="msg">消息</param>
         /// <returns></returns>
-        public static Result<T> Success(string msg = "成功")
+        public static Result<T> Success(T t = default)
         {
-            return Message(true, msg, default);
+            return Message(true, "成功", t);
         }
-     
-       
 
         /// <summary>
         /// 返回成功
@@ -46,9 +46,8 @@
         {
             return Message(true, msg, data);
         }
-        
-   
-        
+
+
         /// <summary>
         /// 返回失败
         /// </summary>
@@ -58,8 +57,8 @@
         {
             return Message(false, msg, default);
         }
-  
-        
+
+
         /// <summary>
         /// 返回失败
         /// </summary>
@@ -70,7 +69,7 @@
         {
             return Message(false, msg, data);
         }
-        
+
         /// <summary>
         /// 返回消息
         /// </summary>
@@ -82,7 +81,7 @@
         {
             return new Result<T>() { Msg = msg, Data = data, IsSuccess = success };
         }
-        
+
         /// <summary>
         /// 返回消息
         /// </summary>
@@ -90,15 +89,9 @@
         /// <param name="msg">消息</param>
         /// <param name="data">数据</param>
         /// <returns></returns>
-        public static Result<T> Message(bool success,  T data)
+        public static Result<T> Message(bool success, T data)
         {
-            return new Result<T>() { Msg="查询成功", Data = data, IsSuccess = success };
+            return new Result<T>() { Msg = "查询成功", Data = data, IsSuccess = success };
         }
-        
-     
-        
     }
-
-   
-
 }
diff --git a/Service/Charger/ChargerService.cs b/Service/Charger/ChargerService.cs
index 604820c..358a509 100644
--- a/Service/Charger/ChargerService.cs
+++ b/Service/Charger/ChargerService.cs
@@ -72,7 +72,7 @@ public class ChargerService
 
         chargerClient.SendRemoteStopCharging();
 
-        return Result<bool>.Success("发送停止命令成功");
+        return Result<bool>.Success(true, "发送停止命令成功");
     }
     /// <summary>
     /// 下发尖峰平谷
diff --git a/Service/Charger/Client/ChargerClient.cs b/Service/Charger/Client/ChargerClient.cs
index 91a37b8..0542ea1 100644
--- a/Service/Charger/Client/ChargerClient.cs
+++ b/Service/Charger/Client/ChargerClient.cs
@@ -188,7 +188,7 @@ public class ChargerClient : TcpClient<IBaseHandler, Decoder, Encoder>
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="asdu"></param>
     public void ReceiveMsgHandle(ASDU asdu)
@@ -411,7 +411,7 @@ public class ChargerClient : TcpClient<IBaseHandler, Decoder, Encoder>
     }
 
     /// <summary>
-    /// 3.4.7 监控平台下发掉线停止充电 
+    /// 3.4.7 监控平台下发掉线停止充电
     /// </summary>
     /// <param name="enabled"> 0：不使能 1：使能</param>
     public Result<bool> SendOfflineStopCharging(byte enabled)
@@ -445,7 +445,7 @@ public class ChargerClient : TcpClient<IBaseHandler, Decoder, Encoder>
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public Result<bool> SendQueryBattery()
     {
@@ -467,7 +467,7 @@ public class ChargerClient : TcpClient<IBaseHandler, Decoder, Encoder>
     #region 启动充电
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public Result<bool> StartCharge()
     {
@@ -503,7 +503,7 @@ public class ChargerClient : TcpClient<IBaseHandler, Decoder, Encoder>
         string? lockKey = redisHelper.GetStrValue($"chargeNo{BinNo}Start");
         if (!string.IsNullOrWhiteSpace(lockKey))
         {
-            return Result<bool>.Success($"charger-{BinNo} is starting");
+            return Result<bool>.Success(true, $"charger-{BinNo} is starting");
         }
 
         redisHelper.SetKeyValueStr($"chargeNo{BinNo}Start", DateTime.Now.ToString("f"), TimeSpan.FromMinutes(1));
@@ -533,7 +533,7 @@ public class ChargerClient : TcpClient<IBaseHandler, Decoder, Encoder>
     #endregion
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <returns></returns>
     public bool Connect()
@@ -548,7 +548,7 @@ public class ChargerClient : TcpClient<IBaseHandler, Decoder, Encoder>
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="sn"></param>
     /// <param name="destAddr"></param>
@@ -559,4 +559,4 @@ public class ChargerClient : TcpClient<IBaseHandler, Decoder, Encoder>
         ChannelUtils.AddAttr(Channel, ChargerConst.EqmCode, sn);
         ChannelUtils.AddAttr(Channel, ChargerConst.DestAddr, destAddr);
     }
-}
\ No newline at end of file
+}
diff --git a/Service/Charger/Client/ClientMgr.cs b/Service/Charger/Client/ClientMgr.cs
index 7485e43..416e5cd 100644
--- a/Service/Charger/Client/ClientMgr.cs
+++ b/Service/Charger/Client/ClientMgr.cs
@@ -1,4 +1,5 @@
 using Autofac;
+using Common.Const;
 using DotNetty.Transport.Channels;
 using Entity.DbModel.Station;
 using HybirdFrameworkCore.Autofac;
@@ -7,7 +8,6 @@ using HybirdFrameworkDriver.Session;
 using log4net;
 using Repository.Station;
 using Service.Charger.Common;
-using Service.Equipment;
 
 namespace Service.Charger.Client;