烟感上传报警数据加上报警恢复状态
This commit is contained in:
parent
115cdd4fe7
commit
d07b105f0f
@ -56,10 +56,10 @@ public class SmokeDevAlarmServiceImpl extends ServiceImpl<SmokeDevAlarmMapper, S
|
|||||||
//心跳
|
//心跳
|
||||||
smokeDev.setUploadDate(date);
|
smokeDev.setUploadDate(date);
|
||||||
smokeDevMapper.updateById(smokeDev);
|
smokeDevMapper.updateById(smokeDev);
|
||||||
} else if (Objects.equals(dto.getAlarm(), 1)) {
|
} else if (Objects.equals(dto.getAlarm(), 1) || Objects.equals(dto.getAlarm(), 0)) {
|
||||||
SmokeDevAlarm smokeDevAlarm = new SmokeDevAlarm();
|
SmokeDevAlarm smokeDevAlarm = new SmokeDevAlarm();
|
||||||
smokeDevAlarm.setDevSn(deviceid);
|
smokeDevAlarm.setDevSn(deviceid);
|
||||||
smokeDevAlarm.setAlarmTime(new Date(Long.valueOf(dto.getTime())));
|
smokeDevAlarm.setAlarmTime(new Date(Long.parseLong(dto.getTime())));
|
||||||
smokeDevAlarm.setDeviceStatus(dto.getAlarm());
|
smokeDevAlarm.setDeviceStatus(dto.getAlarm());
|
||||||
smokeDevAlarm.setProjectSn(smokeDev.getProjectSn());
|
smokeDevAlarm.setProjectSn(smokeDev.getProjectSn());
|
||||||
smokeDevAlarm.setAlarmDetailStatus(dto.getState());
|
smokeDevAlarm.setAlarmDetailStatus(dto.getState());
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user