Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit e82a45df by 朱淼
Options

fix bug

parent eb988098
Inline Side-by-side
Showing with 3 additions and 0 deletions
server-service/src/main/java/com/makeit/service/platform/dataScreen/impl/DataScreenServiceImpl.java
...@@ -483,6 +483,7 @@ public class DataScreenServiceImpl implements DataScreenService { ...@@ -483,6 +483,7 @@ public class DataScreenServiceImpl implements DataScreenService {
listVo.setType(record.getAlarmType()); listVo.setType(record.getAlarmType());
listVo.setAlarmDate(record.getAlarmDate().format(df)); listVo.setAlarmDate(record.getAlarmDate().format(df));
listVo.setAlarmTime(record.getAlarmDate().format(dft)); listVo.setAlarmTime(record.getAlarmDate().format(dft));
listVo.setAlarmRecordId(record.getId());
list.add(listVo); list.add(listVo);
} }
......
server-service/src/main/java/com/makeit/vo/platform/dataScreen/PlatAlarmStatisticsListVo.java
...@@ -28,4 +28,6 @@ public class PlatAlarmStatisticsListVo { ...@@ -28,4 +28,6 @@ public class PlatAlarmStatisticsListVo {
private String alarmTime; private String alarmTime;
@ApiModelProperty(value = "路径") @ApiModelProperty(value = "路径")
private String path; private String path;
@ApiModelProperty(value = "告警id")
private String alarmRecordId;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment