适配页面重排版-北煤3

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

@@ -576,7 +576,6 @@ public class GetStructure {
 
         List<ShowVo> left2 = new ArrayList<>();
         left2.add(showVoMap.get(142));
-        left2.add(showVoMap.get(28));
         left.put("2",left2);
 
         List<ShowVo> left3 = new ArrayList<>();
@@ -594,6 +593,15 @@ public class GetStructure {
         l4Map.put("furnaceAir2",showVoMap.get(22));//炉膛
         l4Map.put("temp2",showVoMap.get(30));
         left.put("4",l4Map);
+
+        List<ShowVo> left5 = new ArrayList<>();
+        left5.add(showVoMap.get(28));
+        left.put("5",left5);
+
+        List<ShowVo> left6 = new ArrayList<>();
+        left6.add(showVoMap.get(24));
+        left6.add(showVoMap.get(26));
+        left.put("6",left6);
         allMap.put("left",left);
 
         //right
@@ -672,8 +680,126 @@ public class GetStructure {
         allMap.put("right",right);
         return allMap;
     }
+
     public static Map<String, Object> ershao(Map<Integer, ShowVo> showVoMap){
-        return null;
+        Map<String, Object> allMap = new HashMap<>();
+
+        //left
+        Map<String,Object> left = new HashMap<>();
+        List<ShowVo> left1 = new ArrayList<>();
+        left1.add(showVoMap.get(0));
+        left1.add(showVoMap.get(2));
+        left1.add(showVoMap.get(4));
+        left1.add(showVoMap.get(6));
+        left.put("1",left1);
+
+        List<ShowVo> left2 = new ArrayList<>();
+        left2.add(showVoMap.get(106));
+        left2.add(showVoMap.get(108));
+        left.put("2",left2);
+
+        List<ShowVo> left3 = new ArrayList<>();
+        left3.add(showVoMap.get(0));
+        left3.add(showVoMap.get(0));
+        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));//炉膛
+        left.put("4",l4Map);
+
+        List<ShowVo> left5 = new ArrayList<>();
+        left5.add(showVoMap.get(104));
+        left5.add(showVoMap.get(110));
+        left.put("5",left5);
+
+        List<ShowVo> left6 = new ArrayList<>();
+        left6.add(showVoMap.get(0));
+        left6.add(showVoMap.get(0));
+        left.put("6",left6);
+
+        List<ShowVo> left7 = new ArrayList<>();
+        left7.add(showVoMap.get(8));
+        left7.add(showVoMap.get(10));
+        left7.add(showVoMap.get(12));
+        left7.add(showVoMap.get(14));
+        left.put("7",left7);
+        allMap.put("left",left);
+
+        //right
+        List<Map> right = new ArrayList<>();
+        Map<String,Object> right1 = new HashMap<>();
+        right1.put("name","东库侧北温度（6车道）");
+        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));
+        right1.put("data",right1Data);
+        right.add(right1);
+
+        Map<String,Object> right2 = new HashMap<>();
+        right2.put("name","东库顶北温度（6车道）");
+        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));
+        right2.put("data",right2Data);
+        right.add(right2);
+
+        Map<String,Object> right3 = new HashMap<>();
+        right3.put("name","西库顶北温度（5车道）");
+        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));
+        right3.put("data",right3Data);
+        right.add(right3);
+
+        Map<String,Object> right4 = new HashMap<>();
+        right4.put("name","西库侧北温度（5车道）");
+        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));
+        right4.put("data",right4Data);
+        right.add(right4);
+        allMap.put("right",right);
+
+        return allMap;
     }
     public static Map<String, Object> sishao(Map<Integer, ShowVo> showVoMap){
         return null;