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

server-common/src/main/java/com/makeit/module/admin/dto/plat/PlatRoleDTOVO.java

@@ -44,4 +44,7 @@ public class PlatRoleDTOVO extends BaseOrgDTO implements Serializable {
 
 
     private String status;
     private String status;
 
 
+    @ApiModelProperty(value = "org_id列表 以逗号分隔 权限")
+    private String dataScope;
+
 }
 }

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

@@ -72,7 +72,8 @@ public class BreathAlarm implements IAlarm {
         //计数
         //计数
         AlarmRedisDTO alarmRedisDTO = RedisUtil.get(RedisConst.ALARM_DEVICE_BR_ID + deviceId);
         AlarmRedisDTO alarmRedisDTO = RedisUtil.get(RedisConst.ALARM_DEVICE_BR_ID + deviceId);
 
 
-        if (StringUtils.equals(personState, CommonEnum.NO.getValue())) {
+        //运动状态 0-无人 3-进入呼吸 跳过
+        if (StringUtils.equalsAny(personState, CommonEnum.NO.getValue(),"3")) {
             RedisUtil.delete(RedisConst.ALARM_DEVICE_BR_ID + deviceId);
             RedisUtil.delete(RedisConst.ALARM_DEVICE_BR_ID + deviceId);
             return;
             return;
         }
         }

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -147,8 +147,13 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
     @Override
     @Override
     public PlatAlarmRecordVO view(String recordId) {
     public PlatAlarmRecordVO view(String recordId) {
         PlatAlarmRecord platAlarmRecord = getById(recordId);
         PlatAlarmRecord platAlarmRecord = getById(recordId);
+        if(platAlarmRecord == null ){
+            return null;
+        }
         PlatAlarmRecordVO vo = BeanDtoVoUtils.convert(platAlarmRecord, PlatAlarmRecordVO.class);
         PlatAlarmRecordVO vo = BeanDtoVoUtils.convert(platAlarmRecord, PlatAlarmRecordVO.class);
-        JoinUtil.join(Arrays.asList(vo), platAlarmConfigService, PlatAlarmRecordVO::getAlarmId, BaseEntity::getId, (t, m) -> t.setNotifyRelation(m.getNotifyRelation()));
+        if(StringUtils.isNotBlank(vo.getAlarmId())) {
+            JoinUtil.join(Arrays.asList(vo), platAlarmConfigService, PlatAlarmRecordVO::getAlarmId, BaseEntity::getId, (t, m) -> t.setNotifyRelation(m.getNotifyRelation()));
+        }
         return vo;
         return vo;
     }
     }
 
 

server-service/src/main/java/com/makeit/vo/platform/device/PlatDeviceListVO.java

@@ -73,7 +73,11 @@ public class PlatDeviceListVO extends BaseTenantDTO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createDate;
     private LocalDateTime createDate;
 
 
+    @ApiModelProperty(value = "有效时间-起", required = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startDate;
     private LocalDateTime startDate;
+    @ApiModelProperty(value = "有效时间-止", required = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endDate;
     private LocalDateTime endDate;
 
 
 
 

server-web/src/main/java/com/makeit/mqtt/PushCallback.java

@@ -64,7 +64,7 @@ public class PushCallback implements MqttCallback {
         DeviceInfo device = JSON.parseObject(payload, DeviceInfo.class);
         DeviceInfo device = JSON.parseObject(payload, DeviceInfo.class);
         // todo
         // todo
 
 
-        checkAlarm(device);
+        //checkAlarm(device);
     }
     }
 
 
     @Override
     @Override