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/phone35/service/impl/Phone35ServiceImpl5605.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
index 1ac4a38..875f00a 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
@@ -12,6 +12,7 @@
import com.ld.igds.phone35.util.PhoneRespUtil;
import com.ld.igds.sec.dto.SecCameraDto;
import com.ld.igds.sec.manager.SecManager;
+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;
@@ -25,12 +26,14 @@
public class Phone35ServiceImpl5605 implements Phone35Service {
@Autowired
private SecManager securityManager;
-
+ @Autowired
+ private CoreSecCameraService secCameraService;
@Override
public String getInterfaceId() {
return Phone35Constant.API_PHONE_5605;
}
+ @SuppressWarnings("unchecked")
@Override
public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
//杞寲瀵硅薄
@@ -42,20 +45,24 @@
if (StringUtils.isEmpty(param.getId())) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
- //鍙傛暟楠岃瘉
if (CameraUtil.PLAY_TYPE_DEFAULT.equals(param.getPlayType())) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "绯荤粺鏈厤缃綋鍓嶆憚鍍忓ご鎾斁鏂瑰紡锛屼笉鎵ц棰勮");
}
- SecCameraDto cameraParam = new SecCameraDto();
- cameraParam.setId(param.getId());
- cameraParam.setCompanyId(phone35AuthUser.getCompanyId());
- SecCameraDto camera = securityManager.getPlayAddr(cameraParam);
-
+ //鑾峰彇璁惧淇℃伅
+ SecCameraDto camera = secCameraService.getCameraById(phone35AuthUser.getCompanyId(), param.getId());
if (camera == null) {
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