告警记录增加字段-区域名称

server-service/src/main/java/com/makeit/entity/platform/alarm/PlatAlarmRecord.java

@@ -83,6 +83,9 @@ public class PlatAlarmRecord extends BaseBusEntity {
     //异常值
     //异常值
     private String abnormalValue;
     private String abnormalValue;
 
 
+    @ApiModelProperty("区域名称")
+    private String regionName;
+
 
 
 }
 }
 
 

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

@@ -322,6 +322,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
         PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
         PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
         List<String> param = platAlarmCheckDTO.getParam();
         List<String> param = platAlarmCheckDTO.getParam();
         List<PlatElder> elderList = platAlarmCheckDTO.getPlatElderList();
         List<PlatElder> elderList = platAlarmCheckDTO.getPlatElderList();
+        PlatRegionSetting platRegionSetting = platAlarmCheckDTO.getPlatRegionSetting();
 
 
         PlatAlarmRecord platAlarmRecord = new PlatAlarmRecord();
         PlatAlarmRecord platAlarmRecord = new PlatAlarmRecord();
         platAlarmRecord.setAlarmId(config.getId());
         platAlarmRecord.setAlarmId(config.getId());
@@ -339,6 +340,9 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
         platAlarmRecord.setTenantId(config.getTenantId());
         platAlarmRecord.setTenantId(config.getTenantId());
         platAlarmRecord.setRemark(platAlarmCheckDTO.getRemark());
         platAlarmRecord.setRemark(platAlarmCheckDTO.getRemark());
         platAlarmRecord.setAbnormalValue(platAlarmCheckDTO.getAbnormalValue());
         platAlarmRecord.setAbnormalValue(platAlarmCheckDTO.getAbnormalValue());
+        if(platRegionSetting!=null) {
+            platAlarmRecord.setRegionName(platRegionSetting.getRegionName());
+        }
         return platAlarmRecord;
         return platAlarmRecord;
     }
     }