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

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/protection/service/impl/IotAlarmHostServiceImpl.java

@@ -400,7 +400,7 @@ public class IotAlarmHostServiceImpl implements IIotAlarmHostService, RouterServ
             LogUtils.STATUS_INFO_STATUS_SENSOR.error("接收报警主机传感器状态事件：未查询到报警主机传感器信息，token:{},alarmHostId:{},zoneId：{},inputIndex：{}",token,deviceName,subsystemId,index);
             return;
         }
-        String sensorType = input.getSensorType();
+        String sensorType = "AlarmHostInput_" + input.getSensorType();
         Long vipDeviceCode = input.getId();
 
         QueryWrapper<IotAlarmSystemField> fieldWrapper = new QueryWrapper<>();
@@ -470,7 +470,7 @@ public class IotAlarmHostServiceImpl implements IIotAlarmHostService, RouterServ
         String infos = status.getInfo();
         Map<String, String> dataMap = dealInfos(infos);
 
-        String sensorValue = dataMap.get(field.getProductProperty());
+        String sensorValue = dataMap.get(field.getProductPropertyDisplayName());
         if (StringUtils.isBlank(sensorValue)) {
             return ;
         }
@@ -631,6 +631,7 @@ public class IotAlarmHostServiceImpl implements IIotAlarmHostService, RouterServ
                     .eq(IotAlarmDefenceArea::getAlarmHostCode, deviceCode)
                     .eq(IotAlarmDefenceArea::getModuleAddress, moduleAddress)
                     .eq(IotAlarmDefenceArea::getDefenceAreaIndex, index)
+                    .eq(IotAlarmDefenceArea::getDeleted,0)
                     .last("limit 1");
             IotAlarmDefenceArea one = iotAlarmDefenceAreaMapper.selectOne(qw);
             if (one != null) {