|
@@ -130,16 +130,15 @@ public class AlarmTypeDetailsServiceImpl implements AlarmTypeDetailsService {
|
|
* @return java.util.List<AlarmDetailsEntity>
|
|
* @return java.util.List<AlarmDetailsEntity>
|
|
**/
|
|
**/
|
|
private List<AlarmDetailsEntity> convert(AlarmDetailsAddDto dto){
|
|
private List<AlarmDetailsEntity> convert(AlarmDetailsAddDto dto){
|
|
- List<AlarmDetailsEntity> result;
|
|
|
|
|
|
+ BigDecimal value;
|
|
|
|
+ String deviceName;
|
|
|
|
+ String attrName = null;
|
|
AlarmType alarmType = alarmTypeService.findByIotAlarmId(dto.getAlarmTypeId());
|
|
AlarmType alarmType = alarmTypeService.findByIotAlarmId(dto.getAlarmTypeId());
|
|
if (alarmType == null) {
|
|
if (alarmType == null) {
|
|
log.error("【接收告警信息失败】:告警信息为空 ,请求参数:{}", dto.toString());
|
|
log.error("【接收告警信息失败】:告警信息为空 ,请求参数:{}", dto.toString());
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
- result = new ArrayList<>();
|
|
|
|
- BigDecimal value;
|
|
|
|
- String attrName = null;
|
|
|
|
- String deviceName = null;
|
|
|
|
|
|
+ List<AlarmDetailsEntity> result = new ArrayList<>();
|
|
// 离线告警
|
|
// 离线告警
|
|
if (alarmType.getAlarmCategory() == 2 || alarmType.getAttributeId() == null) {
|
|
if (alarmType.getAlarmCategory() == 2 || alarmType.getAttributeId() == null) {
|
|
value = new BigDecimal("0");
|
|
value = new BigDecimal("0");
|