|
@@ -430,8 +430,10 @@ public class BaseCameraManagementController extends BaseController {
|
|
LambdaQueryWrapper<MsgAlarm> wrapper1 = new LambdaQueryWrapper<MsgAlarm>();
|
|
LambdaQueryWrapper<MsgAlarm> wrapper1 = new LambdaQueryWrapper<MsgAlarm>();
|
|
if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
|
|
if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
|
|
wrapper1.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
|
|
wrapper1.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
|
|
|
|
+ wrapper1.orderByDesc( MsgAlarm::getAlarmTime);
|
|
}
|
|
}
|
|
- MsgAlarm msgAlarm = msgAlarmService.getOne(wrapper1);
|
|
|
|
|
|
+ List<MsgAlarm> list1 = msgAlarmService.list(wrapper1);
|
|
|
|
+ MsgAlarm msgAlarm = list1.get(0);
|
|
List<Object> list = new ArrayList<>();
|
|
List<Object> list = new ArrayList<>();
|
|
list.add(baseRailwayManagement.getRailwayName());
|
|
list.add(baseRailwayManagement.getRailwayName());
|
|
list.add(AppendUtils.stringAppend(baseCameraManagement.getInstallMile()));
|
|
list.add(AppendUtils.stringAppend(baseCameraManagement.getInstallMile()));
|