Bladeren bron

告警详情查询修改1

jichaobo 3 jaren geleden
bovenliggende
commit
e9684e2263

+ 7 - 2
fiveep-service/src/main/java/com/bizmatics/service/impl/AlarmPowerServiceImpl.java

@@ -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;
     }