item：统一视频转码，后端配置

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/AlamVideoVO.java

@@ -23,4 +23,6 @@ public class AlamVideoVO {
     
     private String presetPosition;
 
+    private String vedioFormat;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java

@@ -74,6 +74,9 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     @Value("${systemctl.jcs.switch}")
     private Boolean jcsSwitch;
 
+    @Value("${window.vedioFormat}")
+    String vedioFormat;
+
     @Autowired
     private RuleConfirmAlarmService ruleConfirmAlamService;
 
@@ -85,6 +88,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
         if (videoType.equals(type)) {
             List<AlamVideoVO> video = videoMapper.getVideoBySpeId(equipId);
             video.forEach(action -> {
+                action.setVedioFormat(vedioFormat);
                 action.setUrl(videoService.getVideoUrl(action.getName(), action.getPresetPosition(), action.getUrl(), action.getCode()));
             });
             res.put("video", video);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/VideoServiceImpl.java

@@ -97,8 +97,8 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
     @Value("${equip.security.code}")
     String securityMonitorCode;
 
-    @Value("${param.isUseVideoTranscoding}")
-    String isUseVideoTranscoding;
+    @Value("${window.vedioFormat}")
+    String vedioFormat;
 
     @Autowired
     VideoMapper videoMapper;
@@ -522,7 +522,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
 
     @Override
     public String getVideoUrl(String videoId, String presetIndex, String defaultUrl, String code) {
-        if ("off".equals(isUseVideoTranscoding)) {
+        if ("hls".equals(vedioFormat)) {
             String url = getVideoUrl(code);
             return ObjectUtils.isEmpty(url) ? defaultUrl : url;
         }

amos-boot-system-equip/src/main/resources/application-dev.properties

@@ -65,8 +65,8 @@ dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
 #系统上线时间
 param.system.online.date = 2019-02-12
 
-# 视频转码服务开关 off/on,默认关闭，数字换流站使用时开启
-param.isUseVideoTranscoding = off
+# 视频转码服务开关 hls(关)/flv(开),默认关闭，数字换流站使用时开启
+window.vedioFormat = hls
 # 航天视频服务地址
 param.htvideo.url="http://192.168.4.174:9001";
 # 南瑞视频转码服务地址

amos-boot-system-equip/src/main/resources/application-docker.properties

@@ -65,8 +65,8 @@ dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
 #系统上线时间
 param.system.online.date = 2019-02-12
 
-# 视频转码服务开关 off/on,默认关闭，数字换流站使用时开启
-param.isUseVideoTranscoding = off
+# 视频转码服务开关 hls(关)/flv(开),默认关闭，数字换流站使用时开启
+window.vedioFormat = hls
 # 航天视频服务地址
 param.htvideo.url="";
 # 南瑞视频转码服务地址

amos-boot-system-equip/src/main/resources/application-jcs.properties

@@ -71,8 +71,8 @@ dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
 #系统上线时间
 param.system.online.date = 2019-02-12
 
-# 视频转码服务开关 off/on,默认关闭，数字换流站使用时开启
-param.isUseVideoTranscoding = off
+# 视频转码服务开关 hls(关)/flv(开),默认关闭，数字换流站使用时开启
+window.vedioFormat = hls
 # 航天视频服务地址
 param.htvideo.url="";
 # 南瑞视频转码服务地址

amos-boot-system-equip/src/main/resources/application-qa.properties

@@ -65,8 +65,8 @@ dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
 #系统上线时间
 param.system.online.date = 2019-02-12
 
-# 视频转码服务开关 off/on,默认关闭，数字换流站使用时开启
-param.isUseVideoTranscoding = off
+# 视频转码服务开关 hls(关)/flv(开),默认关闭，数字换流站使用时开启
+window.vedioFormat = hls
 # 航天视频服务地址
 param.htvideo.url="";
 # 南瑞视频转码服务地址

amos-boot-system-equip/src/main/resources/application-test.properties

@@ -58,8 +58,8 @@ dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
 #系统上线时间
 param.system.online.date = 2019-02-12
 
-# 视频转码服务开关 off/on,默认关闭，数字换流站使用时开启
-param.isUseVideoTranscoding = off
+# 视频转码服务开关 hls(关)/flv(开),默认关闭，数字换流站使用时开启
+window.vedioFormat = hls
 # 航天视频服务地址
 param.htvideo.url="";
 # 南瑞视频转码服务地址