Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

@@ -161,11 +161,11 @@ public class JpStationController extends BaseController {
             if(list!=null&&list.isEmpty()){
                 for (Map<String, Object> map : list) {
                     if("在线".equals(map.get("state").toString())){
-                        collector.put("zx",map.get("num"));
+                        collector.put("zx",Integer.valueOf(map.get("num").toString()));
                     }else if("离线".equals(map.get("state").toString())){
-                        collector.put("lx",map.get("num"));
+                        collector.put("lx",Integer.valueOf(map.get("num").toString()));
                     }else if("报警".equals(map.get("state").toString())){
-                        collector.put("bj",map.get("num"));
+                        collector.put("bj",Integer.valueOf(map.get("num").toString()));
                     }
                 }
             }
@@ -200,22 +200,22 @@ public class JpStationController extends BaseController {
         if(!listCollector.isEmpty()){
             for (Map<String, Object> map : listCollector) {
                 if("在线".equals(map.get("state").toString())){
-                    collector.put("zx",map.get("num"));
+                    collector.put("zx",Integer.valueOf(map.get("num").toString()));
                 }else if("离线".equals(map.get("state").toString())){
-                    collector.put("lx",map.get("num"));
+                    collector.put("lx",Integer.valueOf(map.get("num").toString()));
                 }else if("报警".equals(map.get("state").toString())){
-                    collector.put("gj",map.get("num"));
+                    collector.put("gj",Integer.valueOf(map.get("num").toString()));
                 }
             }
         }
         if(!listInverter.isEmpty()){
             for (Map<String, Object> map : listInverter) {
                 if("在线".equals(map.get("state").toString())){
-                    inverter.put("zx",map.get("num"));
+                    inverter.put("zx",Integer.valueOf(map.get("num").toString()));
                 }else if("离线".equals(map.get("state").toString())){
-                    inverter.put("lx",map.get("num"));
+                    inverter.put("lx",Integer.valueOf(map.get("num").toString()));
                 }else if("报警".equals(map.get("state").toString())){
-                    inverter.put("gj",map.get("num"));
+                    inverter.put("gj",Integer.valueOf(map.get("num").toString()));
                 }
             }
         }