From 74e72c24e300fcd824ff0f5702dfa3671ca4b17e Mon Sep 17 00:00:00 2001 From: "zhczyx@163.com" Date: Sun, 21 Dec 2025 13:05:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96bacnet=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sender/service/KingIOServerService.java | 92 +++++++++---------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/techsor/datacenter/sender/service/KingIOServerService.java b/src/main/java/com/techsor/datacenter/sender/service/KingIOServerService.java index bfe9bc1..e237a22 100644 --- a/src/main/java/com/techsor/datacenter/sender/service/KingIOServerService.java +++ b/src/main/java/com/techsor/datacenter/sender/service/KingIOServerService.java @@ -229,8 +229,8 @@ public class KingIOServerService { case 100421: case 100441: case 100461: - tempKey = "85"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Status_Flags == 111 case 100102: @@ -241,8 +241,8 @@ public class KingIOServerService { case 100422: case 100442: case 100462: - tempKey = "111"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Event_State == 36 case 100103: @@ -253,28 +253,28 @@ public class KingIOServerService { case 100423: case 100443: case 100463: - tempKey = "36"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //High_Limit == 45 case 100304: - tempKey = "45"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Low_Limit == 59 case 100305: - tempKey = "59"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Deadband == 25 case 100306: - tempKey = "25"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Limit_Enable == 52 case 100307: - tempKey = "52"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Event_Timestamp == 250.1 case 100108: @@ -284,8 +284,8 @@ public class KingIOServerService { case 100428: case 100446: case 100467: - tempKey = "250.1"; - finalStr = String.format("{\"%s_"+tempKey+"\":\"%s\"",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":\"%s\"",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Event_Type == 250.2 case 100109: @@ -295,8 +295,8 @@ public class KingIOServerService { case 100429: case 100447: case 100468: - tempKey = "250.2"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Nofity_Type == 250.3 case 100110: @@ -306,8 +306,8 @@ public class KingIOServerService { case 100430: case 100448: case 100469: - tempKey = "250.3"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //From_State == 250.4 case 100111: @@ -317,8 +317,8 @@ public class KingIOServerService { case 100431: case 100449: case 100470: - tempKey = "250.4"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //To_State == 250.5 case 100112: @@ -328,8 +328,8 @@ public class KingIOServerService { case 100432: case 100450: case 100471: - tempKey = "250.5"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Event_Value == 250.6 case 100113: @@ -339,8 +339,8 @@ public class KingIOServerService { case 100433: case 100451: case 100472: - tempKey = "250.6"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Reliability == 103 case 100104: @@ -350,8 +350,8 @@ public class KingIOServerService { case 100424: case 100444: case 100464: - tempKey = "103"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Out_Of_Service == 81 case 100105: @@ -360,51 +360,51 @@ public class KingIOServerService { case 100425: case 100445: case 100465: - tempKey = "81"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Change_Of_State_Count == 15 case 100106: case 100426: - tempKey = "15"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Elapsed_Active_Time == 33 case 100107: case 100427: - tempKey = "33"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Polaroty == 84 case 100406: - tempKey = "84"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Feedback_Value == 40 case 100407: case 100466: - tempKey = "40"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Buffer_Size == 126 case 100601: - tempKey = "126"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Log_Buffer == 131 case 100602: - tempKey = "131"; - finalStr = String.format("{\"%s_"+tempKey+"\":\"%s\"",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":\"%s\"",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Record_Count == 141 case 100603: - tempKey = "141"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; //Total_Record_Count == 145 case 100604: - tempKey = "141"; - finalStr = String.format("{\"%s_"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); + tempKey = ""; + finalStr = String.format("{\"%s"+tempKey+"\":%s",deviceItem.getDeviceSN(),dataItem.getValue().toString()+"}"); break; default: