各个库新增数据

src/main/java/com/jg/config/ModBusSlaveServer.java

@@ -221,7 +221,7 @@ public class ModBusSlaveServer implements CommandLineRunner {
 //                    System.out.println(resultBigEndian1);
                 }
 
-                Map<String, Object> resultMap = GetStructure.beimei1(showVoMap);
+                Map<String, Object> resultMap = GetStructure.nanmei3(showVoMap);
 //                JSONArray array = new JSONArray();
 //                for (ShowVo showVo : showVoMap.values()) {
 //                    array.add(showVo);
@@ -229,6 +229,7 @@ public class ModBusSlaveServer implements CommandLineRunner {
                 JSONObject jsonObject = new JSONObject(resultMap);
                 try {
                     webSocketServer.sendInfo(jsonObject.toString(), "push");
+//                    log.info(jsonObject.toString());
                 } catch (IOException e) {
                     e.printStackTrace();
                 }

src/main/java/com/jg/util/GetStructure.java

@@ -10,6 +10,7 @@ import java.util.Map;
 public class GetStructure {
     public static Map<String, Object> nanmei3(Map<Integer, ShowVo> showVoMap){
         Map<String, Object> allMap = new HashMap<>();
+        // FIXME: 2025/3/27 0027 tag.json 302-316待定
         //top1
         Map<String,List> top1 = new HashMap<>();
         List<ShowVo> top1Left = new ArrayList<>();
@@ -91,7 +92,9 @@ public class GetStructure {
         left1.put("5",l15Map);
 
         List<ShowVo> left16 = new ArrayList<>();
-        left16.add(new ShowVo());
+        // FIXME: 2025/3/27 0027
+        left16.add(showVoMap.get(302));
+        left16.add(showVoMap.get(306));
         left1.put("6",left16);
 
         List<ShowVo> left17 = new ArrayList<>();
@@ -144,11 +147,18 @@ public class GetStructure {
         List<ShowVo> left25Other = new ArrayList<>();
         left25Other.add(showVoMap.get(112));
         left25Other.add(showVoMap.get(266));
+        // FIXME: 2025/3/27 0027 
+        left25Other.add(showVoMap.get(310));
+        left25Other.add(showVoMap.get(312));
+        left25Other.add(showVoMap.get(314));
+        left25Other.add(showVoMap.get(316));
         l25Map.put("other",left25Other);
         left2.put("5",l25Map);
 
         List<ShowVo> left26 = new ArrayList<>();
-        left26.add(new ShowVo());
+        // FIXME: 2025/3/27 0027 
+        left26.add(showVoMap.get(304));
+        left26.add(showVoMap.get(308));
         left2.put("6",left26);
 
         List<ShowVo> left27 = new ArrayList<>();
@@ -312,12 +322,27 @@ public class GetStructure {
     }
 
     public static Map<String, Object> beimei1(Map<Integer, ShowVo> showVoMap){
+        //tag.json114-126待定
         Map<String, Object> allMap = new HashMap<>();
 
         //top
-        List<ShowVo> top = new ArrayList<>();
+        /*List<ShowVo> top = new ArrayList<>();
         top.add(showVoMap.get(72));
         top.add(showVoMap.get(76));
+        allMap.put("top",top);*/
+        // FIXME: 2025/3/27 0027 
+        Map<String,List> top = new HashMap<>();
+        List<ShowVo> topLeft = new ArrayList<>();
+        topLeft.add(showVoMap.get(126));
+        topLeft.add(showVoMap.get(118));
+        topLeft.add(showVoMap.get(120));
+        topLeft.add(showVoMap.get(122));
+        List<ShowVo> topRight = new ArrayList<>();
+        topRight.add(showVoMap.get(124));
+        topRight.add(showVoMap.get(72));
+        topRight.add(showVoMap.get(76));
+        top.put("left",topLeft);
+        top.put("right",topRight);
         allMap.put("top",top);
 
         //left
@@ -336,6 +361,8 @@ public class GetStructure {
         List<ShowVo> left3 = new ArrayList<>();
         left3.add(showVoMap.get(64));
         left3.add(showVoMap.get(70));
+        // FIXME: 2025/3/27 0027
+        left3.add(showVoMap.get(116));
         left.put("3",left3);
 
         Map<String,Object> l4Map = new HashMap<>();
@@ -348,6 +375,8 @@ public class GetStructure {
         List<ShowVo> left5 = new ArrayList<>();
         left5.add(showVoMap.get(66));
         left5.add(showVoMap.get(68));
+        // FIXME: 2025/3/27 0027
+        left5.add(showVoMap.get(114));
         left.put("5",left5);
 
         List<ShowVo> left6 = new ArrayList<>();
@@ -684,6 +713,14 @@ public class GetStructure {
     public static Map<String, Object> ershao(Map<Integer, ShowVo> showVoMap){
         Map<String, Object> allMap = new HashMap<>();
 
+        // FIXME: 2025/3/27 0027  tag.json 128-142待定
+        List<ShowVo> top = new ArrayList<>();
+        top.add(showVoMap.get(136));
+        top.add(showVoMap.get(138));
+        top.add(showVoMap.get(140));
+        top.add(showVoMap.get(142));
+        allMap.put("top",top);
+
         //left
         Map<String,Object> left = new HashMap<>();
         List<ShowVo> left1 = new ArrayList<>();
@@ -696,6 +733,9 @@ public class GetStructure {
         List<ShowVo> left2 = new ArrayList<>();
         left2.add(showVoMap.get(106));
         left2.add(showVoMap.get(108));
+        // FIXME: 2025/3/27 0027
+        left2.add(showVoMap.get(128));
+        left2.add(showVoMap.get(132));
         left.put("2",left2);
 
         List<ShowVo> left3 = new ArrayList<>();
@@ -722,6 +762,9 @@ public class GetStructure {
         List<ShowVo> left6 = new ArrayList<>();
         left6.add(showVoMap.get(124));
         left6.add(showVoMap.get(126));
+        // FIXME: 2025/3/27 0027
+        left6.add(showVoMap.get(130));
+        left6.add(showVoMap.get(134));
         left.put("6",left6);
 
         List<ShowVo> left7 = new ArrayList<>();
@@ -805,10 +848,38 @@ public class GetStructure {
     public static Map<String, Object> sishao(Map<Integer, ShowVo> showVoMap){
         Map<String, Object> allMap = new HashMap<>();
 
+        // FIXME: 2025/3/27 0027 tag.json 204-238待定
         //top
-        List<ShowVo> top = new ArrayList<>();
+       /* List<ShowVo> top = new ArrayList<>();
         top.add(showVoMap.get(106));
-        allMap.put("top",top);
+        allMap.put("top",top);*/
+        Map<String,List> top1 = new HashMap<>();
+        List<ShowVo> top1Left = new ArrayList<>();
+        top1Left.add(showVoMap.get(212));
+        top1Left.add(showVoMap.get(214));
+        List<ShowVo> top1Right = new ArrayList<>();
+        top1Right.add(showVoMap.get(208));
+        top1Right.add(showVoMap.get(210));
+        top1Right.add(showVoMap.get(206));
+        top1Right.add(showVoMap.get(204));
+        top1.put("left",top1Left);
+        top1.put("right",top1Right);
+        allMap.put("top1",top1);
+
+        Map<String,List> top2 = new HashMap<>();
+        List<ShowVo> top2Left = new ArrayList<>();
+        top2Left.add(showVoMap.get(106));
+        List<ShowVo> top2Right = new ArrayList<>();
+        top2Right.add(showVoMap.get(216));
+        top2Right.add(showVoMap.get(218));
+        top2Right.add(showVoMap.get(220));
+        top2Right.add(showVoMap.get(222));
+        top2Right.add(showVoMap.get(224));
+        top2Right.add(showVoMap.get(226));
+        top2.put("left",top2Left);
+        top2.put("right",top2Right);
+        allMap.put("top2",top2);
+
 
         //left
         Map<String,Object> left = new HashMap<>();
@@ -839,18 +910,25 @@ public class GetStructure {
         left.put("3",left3);
 
         Map<String,Object> l4Map = new HashMap<>();
+        // FIXME: 2025/3/27 0027 
         l4Map.put("circulatingAir1",showVoMap.get(38));//循环
         l4Map.put("furnaceAir1",showVoMap.get(36));//炉膛
+        l4Map.put("out1",showVoMap.get(228));
         l4Map.put("circulatingAir2",showVoMap.get(42));//循环
         l4Map.put("furnaceAir2",showVoMap.get(40));//炉膛
+        l4Map.put("out2",showVoMap.get(230));
         l4Map.put("circulatingAir3",showVoMap.get(46));//循环
         l4Map.put("furnaceAir3",showVoMap.get(44));//炉膛
+        l4Map.put("out3",showVoMap.get(232));
         l4Map.put("circulatingAir4",showVoMap.get(50));//循环
         l4Map.put("furnaceAir4",showVoMap.get(48));//炉膛
+        l4Map.put("out4",showVoMap.get(234));
         l4Map.put("circulatingAir5",showVoMap.get(54));//循环
         l4Map.put("furnaceAir5",showVoMap.get(52));//炉膛
+        l4Map.put("out5",showVoMap.get(236));
         l4Map.put("circulatingAir6",showVoMap.get(58));//循环
         l4Map.put("furnaceAir6",showVoMap.get(56));//炉膛
+        l4Map.put("out6",showVoMap.get(238));
         left.put("4",l4Map);
 
         List<ShowVo> left5 = new ArrayList<>();

src/main/resources/jsons/二烧tag.json

@@ -638,5 +638,85 @@
 		"desc": "南风机出口压力",
 		"unit": "MPa",
 		"dataType": "int"
+	},
+	{
+		"name": "1#助燃风量",
+		"offset": 128,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "ESA_48",
+		"desc": "1#助燃风量",
+		"unit": "m³/s",
+		"dataType": "int"
+	},
+	{
+		"name": "2#助燃风量",
+		"offset": 130,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "ESA_48",
+		"desc": "2#助燃风量",
+		"unit": "m³/s",
+		"dataType": "int"
+	},
+	{
+		"name": "1#助燃风压力",
+		"offset": 132,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "ESA_48",
+		"desc": "1#助燃风压力",
+		"unit": "MPa",
+		"dataType": "int"
+	},
+	{
+		"name": "2#助燃风压力",
+		"offset": 134,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "ESA_48",
+		"desc": "2#助燃风压力",
+		"unit": "MPa",
+		"dataType": "int"
+	},
+	{
+		"name": "双层烧结煤气流量",
+		"offset": 136,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "ESA_48",
+		"desc": "双层烧结煤气流量",
+		"unit": "m³/s",
+		"dataType": "int"
+	},
+	{
+		"name": "双层烧结煤气压力",
+		"offset": 138,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "ESA_48",
+		"desc": "双层烧结煤气压力",
+		"unit": "Pa",
+		"dataType": "int"
+	},
+	{
+		"name": "双层烧结煤气温度",
+		"offset": 140,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "ESA_48",
+		"desc": "双层烧结煤气温度",
+		"unit": "℃",
+		"dataType": "int"
+	},
+	{
+		"name": "煤气总量",
+		"offset": 142,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "ESA_48",
+		"desc": "煤气总量",
+		"unit": "m³",
+		"dataType": "int"
 	}
 ]

src/main/resources/jsons/北煤1tag.json

@@ -568,5 +568,75 @@
 		"desc": "东库顶北8温度",
 		"unit": "℃",
 		"dataType": "int"
+	},
+	{
+		"name": "南循环管温度",
+		"offset": 114,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "BM1_45",
+		"desc": "南循环管温度",
+		"unit": "℃",
+		"dataType": "int"
+	},
+	{
+		"name": "北循环管温度",
+		"offset": 116,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "BM1_45",
+		"desc": "北循环管温度",
+		"unit": "℃",
+		"dataType": "int"
+	},
+	{
+		"name": "西解冻所煤气量",
+		"offset": 118,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "BM1_45",
+		"desc": "西解冻所煤气量",
+		"unit": "m³/s",
+		"dataType": "int"
+	},
+	{
+		"name": "西解冻所煤气压力",
+		"offset": 120,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "BM1_45",
+		"desc": "西解冻所煤气压力",
+		"unit": "Pa",
+		"dataType": "int"
+	},
+	{
+		"name": "西解冻所煤气温度",
+		"offset": 122,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "BM1_45",
+		"desc": "西解冻所煤气温度",
+		"unit": "℃",
+		"dataType": "int"
+	},
+	{
+		"name": "南侧支管压力",
+		"offset": 124,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "BM1_45",
+		"desc": "南侧支管压力",
+		"unit": "Pa",
+		"dataType": "int"
+	},
+	{
+		"name": "北侧支管压力",
+		"offset": 126,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "BM1_45",
+		"desc": "北侧支管压力",
+		"unit": "Pa",
+		"dataType": "int"
 	}
 ]

src/main/resources/jsons/南煤3tag.json

@@ -1508,5 +1508,91 @@
     "desc": "南东东侧温度08/24",
     "unit": "℃",
     "dataType": "int"
+  },
+  {
+    "name": "南1#燃烧室温度",
+    "offset": 302,
+    "slaveId": 1,
+    "functionCode": 4,
+    "tag": "NM3_81",
+    "desc": "南1#燃烧室温度",
+    "unit": "℃",
+    "dataType": "int"
+  },
+  {
+    "name": "南2#燃烧室温度",
+    "offset": 304,
+    "slaveId": 1,
+    "functionCode": 4,
+    "tag": "NM3_81",
+    "desc": "南2#燃烧室温度",
+    "unit": "℃",
+    "dataType": "int"
+  }
+,
+  {
+    "name": "南1#助燃风机出口压力",
+    "offset": 306,
+    "slaveId": 1,
+    "functionCode": 4,
+    "tag": "NM3_81",
+    "desc": "南1#助燃风机出口压力",
+    "unit": "Pa",
+    "dataType": "int"
+  }
+,
+  {
+    "name": "南2#助燃风机出口压力",
+    "offset": 308,
+    "slaveId": 1,
+    "functionCode": 4,
+    "tag": "NM3_81",
+    "desc": "南2#助燃风机出口压力",
+    "unit": "Pa",
+    "dataType": "int"
+  }
+,
+  {
+    "name": "南2#引风机入口压力",
+    "offset": 310,
+    "slaveId": 1,
+    "functionCode": 4,
+    "tag": "NM3_81",
+    "desc": "南2#引风机入口压力",
+    "unit": "Pa",
+    "dataType": "int"
+  }
+,
+  {
+    "name": "南2#引风机出口压力",
+    "offset": 312,
+    "slaveId": 1,
+    "functionCode": 4,
+    "tag": "NM3_81",
+    "desc": "南2#引风机出口压力",
+    "unit": "Pa",
+    "dataType": "int"
+  }
+,
+  {
+    "name": "南2#引风机入口温度",
+    "offset": 314,
+    "slaveId": 1,
+    "functionCode": 4,
+    "tag": "NM3_81",
+    "desc": "南2#引风机入口温度",
+    "unit": "℃",
+    "dataType": "int"
+  }
+,
+  {
+    "name": "2#引风机进口温度",
+    "offset": 316,
+    "slaveId": 1,
+    "functionCode": 4,
+    "tag": "NM3_81",
+    "desc": "2#引风机进口温度",
+    "unit": "℃",
+    "dataType": "int"
   }
 ]

src/main/resources/jsons/四烧tag.json

@@ -400,7 +400,7 @@
 		"dataType": "int"
 	},
 	{
-		"name": "2",
+		"name": "2#温度",
 		"offset": 80,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -1018,5 +1018,185 @@
 		"desc": "南助燃风量",
 		"unit": "kpa",
 		"dataType": "int"
+	},
+	{
+		"name": "总煤气压力",
+		"offset": 204,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "总煤气压力",
+		"unit": "pa",
+		"dataType": "int"
+	},
+	{
+		"name": "煤气温度",
+		"offset": 206,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "煤气温度",
+		"unit": "℃",
+		"dataType": "int"
+	},
+	{
+		"name": "南侧煤气量",
+		"offset": 208,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "南侧煤气量",
+		"unit": "pa",
+		"dataType": "int"
+	},
+	{
+		"name": "南侧煤气压力",
+		"offset": 210,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "南侧煤气压力",
+		"unit": "pa",
+		"dataType": "int"
+	},
+	{
+		"name": "北侧煤气量",
+		"offset": 212,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "北侧煤气量",
+		"unit": "pa",
+		"dataType": "int"
+	},
+	{
+		"name": "北侧煤气压力",
+		"offset": 214,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "北侧煤气压力",
+		"unit": "pa",
+		"dataType": "int"
+	},
+	{
+		"name": "氮气压力",
+		"offset": 216,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "氮气压力",
+		"unit": "pa",
+		"dataType": "int"
+	},
+	{
+		"name": "氮气温度",
+		"offset": 218,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "氮气温度",
+		"unit": "℃",
+		"dataType": "int"
+	},
+	{
+		"name": "氮气流量",
+		"offset": 220,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "氮气流量",
+		"unit": "m³/s",
+		"dataType": "int"
+	},
+	{
+		"name": "氩气压力",
+		"offset": 222,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "氩气压力",
+		"unit": "pa",
+		"dataType": "int"
+	},
+	{
+		"name": "氩气温度",
+		"offset": 224,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "氩气温度",
+		"unit": "℃",
+		"dataType": "int"
+	},
+	{
+		"name": "氩气流量",
+		"offset": 226,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "氩气流量",
+		"unit": "m³/s",
+		"dataType": "int"
+	},
+	{
+		"name": "1#风机出口温度",
+		"offset": 228,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "1#风机出口温度",
+		"unit": "℃",
+		"dataType": "int"
+	},
+	{
+		"name": "2#风机出口温度",
+		"offset": 230,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "2#风机出口温度",
+		"unit": "℃",
+		"dataType": "int"
+	},
+	{
+		"name": "3#风机出口温度",
+		"offset": 232,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "3#风机出口温度",
+		"unit": "℃",
+		"dataType": "int"
+	},
+	{
+		"name": "4#风机出口温度",
+		"offset": 234,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "4#风机出口温度",
+		"unit": "℃",
+		"dataType": "int"
+	},
+	{
+		"name": "5#风机出口温度",
+		"offset": 236,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "5#风机出口温度",
+		"unit": "℃",
+		"dataType": "int"
+	},
+	{
+		"name": "6#风机出口温度",
+		"offset": 238,
+		"slaveId": 1,
+		"functionCode": 4,
+		"tag": "SS_72",
+		"desc": "6#风机出口温度",
+		"unit": "℃",
+		"dataType": "int"
 	}
 ]