南瑞网关备份

.ninja_log

@@ -137,3 +137,7 @@
 36971	52763	7725188678200433	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/DashboardDeviceService.cpp.o	7dd237d8a43ca343
 43640	54484	7725188744895154	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/RedisReportCacheService.cpp.o	56450d89e102d75c
 54484	56043	7725188853327859	deploy/bin/gateway-server	ce0929752e1db5b2
+98	7832	7726074126907727	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/tcp_server/TcpServer.cpp.o	a1f99320b3b8c883
+7834	9100	7726074204270162	deploy/bin/gateway-scheduler	c90563d061dbec8d
+83	8456	7726087408301884	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/tcp_server/TcpServer.cpp.o	a1f99320b3b8c883
+8458	9820	7726087492052829	deploy/bin/gateway-scheduler	c90563d061dbec8d

Testing/Temporary/LastTest.log

@@ -1,3 +1,3 @@
-Start testing: Jun 25 09:41 中国标准时间
+Start testing: Jun 26 10:39 中国标准时间
 ----------------------------------------------------------
-End testing: Jun 25 09:41 中国标准时间
+End testing: Jun 26 10:39 中国标准时间

modules/gateway-scheduler/src/tcp_server/TcpServer.cpp

@@ -295,7 +295,7 @@ void TcpServer::handle_client(int client_socket) {
           nlohmann::json wind_speed_data;
           wind_speed_data["name"] = "风速";
           wind_speed_data["value"] = ((buffer[13] << 8) + buffer[14]);
-          wind_speed_data["format"] = "m/s";
+          wind_speed_data["format"] = "";
           wind_speed_data["format_id"] = 40;
           json_save["data"].push_back(wind_speed_data);
           // 模式对象
@@ -329,10 +329,11 @@ void TcpServer::handle_client(int client_socket) {
           //开关
           nlohmann::json switch_data;
           switch_data["name"] = "开关";
-          if((buffer[7] << 8) + buffer[8] == 0)
-            switch_data["value"] = "关闭";
-          else
-            switch_data["value"] = "开启";
+          switch_data["value"]  = (buffer[7] << 8) + buffer[8];
+//          if((buffer[7] << 8) + buffer[8] == 0)
+//            switch_data["value"] = "关闭";
+//          else
+//            switch_data["value"] = "开启";
           switch_data["format"] = "";
           switch_data["format_id"] = 0;
           json_save["data"].push_back(switch_data);
@@ -360,19 +361,21 @@ void TcpServer::handle_client(int client_socket) {
           //开关
           nlohmann::json switch_data;
           switch_data["name"] = "门状态";
-          if((buffer[7] << 8) + buffer[8] == 0)
-            switch_data["value"] = "关闭";
-          else
-            switch_data["value"] = "开启";
+          switch_data["value"] = (buffer[9] << 8) + buffer[10];
+//          if((buffer[7] << 8) + buffer[8] == 0)
+//            switch_data["value"] = "关闭";
+//          else
+//            switch_data["value"] = "开启";
           switch_data["format"] = "";
           switch_data["format_id"] = 0;
           json_save["data"].push_back(switch_data);
 
           switch_data["name"] = "门控制";
-          if((buffer[9] << 8) + buffer[10] == 0)
-            switch_data["value"] = "关闭";
-          else
-            switch_data["value"] = "开启";
+          switch_data["value"] = (buffer[9] << 8) + buffer[10];
+//          if((buffer[9] << 8) + buffer[10] == 0)
+//            switch_data["value"] = "关闭";
+//          else
+//            switch_data["value"] = "开启";
           switch_data["format"] = "";
           switch_data["format_id"] = 0;
           json_save["data"].push_back(switch_data);
@@ -385,7 +388,7 @@ void TcpServer::handle_client(int client_socket) {
           nlohmann::json temp_data;
           temp_data["name"] = "氧气浓度";
           temp_data["value"] = ((buffer[7] << 8) + buffer[8])/10.0;
-          temp_data["format"] = "0.1%";
+          temp_data["format"] = "%";
           temp_data["format_id"] = 0;
           json_save["data"].push_back(temp_data);