From a08735b9b29dc00d6e14b4324a628b574d4f4bdd Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Mon, 3 Apr 2023 09:05:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A4=E7=9F=B3=E8=AE=BE=E5=A4=87=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/VideoItemServiceImpl.java    | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
index cc0a9726d..44cc23040 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
@@ -77,16 +77,18 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
                 throw new OpenAlertException(MessageUtil.get("serialNumberExistErr"));
             }
         }
-        if (projectVideoConfig.getVideoType() == 1) {
-            String accessToken = YsVideoUtil.getToken(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret());
-            Map<String, Object> temp = YsVideoUtil.getVideoInfo(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret(), videoItem.getSerialNumber(), accessToken);
-            if (temp == null || temp.size() == 0) {
-                boolean falg = YsVideoUtil.addVideo(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret(), videoItem.getSerialNumber(), videoItem.getVerificationCode(), accessToken);
-                if (!falg) {
-                    throw new OpenAlertException(MessageUtil.get("devAddErr"));
-                }
-            }
-        }
+        // TODO 此处直接添加成功,暂时不需要添加萤石设备 用户使用此功能前需要先在萤石添加好自己需要的设备,之后在智慧工地平台添加
+//        if (projectVideoConfig.getVideoType() == 1) {
+//            String accessToken = YsVideoUtil.getToken(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret());
+//            // 获取用户下的设备信息,如果不存在,账户下添加
+//            Map<String, Object> temp = YsVideoUtil.getVideoInfo(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret(), videoItem.getSerialNumber(), accessToken);
+//            if (temp == null || temp.size() == 0) {
+//                boolean falg = YsVideoUtil.addVideo(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret(), videoItem.getSerialNumber(), videoItem.getVerificationCode(), accessToken);
+//                if (!falg) {
+//                    throw new OpenAlertException(MessageUtil.get("devAddErr"));
+//                }
+//            }
+//        }
         videoItem.setCreateTime(new Date());
         videoItemMapper.insert(videoItem);
     }
@@ -136,7 +138,8 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
         List<EntityMap> list = null;
         if (projectVideoConfig != null) {
             list = videoItemMapper.selectVideoItemListByVideoId(projectVideoConfig.getId(), MapUtils.getString(map, "groupId"));
-            list = getVideoOtherData(projectVideoConfig, list);
+            // TODO 此处用户直接在智慧工地云平台添加设备,设备需要手动在萤石云添加好完成
+//            list = getVideoOtherData(projectVideoConfig, list);
         }
         return list;
     }
@@ -300,8 +303,17 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
 
     @Override
     public Map<String, Object> selectProjectVideoList(Map<String, Object> map) {
+        // 如果config type = 1   获取token
         Map<String, Object> data = new HashMap<>();
         List<EntityMap> videoList = videoItemMapper.selectProjectVideoList(map);
+        if (videoList.size() > 0) {
+            String token = YsVideoUtil.getToken(MapUtils.getString(videoList.get(0), "appId"), MapUtils.getString(videoList.get(0), "appSecret"));
+            for (EntityMap entityMap : videoList) {
+                entityMap.put("token", token);
+                entityMap.put("url", "ezopen://open.ys7.com/" + MapUtils.getString(entityMap, "serialNumber") + "/" +
+                        MapUtils.getString(entityMap, "verificationCode") + ".hd.live");
+            }
+        }
         List<EntityMap> groupList = videoGroupMapper.selectVideoGroupList(map);
         if (groupList != null && groupList.size() > 0) {
             List<EntityMap> tempList = new ArrayList<>();