From c206acfaedc69c390fb67daa81bc686f58a212ef Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 27 十一月 2023 16:12:11 +0800
Subject: [PATCH] 提交配置信息2
---
igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java
index 8119ced..70e5b76 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java
@@ -12,6 +12,7 @@
import com.ld.igds.phone.service.PhoneService;
import com.ld.igds.phone.util.PhoneRespUtil;
import com.ld.igds.sec.dto.SecCameraDto;
+import com.ld.igds.sec.service.CoreSecCameraService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,6 +27,8 @@
@Autowired
private SecManager securityManager;
+ @Autowired
+ private CoreSecCameraService secCameraService;
@Override
public String getInterfaceId() {
@@ -43,19 +46,23 @@
if(param == null || StringUtils.isEmpty(param.getCameraId()) || StringUtils.isEmpty(param.getPlayType())){
return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鍙傛暟寮傚父锛岃閲嶈瘯锛�");
}
- // 鏍规嵁id鑾峰彇璁惧淇℃伅
-// SecCameraDto camera = securityManager.getCameraById(authUser.getCompanyId(), param.getCameraId(), true);
- SecCameraDto cameraParam = new SecCameraDto();
- cameraParam.setId(param.getCameraId());
- cameraParam.setCompanyId(authUser.getCompanyId());
- SecCameraDto camera = securityManager.getPlayAddr(cameraParam);
-
- if (camera == null) {
- return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鏈煡璇㈠埌鐩稿叧璁惧锛�");
+ if (CameraUtil.PLAY_TYPE_DEFAULT.equals(param.getPlayType())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"绯荤粺鏈厤缃綋鍓嶆憚鍍忓ご鎾斁鏂瑰紡锛屼笉鎵ц棰勮");
}
- if (CameraUtil.PLAY_TYPE_DEFAULT.equals(camera.getPlayType())) {
- return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"绯荤粺鏈厤缃綋鍓嶆憚鍍忓ご鎾斁鏂瑰紡锛屼笉鎵ц棰勮");
+ //鑾峰彇璁惧淇℃伅
+ SecCameraDto camera = secCameraService.getCameraById(authUser.getCompanyId(), param.getCameraId());
+ if(null == camera){
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鏈煡璇㈠埌鐩稿叧璁惧锛�");
+ }
+ if(StringUtils.isNotEmpty(camera.getPhoneAddr())){
+ camera.setPlayAddr(camera.getPhoneAddr());
+ return PhoneRespUtil.success(camera, req);
+ }
+
+ camera = securityManager.getPlayAddr(camera);
+ if (camera == null) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鏈煡璇㈠埌鐩稿叧璁惧锛�");
}
return PhoneRespUtil.success(camera, req);
--
Gitblit v1.9.3