fix:786水泵房

src/main/java/com/jwkj/qsydw/controller/Sbf786.java

@@ -40,35 +40,77 @@ public class Sbf786 {
 //        List<ReadResults> readResultsList = testData.getListData();
         List<Npvo<String>> list = new ArrayList<>();
         list.add(new Npvo<>("1#管路流量",readResultsList.get(0).getV()+"m³/h"));
-        list.add(new Npvo<>("2#管路流量",readResultsList.get(1).getV()+"m³/h"));
-        list.add(new Npvo<>("3#管路流量",readResultsList.get(2).getV()+"m³/h"));
-        list.add(new Npvo<>("1#水位",readResultsList.get(3).getV()+"m"));
-        list.add(new Npvo<>("2#水位",readResultsList.get(4).getV()+"m"));
+        list.add(new Npvo<>("1#泵电压",readResultsList.get(1).getV()+"V"));
+        list.add(new Npvo<>("1#泵功率",readResultsList.get(2).getV()+"KW"));
+        list.add(new Npvo<>("2#管路流量",readResultsList.get(3).getV()+"m³/h"));
+        list.add(new Npvo<>("2#泵电压",readResultsList.get(4).getV()+"V"));
+        list.add(new Npvo<>("2#泵功率",readResultsList.get(5).getV()+"KW"));
+        list.add(new Npvo<>("3#管路流量",readResultsList.get(6).getV()+"m³/h"));
+        list.add(new Npvo<>("3#泵电压",readResultsList.get(7).getV()+"V"));
+        list.add(new Npvo<>("3#泵功率",readResultsList.get(8).getV()+"KW"));
+        list.add(new Npvo<>("1#水位",readResultsList.get(9).getV()+"m"));
+        list.add(new Npvo<>("2#水位",readResultsList.get(10).getV()+"m"));
+
         List<Npvo<List<Npvo<List<String>>>>> itemList = new ArrayList<>();
         List<Npvo<List<String>>> paramsList = new ArrayList<>();
         List<String> var3 = new ArrayList<>();
-        var3.add(readResultsList.get(5).getV()+"Mpa");
+        var3.add(readResultsList.get(11).getV()+"Mpa");
         paramsList.add(new Npvo<>("负压",var3));
         List<String> var3_1 = new ArrayList<>();
-        var3_1.add(readResultsList.get(6).getV()+"Mpa");
+        var3_1.add(readResultsList.get(12).getV()+"Mpa");
         paramsList.add(new Npvo<>("正压",var3_1));
+        List<String> var3_2 = new ArrayList<>();
+        var3_2.add(readResultsList.get(13).getV()+"A");
+        paramsList.add(new Npvo<>("电流", var3_2));
         itemList.add(new Npvo<>("一号泵控制",paramsList));
         List<Npvo<List<String>>> paramsList2 = new ArrayList<>();
         List<String> var4_1 = new ArrayList<>();
-        var4_1.add(readResultsList.get(7).getV()+"Mpa");
+        var4_1.add(readResultsList.get(14).getV()+"Mpa");
         paramsList2.add(new Npvo<>("负压",var4_1));
         List<String> var4_2 = new ArrayList<>();
-        var4_2.add(readResultsList.get(8).getV()+"Mpa");
+        var4_2.add(readResultsList.get(15).getV()+"Mpa");
         paramsList2.add(new Npvo<>("正压",var4_2));
+        List<String> var4_3 = new ArrayList<>();
+        var4_3.add(readResultsList.get(16).getV()+"A");
+        paramsList2.add(new Npvo<>("电流", var4_3));
         itemList.add(new Npvo<>("二号泵控制",paramsList2));
         List<Npvo<List<String>>> paramsList3 = new ArrayList<>();
         List<String> var5_1 = new ArrayList<>();
-        var5_1.add(readResultsList.get(9).getV()+"Mpa");
+        var5_1.add(readResultsList.get(17).getV()+"Mpa");
         paramsList3.add(new Npvo<>("负压",var5_1));
         List<String> var5_2 = new ArrayList<>();
-        var5_2.add(readResultsList.get(10).getV()+"Mpa");
+        var5_2.add(readResultsList.get(18).getV()+"Mpa");
         paramsList3.add(new Npvo<>("正压",var5_2));
+        List<String> var5_3 = new ArrayList<>();
+        var5_3.add(readResultsList.get(19).getV()+"A");
+        paramsList3.add(new Npvo<>("电流", var5_3));
         itemList.add(new Npvo<>("三号泵控制",paramsList3));
+
+        List<Npvo<List<String>>> paramsList4 = new ArrayList<>();
+        List<String> var6_1 = new ArrayList<>();
+        var6_1.add(readResultsList.get(20).getV()+"Mpa");
+        paramsList4.add(new Npvo<>("负压", var6_1));
+        List<String> var6_2 = new ArrayList<>();
+        var6_2.add(readResultsList.get(21).getV()+"Mpa");
+        paramsList4.add(new Npvo<>("正压", var6_2));
+        List<String> var6_3 = new ArrayList<>();
+        var6_3.add(readResultsList.get(22).getV()+"A");
+        paramsList4.add(new Npvo<>("电流", var6_3));
+        itemList.add(new Npvo<>("中央5#号泵控制", paramsList4));
+
+        List<Npvo<List<String>>> paramsList5 = new ArrayList<>();
+        List<String> var7_1 = new ArrayList<>();
+        var7_1.add(readResultsList.get(23).getV()+"Mpa");
+        paramsList5.add(new Npvo<>("负压", var7_1));
+        List<String> var7_2 = new ArrayList<>();
+        var7_2.add(readResultsList.get(24).getV()+"Mpa");
+        paramsList5.add(new Npvo<>("正压", var7_2));
+        List<String> var7_3 = new ArrayList<>();
+        var7_3.add(readResultsList.get(25).getV()+"A");
+        paramsList5.add(new Npvo<>("电流", var7_3));
+        itemList.add(new Npvo<>("中央6#号泵控制", paramsList5));
+
+
         JSONObject result = new JSONObject();
         result.put("list",list);
         result.put("itemList",itemList);

src/main/java/com/jwkj/qsydw/vo/PointPosition.java

@@ -11,17 +11,32 @@ public class PointPosition {
     public String getPointPosition(String param) {
 
         String qsy786sbf = "[" +
-                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_627\"," + // 1#管路流量
-                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_628\"," + // 2#管路流量
-                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_629\"," + // 3#管路流量
-                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_633\"," + // 1#水位
-                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_557\"," + // 2#水位
-                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_491\"," + // 1#正压
-                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_492\"," + // 1#负压
-                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_504\"," + // 2#正压
-                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_505\"," + // 2#负压
-                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_517\"," + // 3#正压
-                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_518\"" +// 3#负压
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_627\"," +  // 1#管路流量
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_568\"," +  //	中央1#泵电压
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_569\"," +  //	中央1#泵功率
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_628\"," +  // 2#管路流量
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_578\"," +  //	中央2#泵电压
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_582\"," +  //	中央2#泵功率
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_629\"," +  // 3#管路流量
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_579\"," +  //	中央3#泵电压
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_583\"," +  //	中央3#泵功率
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_633\"," +  // 1#水位
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_557\"," +  // 2#水位
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_491\"," +  // 1#正压
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_492\"," +  // 1#负压
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_567\"," +  //	中央1#泵电流
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_504\"," +  // 2#正压
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_505\"," +  // 2#负压
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_574\"," +  //	中央2#泵电流
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_517\"," +  // 3#正压
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_518\"," +  // 3#负压
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_575\"," +  //	中央3#泵电流
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_533\"," +  //	中央5#泵正压
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_534\"," +  //	中央5#泵负压
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_576\"," +  //	中央5#泵电流
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_546\"," +  //	中央6#泵正压
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_547\"," +  //	中央6#泵负压
+                "\"自动化平台.设备 1.IoServer.100_100_100_111.主排水泵房786.A_01_577\"" +  //	中央6#泵电流
                 "]";
         String qsy06jxpd = "[" +
                 "\"自动化平台.设备 1.IoServer.100_100_104_220.主运输06机巷.C06机巷_JH1胶带机启动\"," +  // JH1胶带机启动