Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java

@@ -161,6 +161,9 @@ public class BehaviorAlarm implements IAlarm {
             platElderList = platAlarmCheckDTO.getPlatElderList();
         }
         for (PlatElder platElder : platElderList) {
+            if(StringUtils.isBlank(platElder.getRegionName())){
+                continue;
+            }
             PlatDayDurationRecord durationRecord = new PlatDayDurationRecord();
             durationRecord.setElderIds(platElder.getId());
             durationRecord.setRegionName(platElder.getRegionName());