|
@@ -143,9 +143,11 @@ public class BaseCameraManagementController extends BaseController {
|
|
if (deviceDynamicManagement.getIsDisable()==2) {
|
|
if (deviceDynamicManagement.getIsDisable()==2) {
|
|
baseCameraManagement.setIsDisable(deviceDynamicManagement.getIsDisable());
|
|
baseCameraManagement.setIsDisable(deviceDynamicManagement.getIsDisable());
|
|
baseCameraManagement.setElectricity(deviceDynamicManagement.getElectricity());
|
|
baseCameraManagement.setElectricity(deviceDynamicManagement.getElectricity());
|
|
- LocalDateTime createTime = mqLogService.getOne(new LambdaQueryWrapper<MqLog>()
|
|
|
|
- .eq(MqLog::getCameraCode, cameraCode).orderByDesc(MqLog::getCreateTime).last("limit 1")).getCreateTime();
|
|
|
|
- baseCameraManagement.setHeartTime(createTime);
|
|
|
|
|
|
+ List<MqLog> list = mqLogService.list(new LambdaQueryWrapper<MqLog>()
|
|
|
|
+ .eq(MqLog::getCameraCode, cameraCode));
|
|
|
|
+ if (!ObjectUtils.isEmpty(list)) {
|
|
|
|
+ baseCameraManagement.setHeartTime(list.get(0).getCreateTime());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return AjaxResult.success(baseCameraManagement);
|
|
return AjaxResult.success(baseCameraManagement);
|
|
} else if (!StringUtils.isEmpty(isLock) && isLock == 2 && !StringUtils.isEmpty(cameraCode)) {
|
|
} else if (!StringUtils.isEmpty(isLock) && isLock == 2 && !StringUtils.isEmpty(cameraCode)) {
|