|
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.generator.config.IFileCreate;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.ozs.common.core.domain.AjaxResult;
|
|
|
import com.ozs.common.exception.ServiceException;
|
|
|
+import com.ozs.common.utils.AppendUtils;
|
|
|
import com.ozs.common.utils.StringUtils;
|
|
|
import com.ozs.common.utils.bean.BeanUtils;
|
|
|
import com.ozs.common.utils.bean.BeanValidators;
|
|
@@ -60,6 +61,8 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
|
|
|
private BaseRailwayManagementService baseRailwayManagementService;
|
|
|
@Autowired
|
|
|
private SkynetHeartbeatLogMapper skynetHeartbeatLogMapper;
|
|
|
+ @Autowired
|
|
|
+ private BaseRailwayManagementMapper baseRailwayManagementMapper;
|
|
|
|
|
|
/**
|
|
|
* 相机台账管理表导入
|
|
@@ -415,8 +418,8 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<String> videoCaptureUrl(BaseVehicleTerminalDto baseVehicleTerminalDto) {
|
|
|
- List<String> urlList = new ArrayList<>();
|
|
|
+ public List<BaseVehicleTerminalDto> videoCaptureUrl(BaseVehicleTerminalDto baseVehicleTerminalDto) {
|
|
|
+ List<BaseVehicleTerminalDto> urlList = new ArrayList<>();
|
|
|
LambdaQueryWrapper<BaseCameraManagement> camera = new LambdaQueryWrapper<BaseCameraManagement>();
|
|
|
camera.ge(BaseCameraManagement::getBeginMile, baseVehicleTerminalDto.getTravelMile());
|
|
|
camera.eq(BaseCameraManagement::getLineDir, baseVehicleTerminalDto.getLineDir());
|
|
@@ -430,7 +433,14 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
|
|
|
List<BaseCameraManagement> list = new ArrayList<>(baseCameraManagementList);
|
|
|
for (BaseCameraManagement baseCameraManagement : list) {
|
|
|
String flv = CameraUtil.getPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
|
|
|
- urlList.add(flv);
|
|
|
+ BaseVehicleTerminalDto dto=new BaseVehicleTerminalDto();
|
|
|
+ dto.setUrl(flv);
|
|
|
+ dto.setCameraCode(baseCameraManagement.getCameraCode());
|
|
|
+ dto.setTime(new Date());
|
|
|
+ BaseRailwayManagement baseRailwayManagement = baseRailwayManagementMapper.selectOne(new QueryWrapper<BaseRailwayManagement>().eq("railway_code", baseVehicleTerminalDto.getRailwayCode()));
|
|
|
+ dto.setRailwayName(baseRailwayManagement.getRailwayName());
|
|
|
+ dto.setLineDir(baseVehicleTerminalDto.getLineDir());
|
|
|
+ String mils = AppendUtils.stringAppend(baseVehicleTerminalDto.getTravelMile());
|
|
|
}
|
|
|
}
|
|
|
return urlList;
|