修改摄像头录像计划设置功能
This commit is contained in:
parent
b0289c2fdc
commit
aee5a8cec0
|
@ -1150,7 +1150,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
|
||||||
}
|
}
|
||||||
return Result.OK(list);
|
return Result.OK(list);
|
||||||
}else{
|
}else{
|
||||||
return Result.error("获取存储设备列表失败!");
|
//todo 错误处理 存储谁被上线后,调整存储设置
|
||||||
|
return Result.ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1338,6 +1339,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
|
||||||
List<ProjectInfo> projectList = projectMapper.findList(pi);
|
List<ProjectInfo> projectList = projectMapper.findList(pi);
|
||||||
ProjectInfo projectInfo = projectList.get(0);
|
ProjectInfo projectInfo = projectList.get(0);
|
||||||
projectId = projectInfo.getProjectId();
|
projectId = projectInfo.getProjectId();
|
||||||
|
}else{
|
||||||
|
projectId = cameraInfo.getProjectId();
|
||||||
}
|
}
|
||||||
if(cameraInfo.getRegionId()==null||cameraInfo.getRegionId().equals("")){
|
if(cameraInfo.getRegionId()==null||cameraInfo.getRegionId().equals("")){
|
||||||
RegionInfo ri = new RegionInfo();
|
RegionInfo ri = new RegionInfo();
|
||||||
|
@ -1345,6 +1348,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
|
||||||
List<RegionInfo> regionList = regionMapper.findList(ri);
|
List<RegionInfo> regionList = regionMapper.findList(ri);
|
||||||
RegionInfo regionInfo = regionList.get(0);
|
RegionInfo regionInfo = regionList.get(0);
|
||||||
regionId = regionInfo.getRegionId();
|
regionId = regionInfo.getRegionId();
|
||||||
|
}else {
|
||||||
|
regionId = cameraInfo.getRegionId();
|
||||||
}
|
}
|
||||||
StringBuffer sb = new StringBuffer();
|
StringBuffer sb = new StringBuffer();
|
||||||
sb.append("{");
|
sb.append("{");
|
||||||
|
@ -1353,6 +1358,9 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
|
||||||
sb.append("\"filterAnd\"").append(":").append("{");
|
sb.append("\"filterAnd\"").append(":").append("{");
|
||||||
sb.append("\"projectId\"").append(":").append("\"").append(projectId).append("\",");
|
sb.append("\"projectId\"").append(":").append("\"").append(projectId).append("\",");
|
||||||
sb.append("\"regionId\"").append(":").append("\"").append(regionId).append("\"");
|
sb.append("\"regionId\"").append(":").append("\"").append(regionId).append("\"");
|
||||||
|
if(StringUtils.isNotBlank(cameraInfo.getDeviceName())){
|
||||||
|
sb.append(",\"devName\"").append(":").append("\"").append(cameraInfo.getDeviceName()).append("\"");
|
||||||
|
}
|
||||||
sb.append("},");
|
sb.append("},");
|
||||||
sb.append("\"sort\"").append(":").append("[{");
|
sb.append("\"sort\"").append(":").append("[{");
|
||||||
sb.append("\"key\"").append(":").append("\"ip\",");
|
sb.append("\"key\"").append(":").append("\"ip\",");
|
||||||
|
|
Loading…
Reference in New Issue