|
@@ -138,12 +138,17 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
|
|
|
queryWrapper.eq(Device::getDeviceCode,alarmPower.getDeviceCode());
|
|
|
Device device = deviceService.getOne(queryWrapper);
|
|
|
Site site = siteService.getById(device.getSiteId());
|
|
|
- PlatformArea platformArea = platformAreaService.getById(site.getStationAreaId());
|
|
|
+ if (null!=site.getStationAreaId()&&0!=site.getStationAreaId()){
|
|
|
+ PlatformArea platformArea = platformAreaService.getById(site.getStationAreaId());
|
|
|
+ alarmVO.setStationArea(platformArea.getPlatformAreaName());
|
|
|
+ }else {
|
|
|
+ alarmVO.setStationArea("");
|
|
|
+ }
|
|
|
Route route = routeService.getById(site.getRouteId());
|
|
|
alarmVO.setSiteName(site.getSiteName());
|
|
|
alarmVO.setSiteAddress(site.getSiteAddress());
|
|
|
alarmVO.setSparUserName(site.getSpareUserName());
|
|
|
- alarmVO.setStationArea(platformArea.getPlatformAreaName());
|
|
|
+
|
|
|
alarmVO.setRoute(route.getRouteName());
|
|
|
return alarmVO;
|
|
|
}
|