|
@@ -64,8 +64,8 @@ public class FusionService implements IFusionService {
|
|
HashMap<Long, Camera> cameraMap = cameraService.getByIds(cameraIds);
|
|
HashMap<Long, Camera> cameraMap = cameraService.getByIds(cameraIds);
|
|
for (ScenePlus record : page.getRecords()) {
|
|
for (ScenePlus record : page.getRecords()) {
|
|
ScenePlusVo scenePlusVo = new ScenePlusVo();
|
|
ScenePlusVo scenePlusVo = new ScenePlusVo();
|
|
- String snCode = cameraMap.get(scenePlusVo.getCameraId()) == null ? "" :cameraMap.get(scenePlusVo.getCameraId()).getSnCode();
|
|
|
|
BeanUtils.copyProperties(record,scenePlusVo);
|
|
BeanUtils.copyProperties(record,scenePlusVo);
|
|
|
|
+ String snCode = cameraMap.get(scenePlusVo.getCameraId()) == null ? "" :cameraMap.get(scenePlusVo.getCameraId()).getSnCode();
|
|
scenePlusVo.setPlusExt(extMap.get(record.getId()));
|
|
scenePlusVo.setPlusExt(extMap.get(record.getId()));
|
|
scenePlusVo.setSnCode(snCode);
|
|
scenePlusVo.setSnCode(snCode);
|
|
scenePlusVo.setSceneType(param.getType());
|
|
scenePlusVo.setSceneType(param.getType());
|