适配页面重排版-二烧

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

@@ -699,19 +699,19 @@ public class GetStructure {
         left.put("2",left2);
 
         List<ShowVo> left3 = new ArrayList<>();
-        left3.add(showVoMap.get(0));
-        left3.add(showVoMap.get(0));
+        left3.add(showVoMap.get(120));
+        left3.add(showVoMap.get(122));
         left.put("3",left3);
 
         Map<String,Object> l4Map = new HashMap<>();
-        l4Map.put("circulatingAir1",showVoMap.get(0));//循环
-        l4Map.put("furnaceAir1",showVoMap.get(0));//炉膛
-        l4Map.put("circulatingAir3",showVoMap.get(0));//循环
-        l4Map.put("furnaceAir3",showVoMap.get(0));//炉膛
-        l4Map.put("circulatingAir2",showVoMap.get(0));//循环
-        l4Map.put("furnaceAir2",showVoMap.get(0));//炉膛
-        l4Map.put("circulatingAir4",showVoMap.get(0));//循环
-        l4Map.put("furnaceAir4",showVoMap.get(0));//炉膛
+        l4Map.put("circulatingAir1",showVoMap.get(16));//循环
+        l4Map.put("furnaceAir1",showVoMap.get(18));//炉膛
+        l4Map.put("circulatingAir3",showVoMap.get(24));//循环
+        l4Map.put("furnaceAir3",showVoMap.get(26));//炉膛
+        l4Map.put("circulatingAir2",showVoMap.get(20));//循环
+        l4Map.put("furnaceAir2",showVoMap.get(22));//炉膛
+        l4Map.put("circulatingAir4",showVoMap.get(28));//循环
+        l4Map.put("furnaceAir4",showVoMap.get(30));//炉膛
         left.put("4",l4Map);
 
         List<ShowVo> left5 = new ArrayList<>();
@@ -720,8 +720,8 @@ public class GetStructure {
         left.put("5",left5);
 
         List<ShowVo> left6 = new ArrayList<>();
-        left6.add(showVoMap.get(0));
-        left6.add(showVoMap.get(0));
+        left6.add(showVoMap.get(124));
+        left6.add(showVoMap.get(126));
         left.put("6",left6);
 
         List<ShowVo> left7 = new ArrayList<>();
@@ -735,66 +735,66 @@ public class GetStructure {
         //right
         List<Map> right = new ArrayList<>();
         Map<String,Object> right1 = new HashMap<>();
-        right1.put("name","东库侧北温度（6车道）");
+        right1.put("name","东库侧温");
         List<ShowVo> right1Data = new ArrayList<>();
-        right1Data.add(showVoMap.get(0));
-        right1Data.add(showVoMap.get(0));
-        right1Data.add(showVoMap.get(0));
-        right1Data.add(showVoMap.get(0));
-        right1Data.add(showVoMap.get(0));
-        right1Data.add(showVoMap.get(0));
-        right1Data.add(showVoMap.get(0));
-        right1Data.add(showVoMap.get(0));
-        right1Data.add(showVoMap.get(0));
-        right1Data.add(showVoMap.get(0));
+        right1Data.add(showVoMap.get(48));
+        right1Data.add(showVoMap.get(50));
+        right1Data.add(showVoMap.get(52));
+        right1Data.add(showVoMap.get(54));
+        right1Data.add(showVoMap.get(56));
+        right1Data.add(showVoMap.get(58));
+        right1Data.add(showVoMap.get(60));
+        right1Data.add(showVoMap.get(62));
+        right1Data.add(showVoMap.get(80));
+        right1Data.add(showVoMap.get(82));
         right1.put("data",right1Data);
         right.add(right1);
 
         Map<String,Object> right2 = new HashMap<>();
-        right2.put("name","东库顶北温度（6车道）");
+        right2.put("name","东库顶温");
         List<ShowVo> right2Data = new ArrayList<>();
-        right2Data.add(showVoMap.get(0));
-        right2Data.add(showVoMap.get(0));
-        right2Data.add(showVoMap.get(0));
-        right2Data.add(showVoMap.get(0));
-        right2Data.add(showVoMap.get(0));
-        right2Data.add(showVoMap.get(0));
-        right2Data.add(showVoMap.get(0));
-        right2Data.add(showVoMap.get(0));
-        right2Data.add(showVoMap.get(0));
-        right2Data.add(showVoMap.get(0));
+        right2Data.add(showVoMap.get(84));
+        right2Data.add(showVoMap.get(86));
+        right2Data.add(showVoMap.get(88));
+        right2Data.add(showVoMap.get(90));
+        right2Data.add(showVoMap.get(92));
+        right2Data.add(showVoMap.get(94));
+        right2Data.add(showVoMap.get(112));
+        right2Data.add(showVoMap.get(114));
+        right2Data.add(showVoMap.get(116));
+        right2Data.add(showVoMap.get(118));
         right2.put("data",right2Data);
         right.add(right2);
 
         Map<String,Object> right3 = new HashMap<>();
-        right3.put("name","西库顶北温度（5车道）");
+        right3.put("name","西库侧温");
         List<ShowVo> right3Data = new ArrayList<>();
-        right3Data.add(showVoMap.get(0));
-        right3Data.add(showVoMap.get(0));
-        right3Data.add(showVoMap.get(0));
-        right3Data.add(showVoMap.get(0));
-        right3Data.add(showVoMap.get(0));
-        right3Data.add(showVoMap.get(0));
-        right3Data.add(showVoMap.get(0));
-        right3Data.add(showVoMap.get(0));
-        right3Data.add(showVoMap.get(0));
-        right3Data.add(showVoMap.get(0));
+        right3Data.add(showVoMap.get(32));
+        right3Data.add(showVoMap.get(34));
+        right3Data.add(showVoMap.get(36));
+        right3Data.add(showVoMap.get(38));
+        right3Data.add(showVoMap.get(40));
+        right3Data.add(showVoMap.get(42));
+        right3Data.add(showVoMap.get(44));
+        right3Data.add(showVoMap.get(46));
+        right3Data.add(showVoMap.get(64));
+        right3Data.add(showVoMap.get(66));
         right3.put("data",right3Data);
         right.add(right3);
 
         Map<String,Object> right4 = new HashMap<>();
-        right4.put("name","西库侧北温度（5车道）");
+        right4.put("name","西库顶温");
         List<ShowVo> right4Data = new ArrayList<>();
-        right4Data.add(showVoMap.get(0));
-        right4Data.add(showVoMap.get(0));
-        right4Data.add(showVoMap.get(0));
-        right4Data.add(showVoMap.get(0));
-        right4Data.add(showVoMap.get(0));
-        right4Data.add(showVoMap.get(0));
-        right4Data.add(showVoMap.get(0));
-        right4Data.add(showVoMap.get(0));
-        right4Data.add(showVoMap.get(0));
-        right4Data.add(showVoMap.get(0));
+        right4Data.add(showVoMap.get(68));
+        right4Data.add(showVoMap.get(70));
+        right4Data.add(showVoMap.get(72));
+        right4Data.add(showVoMap.get(74));
+        right4Data.add(showVoMap.get(76));
+        right4Data.add(showVoMap.get(78));
+        right4Data.add(showVoMap.get(96));
+        right4Data.add(showVoMap.get(98));
+        right4Data.add(showVoMap.get(100));
+        right4Data.add(showVoMap.get(102));
         right4.put("data",right4Data);
         right.add(right4);
         allMap.put("right",right);

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

@@ -1,5 +1,6 @@
 [
 	{
+		"name": "煤气阀1",
 		"offset": 0,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -9,6 +10,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "煤气阀2",
 		"offset": 2,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -18,6 +20,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "煤气阀3",
 		"offset": 4,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -27,6 +30,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "煤气阀4",
 		"offset": 6,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -36,6 +40,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "煤气阀5",
 		"offset": 8,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -45,6 +50,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "煤气阀6",
 		"offset": 10,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -54,6 +60,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "煤气阀7",
 		"offset": 12,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -63,6 +70,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "煤气阀8",
 		"offset": 14,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -72,6 +80,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "1#循环",
 		"offset": 16,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -81,6 +90,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "1#炉膛",
 		"offset": 18,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -90,6 +100,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "2#循环",
 		"offset": 20,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -99,6 +110,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "2#炉膛",
 		"offset": 22,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -108,6 +120,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "3#循环",
 		"offset": 24,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -117,6 +130,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "3#炉膛",
 		"offset": 26,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -126,6 +140,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "4#循环",
 		"offset": 28,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -135,6 +150,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "4#炉膛",
 		"offset": 30,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -144,6 +160,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "1#温度",
 		"offset": 32,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -153,6 +170,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "2#温度",
 		"offset": 34,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -162,6 +180,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "3#温度",
 		"offset": 36,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -171,6 +190,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "4#温度",
 		"offset": 38,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -180,6 +200,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "5#温度",
 		"offset": 40,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -189,6 +210,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "6#温度",
 		"offset": 42,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -198,6 +220,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "7#温度",
 		"offset": 44,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -207,6 +230,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "8#温度",
 		"offset": 46,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -216,6 +240,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "1#温度",
 		"offset": 48,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -225,6 +250,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "2#温度",
 		"offset": 50,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -234,6 +260,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "3#温度",
 		"offset": 52,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -243,6 +270,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "4#温度",
 		"offset": 54,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -252,6 +280,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "5#温度",
 		"offset": 56,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -261,6 +290,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "6#温度",
 		"offset": 58,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -270,6 +300,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "7#温度",
 		"offset": 60,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -279,6 +310,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "8#温度",
 		"offset": 62,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -288,6 +320,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "9#温度",
 		"offset": 64,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -297,6 +330,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "10#温度",
 		"offset": 66,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -306,6 +340,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "1#温度",
 		"offset": 68,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -315,6 +350,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "2#温度",
 		"offset": 70,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -324,6 +360,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "3#温度",
 		"offset": 72,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -333,6 +370,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "4#温度",
 		"offset": 74,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -342,6 +380,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "5#温度",
 		"offset": 76,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -351,6 +390,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "6#温度",
 		"offset": 78,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -360,6 +400,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "9#温度",
 		"offset": 80,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -369,6 +410,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "10#温度",
 		"offset": 82,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -378,6 +420,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "1#温度",
 		"offset": 84,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -387,6 +430,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "2#温度",
 		"offset": 86,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -396,6 +440,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "3#温度",
 		"offset": 88,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -405,6 +450,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "4#温度",
 		"offset": 90,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -414,6 +460,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "5#温度",
 		"offset": 92,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -423,6 +470,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "6#温度",
 		"offset": 94,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -432,42 +480,47 @@
 		"dataType": "int"
 	},
 	{
+		"name": "7#温度",
 		"offset": 96,
 		"slaveId": 1,
 		"functionCode": 4,
 		"tag": "ESA_33",
-		"desc": "东库上面7#温度",
+		"desc": "西库上面7#温度",
 		"unit": "℃",
 		"dataType": "int"
 	},
 	{
+		"name": "8#温度",
 		"offset": 98,
 		"slaveId": 1,
 		"functionCode": 4,
 		"tag": "ESA_34",
-		"desc": "东库上面8#温度",
+		"desc": "西库上面8#温度",
 		"unit": "℃",
 		"dataType": "int"
 	},
 	{
+		"name": "9#温度",
 		"offset": 100,
 		"slaveId": 1,
 		"functionCode": 4,
 		"tag": "ESA_35",
-		"desc": "东库上面9#温度",
+		"desc": "西库上面9#温度",
 		"unit": "℃",
 		"dataType": "int"
 	},
 	{
+		"name": "10#温度",
 		"offset": 102,
 		"slaveId": 1,
 		"functionCode": 4,
 		"tag": "ESA_36",
-		"desc": "东库上面10#温度",
+		"desc": "西库上面10#温度",
 		"unit": "℃",
 		"dataType": "int"
 	},
 	{
+		"name": "西侧温度",
 		"offset": 104,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -477,6 +530,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "东侧温度",
 		"offset": 106,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -486,6 +540,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "西侧温度",
 		"offset": 108,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -495,6 +550,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "东侧温度",
 		"offset": 110,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -504,6 +560,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "7#温度",
 		"offset": 112,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -513,6 +570,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "8#温度",
 		"offset": 114,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -522,6 +580,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "9#温度",
 		"offset": 116,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -531,6 +590,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "10#温度",
 		"offset": 118,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -540,6 +600,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "风机入口压力",
 		"offset": 120,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -549,6 +610,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "风机出口压力",
 		"offset": 122,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -558,6 +620,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "风机入口压力",
 		"offset": 124,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -567,6 +630,7 @@
 		"dataType": "int"
 	},
 	{
+		"name": "风机出口压力",
 		"offset": 126,
 		"slaveId": 1,
 		"functionCode": 4,

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

@@ -215,7 +215,7 @@
 		"slaveId": 1,
 		"functionCode": 4,
 		"tag": "BM2_11",
-		"desc": "东库侧北2温度",
+		"desc": "东库顶北2温度",
 		"unit": "℃",
 		"dataType": "int"
 	},