فهرست منبع

Merge remote-tracking branch 'origin/V0.1.1' into V0.1.1

jingyuanchao 1 سال پیش
والد
کامیت
7f2deabe8a

+ 2 - 2
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/protection/service/impl/IotAlarmHostServiceImpl.java

@@ -98,9 +98,9 @@ public class IotAlarmHostServiceImpl implements IIotAlarmHostService, RouterServ
                     Integer dbStatus = subsystem.getStatus();
                     //Arm:布防 DisArm:撤防 Unknown:未知
                     //0:撤防,1:布防,2:未知
-                    if ("Arm".equals(status)) {
+                    if ("arm".equals(status)) {
                         subsystem.setStatus(ProtectionStatus.PROTECTION.ordinal());
-                    } else if ("DisArm".equals(status)) {
+                    } else if ("disArm".equals(status)) {
                         subsystem.setStatus(ProtectionStatus.REMOVAL.ordinal());
                     } else {
                         subsystem.setStatus(ProtectionStatus.UNKNOWN.ordinal());

+ 1 - 1
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/websocket/constant/WebSocketConstants.java

@@ -145,7 +145,7 @@ public interface WebSocketConstants {
     /**
      * 子系统布撤防状态事件
      */
-    String SUB_SYSTEM_STATUS = "SubsystemStatus";
+    String SUB_SYSTEM_STATUS = "subsystemStatus";
 
     /**
      * 报警主机报警防区(传感器)改变状态