|
@@ -48,7 +48,18 @@ public class CameraManageServiceImpl implements CameraManageService {
|
|
|
@Override
|
|
|
public CameraManage selectById(Integer id) {
|
|
|
CameraManage cameraManage = this.cameraManageMapper.selectById(id);
|
|
|
- cameraManage.setToken(getToken(cameraManage.getAppkey(),cameraManage.getScrert()));
|
|
|
+
|
|
|
+ String baseUrl="https://open.ys7.com/ezopen/h5/iframe_se?url=ezopen://open.ys7.com/";
|
|
|
+ String token= getToken(cameraManage.getAppkey(),cameraManage.getScrert());
|
|
|
+ cameraManage.setToken(token);
|
|
|
+ String play=".live";
|
|
|
+ String replay=".rec";
|
|
|
+ baseUrl=baseUrl+cameraManage.getDeviceSerial()+
|
|
|
+ "/"+cameraManage.getChannelNo()+"${type}&autoplay=0&audio=1&templete=2&accessToken="
|
|
|
+ +token;
|
|
|
+
|
|
|
+ cameraManage.setPalyUrl(baseUrl.replace("${type}",play));
|
|
|
+ cameraManage.setReplayUrl(baseUrl.replace("${type}",replay));
|
|
|
return cameraManage;
|
|
|
}
|
|
|
|
|
@@ -107,10 +118,17 @@ public class CameraManageServiceImpl implements CameraManageService {
|
|
|
companyIds.add(item.getOrgCompanyId());
|
|
|
departmentIds.add(item.getOrgDeparmtmentId());
|
|
|
});
|
|
|
- if(companyIds.contains(companyId)&&departmentIds.contains(departmentIds)){
|
|
|
- result=true;
|
|
|
+ if(departmentId!=null){
|
|
|
+ if(companyIds.contains(companyId)&&departmentIds.contains(departmentId)){
|
|
|
+ result=true;
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ if(companyIds.contains(companyId)){
|
|
|
+ result=true;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+
|
|
|
return result;
|
|
|
}
|
|
|
private void updateCameraName(CameraManage cameraManage){
|