大屏视频接入增加iSecureCenter

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/BaseEnterpriseVideo.java

@@ -87,4 +87,10 @@ public class BaseEnterpriseVideo extends BaseRelationEntity {
     @TableField("equ_list_code")
     private String equListCode;
 
+    @TableField("platform")
+    private String platform;
+
+    @TableField("is_enabled")
+    private Boolean isEnabled;
+
 }

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/VideoIntegrationPlatformEnum.java

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum VideoIntegrationPlatformEnum {
+    YS("ys","萤石"),
+    ISECURECENTER("iSecureCenter","海康iSecureCenter");
+
+    private final String code;
+
+    private final String name;
+
+}

amos-boot-system-tzs/amos-boot-module-common/pom.xml

@@ -52,6 +52,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>com.hikvision.ga</groupId>
+			<artifactId>artemis-http-client</artifactId>
+			<version>1.1.13.RELEASE</version>
+		</dependency>
 	</dependencies>
 
 	<modules>

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/VideoServiceImpl.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.dto.CommonVideoDto;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.common.api.entity.BaseEnterpriseVideo;
+import com.yeejoin.amos.boot.module.common.api.enums.VideoIntegrationPlatformEnum;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.BaseEnterpriseVideoServiceImpl;
 import com.yeejoin.amos.boot.module.statistics.api.dto.UnitVideoDto;
 import com.yeejoin.amos.boot.module.statistics.api.vo.TreeNodeVo;
@@ -17,6 +18,7 @@ import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -143,11 +145,19 @@ public class VideoServiceImpl {
 
     private List<CommonVideoDto> getVideoChannel(List<BaseEnterpriseVideo> videoEquipList) {
         List<CommonVideoDto> commonVideoDtos = new ArrayList<>();
-        videoEquipList.forEach(v -> {
-            String channelNos = v.getChannelNo();
-            List<CommonVideoDto> channelNoList = JSONObject.parseArray(channelNos, CommonVideoDto.class);
-            commonVideoDtos.addAll(channelNoList.stream().peek(e -> e.setParent(v.getUseUnitCode())).collect(Collectors.toList()));
-        });
+        // 根据对接平台不同，摄像头通道信息不同，需要解析成CommonVideoDto
+        List<BaseEnterpriseVideo> ysVideoList = videoEquipList.stream().filter(v -> VideoIntegrationPlatformEnum.YS.getCode().equals(v.getPlatform())).collect(Collectors.toList());
+        if (!ValidationUtil.isEmpty(ysVideoList)) {
+            ysVideoList.forEach(v -> {
+                String channelNos = v.getChannelNo();
+                List<CommonVideoDto> channelNoList = JSONObject.parseArray(channelNos, CommonVideoDto.class);
+                commonVideoDtos.addAll(channelNoList.stream().peek(e -> e.setParent(v.getUseUnitCode())).collect(Collectors.toList()));
+            });
+        }
+        List<CommonVideoDto> iSecureCenterCameras = enterpriseVideoService.getISecureCenterCameras(videoEquipList);
+        if (!ValidationUtil.isEmpty(iSecureCenterCameras)) {
+            commonVideoDtos.addAll(iSecureCenterCameras);
+        }
         return commonVideoDtos;
     }
 
@@ -166,6 +176,7 @@ public class VideoServiceImpl {
         LambdaQueryWrapper<BaseEnterpriseVideo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BaseEnterpriseVideo::getEquListCode, EquipmentClassifityEnum.KYSD.getCode());
         queryWrapper.like(BaseEnterpriseVideo::getRegionCode, dpFilterParamDto.getCityCode());
+        queryWrapper.eq(BaseEnterpriseVideo::getIsEnabled, true);
         return enterpriseVideoService.list(queryWrapper);
     }
 
@@ -174,6 +185,7 @@ public class VideoServiceImpl {
         LambdaQueryWrapper<BaseEnterpriseVideo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BaseEnterpriseVideo::getEquListCode, EquipmentClassifityEnum.KYSD.getCode());
         queryWrapper.like(BaseEnterpriseVideo::getRegionCode, regionCode);
+        queryWrapper.eq(BaseEnterpriseVideo::getIsEnabled, true);
         return enterpriseVideoService.list(queryWrapper);
     }
 

pom.xml

@@ -309,7 +309,7 @@
 		<repository>
 			<id>thirdparty</id>
 			<name>thirdparty</name>
-			<url> http://47.92.103.240:8081/nexus/content/repositories/thirdparty/</url>
+			<url>http://47.92.103.240:8081/nexus/content/repositories/thirdparty/</url>
 		</repository>
 	</repositories>