joylink/xian-ncc-da-server
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

告警列表，确认调整

Browse Source
This commit is contained in:
tiger_zhou 2023-09-14 17:43:55 +08:00
parent 0f3c9b1d00
commit 96c437fb5e
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/xiannccda/alert/NccAlertInfo.java
View File

@ -16,6 +16,7 @@ public class NccAlertInfo implements AlertInfo {
private Integer id;
private String level;
private LocalDateTime alertTime;
@Setter
private AlertType alertType;
private Integer alertTipId;
private Integer lineId;
@ -30,6 +31,7 @@ public class NccAlertInfo implements AlertInfo {
@Setter
private Integer alarmStatus;
private AlertDeviceType alertDeviceType;
// private AlertType confirmAlertType;
public NccAlertInfo(LocalDateTime alertTime, AlertType alertType,
Integer lineId, String alertObject, String locatorDeviceId,

2
src/main/java/club/joylink/xiannccda/entity/AlertRecord.java
View File

@ -44,6 +44,7 @@ public class AlertRecord {
private String alertDeviceType;
private String alertDeviceId;
private Boolean mock;
// private String confirmAlertType;
public static final String ID = "id";
public static final String ALERT_TYPE = "alert_type";
@ -62,4 +63,5 @@ public class AlertRecord {
public static final String ALERT_DEVICE_TYPE = "alert_device_type";
public static final String ALERT_DEVICE_ID = "alert_device_id";
public static final String MOCK = "mock";
// public static final String CONFIRM_ALERT_TYPE = "confirm_alert_type";
}

4
src/main/java/club/joylink/xiannccda/service/AlertRecordService.java
View File

@ -84,6 +84,7 @@ public class AlertRecordService {
this.alertRecordRepository.update(Wrappers.lambdaUpdate(AlertRecord.class)
.set(AlertRecord::getAlertTipId, tip.getId()).set(AlertRecord::getAlarmStatus, 1)
.set(hasAreaConfigId, AlertRecord::getAlertLocationId, newAreaConfigId)
.set(AlertRecord::getAlertType, tipType)
.eq(AlertRecord::getId, recordId).isNull(AlertRecord::getAlarmStatus));
return tip;
}
@ -107,6 +108,9 @@ public class AlertRecordService {
record.getAlertObject(), "", record.getAlertLocationId(), deviceType);
nccAlertInfo.setId(record.getId());
nccAlertInfo.setAlarmStatus(record.getAlarmStatus());
// if (StringUtils.isNotEmpty(record.getConfirmAlertType())) {
// nccAlertInfo.setAlertType(AlertType.valueOf(record.getConfirmAlertType()));
// }
alertInfos.add(nccAlertInfo);
}