From c432d5cede4fb9e48234523841d1e7257828d808 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 18 十月 2023 17:02:13 +0800
Subject: [PATCH] 优化往来单位及onvif

---
 igds-protocol-block/src/main/java/com/ld/igds/protocol/vlcmedia/VlcMediaService.java |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/igds-protocol-block/src/main/java/com/ld/igds/protocol/vlcmedia/VlcMediaService.java b/igds-protocol-block/src/main/java/com/ld/igds/protocol/vlcmedia/VlcMediaService.java
index e990254..25686dd 100644
--- a/igds-protocol-block/src/main/java/com/ld/igds/protocol/vlcmedia/VlcMediaService.java
+++ b/igds-protocol-block/src/main/java/com/ld/igds/protocol/vlcmedia/VlcMediaService.java
@@ -7,6 +7,9 @@
 import com.ld.igds.camera.data.ApiSnapReq;
 import com.ld.igds.protocol.snap.SnapPluginService;
 import com.ld.igds.sec.dto.SecCameraDto;
+import com.ld.onvif.OnvifService;
+import com.ld.onvif.data.OnvifResult;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -16,14 +19,15 @@
 /**
  * 椋庢鑷磋繙鑷湁娴佸獟浣撴湇鍔″櫒
  */
+@Slf4j
 @Component
 public class VlcMediaService implements ApiCameraService {
 
     @Resource
     private SnapPluginService snapPluginService;
 
-//    @Resource
-//    private OnvifService onvifService;
+    @Resource
+    private OnvifService onvifService;
 
     @Override
     public String getPlayType() {
@@ -49,11 +53,13 @@
         }
 
         try {
-            return new ApiCameraResp(ApiCameraResp.CODE_ERROR, "娌℃湁鑾峰彇鍒板綋鍓嶆憚鍍忔満淇℃伅锛屼笉鏀寔浜戝彴鎺у埗");
-//            OnvifResult result = onvifService.ptz(param.getIp(), param.getPortV(), param.getLoginId(),
-//                    param.getPwd(), param.getCommand(), 0.5);
-//
-//            return new ApiCameraResp(result.get("code") + "", (String) result.get("msg"));
+            log.debug("瑙嗛鎺у埗寮�濮�={}", param.toString());
+//            return new ApiCameraResp(ApiCameraResp.CODE_ERROR, "娌℃湁鑾峰彇鍒板綋鍓嶆憚鍍忔満淇℃伅锛屼笉鏀寔浜戝彴鎺у埗");
+            OnvifResult result = onvifService.ptz(param.getIp(), param.getPortV(), param.getLoginId(),
+                    param.getPwd(), param.getCommand(), 0.5);
+
+            log.debug("瑙嗛鎺у埗={}", result.toString());
+            return new ApiCameraResp(result.get("code") + "", (String) result.get("msg"));
 
         } catch (Exception e) {
 
@@ -69,11 +75,12 @@
             return new ApiCameraResp(ApiCameraResp.CODE_ERROR, "娌℃湁鑾峰彇鍒板綋鍓嶆憚鍍忔満淇℃伅锛屼笉鏀寔浜戝彴鎺у埗");
         }
         try {
-            return new ApiCameraResp(ApiCameraResp.CODE_ERROR, "娌℃湁鑾峰彇鍒板綋鍓嶆憚鍍忔満淇℃伅锛屼笉鏀寔浜戝彴鎺у埗");
-//            OnvifResult result = onvifService.preset(param.getIp(), param.getPortV(),
-//                    param.getLoginId(), param.getPwd(), param.getPreset());
-//
-//            return new ApiCameraResp((String) result.get("code"), (String) result.get("msg"));
+            log.debug("瑙嗛鎺у埗寮�濮�={}", param.toString());
+//            return new ApiCameraResp(ApiCameraResp.CODE_ERROR, "娌℃湁鑾峰彇鍒板綋鍓嶆憚鍍忔満淇℃伅锛屼笉鏀寔浜戝彴鎺у埗");
+            OnvifResult result = onvifService.preset(param.getIp(), param.getPortV(),
+                    param.getLoginId(), param.getPwd(), param.getPreset());
+            log.debug("瑙嗛鎺у埗={}", result.toString());
+            return new ApiCameraResp((String) result.get("code"), (String) result.get("msg"));
 
         } catch (Exception e) {
 

--
Gitblit v1.9.3