修改状态名称

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpCollectorMapper.xml

@@ -29,7 +29,7 @@
                 and hygf_jp_station.third_station_id =#{dto.thirdStationId}
             </if>
 
-            and hygf_jp_collector.`state` is not null and hygf_jp_collector.`state` in ("在线","告警","离线")
+            and hygf_jp_collector.`state` is not null and hygf_jp_collector.`state` in ("在线","报警","离线")
         </where>
 
 

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

@@ -203,7 +203,7 @@ public class JpStationController extends BaseController {
                     collector.put("zx",map.get("num"));
                 }else if("离线".equals(map.get("state").toString())){
                     collector.put("lx",map.get("num"));
-                }else if("告警".equals(map.get("state").toString())){
+                }else if("报警".equals(map.get("state").toString())){
                     collector.put("gj",map.get("num"));
                 }
             }
@@ -214,7 +214,7 @@ public class JpStationController extends BaseController {
                     inverter.put("zx",map.get("num"));
                 }else if("离线".equals(map.get("state").toString())){
                     inverter.put("lx",map.get("num"));
-                }else if("告警".equals(map.get("state").toString())){
+                }else if("报警".equals(map.get("state").toString())){
                     inverter.put("gj",map.get("num"));
                 }
             }