From 9507ca9701902540023e22977c91c2dec1be5ef9 Mon Sep 17 00:00:00 2001
From: yangzongjia <yangzongjia>
Date: Wed, 23 Aug 2023 09:27:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=A8=E7=89=A9=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E8=BF=9E=E6=8E=A5=E6=91=84=E5=83=8F=E5=A4=B4=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/deviceImage/YDeviceImageRest.java     | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageRest.java
index 2ac93a7..705f39b 100644
--- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageRest.java
+++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageRest.java
@@ -2,6 +2,7 @@ package com.yxt.supervise.monitor.biz.deviceImage;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.supervise.monitor.api.entity.Device;
 import com.yxt.supervise.monitor.api.vo.PageVo;
@@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Api(tags = "设备控制器")
@@ -50,7 +52,14 @@ public class YDeviceImageRest {
 
     @ApiOperation("质物检测获取正常视频流")
     @GetMapping("/getShiPinNormalByChannelNo")
-    public ResultBean getShiPinByChannelNo(@RequestParam String channelNo) {
+    public ResultBean getShiPinByChannelNo(@RequestParam Map<String, String> searchVo) {
+        QueryWrapper<Device> wrapper = new QueryWrapper<>();
+        wrapper.eq("serialNumber", searchVo.get("deviceSerial"));
+        List<Device> devices = yDeviceService.list(wrapper);
+        Device device = new Device();
+        if (devices != null && devices.size() > 0) {
+            device = devices.get(0);
+        }
         String spToken = "";
         String url = "https://api2.hik-cloud.com/v1/ezviz/account/info";
         try {
@@ -63,12 +72,12 @@ public class YDeviceImageRest {
             System.out.println(e);
         }
 
-        String vCode = "yxt123"; // 网络录像机验证码
-        String deviceSerial = "L20560109";  //网络录像机序列号
+//        String vCode = "yxt123"; // 网络录像机验证码
+//        String deviceSerial = "L20560109";  //网络录像机序列号
         String spUrl = "https://open.ys7.com/console/jssdk/pc.html?url=ezopen://"
-                + vCode + "@open.ys7.com/"
-                + deviceSerial + "/"
-                + channelNo + ".hd.live&accessToken="
+                + device.getNvrCode() + "@open.ys7.com/"
+                + device.getSerialNumber() + "/"
+                + searchVo.get("channelNo") + ".hd.live&accessToken="
                 + spToken + "&themeId=pcLive";
 
         ResultBean rb = ResultBean.fireSuccess();