动环设备状态上报 bug修改

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/iot/BaseDeviceTypeEnum.java

@@ -34,6 +34,7 @@ public enum BaseDeviceTypeEnum {
     subsystem("19", "报警控制器"),
     sensor("20", "报警防区"),
     FSU_DoPowerCollection("21", "FSU回路通电状态"),
+    FSU_DoPowerControlBoxButton("22", "DO8小时控电箱按钮"),
 
     ;
     private String code;

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/websocket/handler/SocWebSocketHandler.java

@@ -155,7 +155,6 @@ public class SocWebSocketHandler extends AbstractWebSocketHandler {
             LogUtils.WEBSOCKET_MSG.error("会话消息不存在,ip:{}", WebSocketUtils.getIp(session));
             return;
         }
-        //String token ="9e08595b-868e-4eac-ab44-45bdeec51185";
         String payload = message.getPayload();
         final String ip = WebSocketUtils.getIp(session);
         LogUtils.WEBSOCKET_MSG.info("ip:{},接收到消息：{}", ip, message.getPayload());

soc-modules/soc-modules-host/src/main/resources/mapper/IotAlarmDefenceAreaMapper.xml

@@ -5,7 +5,7 @@
     <select id="getBySubSystemCodeAndDeviceName"
             resultType="com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceArea">
         SELECT
-            *
+            a.*
         FROM
             iot_alarm_defence_area a
                 LEFT JOIN iot_device_info d ON a.alarm_host_code = d.device_code
@@ -13,6 +13,7 @@
         WHERE
             d.device_code = #{deviceName}
           AND d.iot_token = #{token}
+          AND a.iot_token = #{token}
           AND a.defence_area_index = #{inputIndex}
           AND a.sub_system_code = #{subSystemId}