|
@@ -52,6 +52,9 @@ public class CameraManageServiceImpl implements CameraManageService {
|
|
|
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);
|
|
|
+ if(cameraManage.getChannelNo()==null){
|
|
|
+ cameraManage.setChannelNo(1);
|
|
|
+ }
|
|
|
String play=".live";
|
|
|
String replay=".rec";
|
|
|
baseUrl=baseUrl+cameraManage.getDeviceSerial()+
|
|
@@ -96,6 +99,7 @@ public class CameraManageServiceImpl implements CameraManageService {
|
|
|
*/
|
|
|
@Override
|
|
|
public int insert(CameraManage cameraManage) {
|
|
|
+
|
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
|
cameraManage.setTenantId(currentUser.getTenantId());
|
|
|
if(!isOrgCorrect(cameraManage.getCompanyOrgId(),cameraManage.getDeptOrgId(),
|
|
@@ -141,9 +145,7 @@ public class CameraManageServiceImpl implements CameraManageService {
|
|
|
params.add("accessToken",token);
|
|
|
params.add("deviceSerial",cameraManage.getDeviceSerial());
|
|
|
params.add("name",cameraManage.getName());
|
|
|
- if(cameraManage.getChannelNo()==null){
|
|
|
- cameraManage.setChannelNo(1);
|
|
|
- }
|
|
|
+
|
|
|
params.add("channelNo",cameraManage.getChannelNo());
|
|
|
HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
|
|
|
String url="https://open.ys7.com/api/lapp/camera/name/update";
|