|
@@ -433,16 +433,16 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
wrapper1.orderByDesc( MsgAlarm::getAlarmTime);
|
|
|
}
|
|
|
List<MsgAlarm> list1 = msgAlarmService.list(wrapper1);
|
|
|
- MsgAlarm msgAlarm = list1.get(0);
|
|
|
List<Object> list = new ArrayList<>();
|
|
|
list.add(baseRailwayManagement.getRailwayName());
|
|
|
list.add(AppendUtils.stringAppend(baseCameraManagement.getInstallMile()));
|
|
|
list.add(baseCameraManagement.getLineDir());
|
|
|
list.add(baseCameraManagement.getCameraCode());
|
|
|
list.add(baseDeviceDynamicManagement.getElectricity());
|
|
|
- if (ObjectUtils.isEmpty(msgAlarm)) {
|
|
|
+ if (list1.size()<=0) {
|
|
|
list.add(1);
|
|
|
} else {
|
|
|
+ MsgAlarm msgAlarm = list1.get(0);
|
|
|
list.add(msgAlarm.getIsLock());
|
|
|
}
|
|
|
return AjaxResult.success(list);
|