修改视频接口url参数返回

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

@@ -515,18 +515,19 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
 
     @Override
     public List<Video> listByCode(String code) {
-
         return videoMapper.listByCode(code);
     }
 
 
     @Override
     public String getVideoUrl(String videoId, String presetIndex, String defaultUrl, String code) {
+    	String url = "";
         if ("hls".equals(vedioFormat)) {
-            String url = getVideoUrl(code);
-            return ObjectUtils.isEmpty(url) ? defaultUrl : url;
+            url = getVideoUrl(code);
+        } else {
+        	url = getFlvUrlByVideoIdOrPresetIndex(videoId, presetIndex);
         }
-        return getFlvUrlByVideoIdOrPresetIndex(videoId, presetIndex);
+        return ObjectUtils.isEmpty(url) ? defaultUrl : url;
     }
     
     private String getVideoUrl(String code){
@@ -570,7 +571,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
         } catch (Exception e) {
             log.error("flv视频流接口获取失败:{}", e.getMessage());
         }
-        return "flvUrl";
+        return "";
     }
 
 
@@ -592,7 +593,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
         if (respond.containsKey("rtsp")) {
             return respond.get("rtsp");
         }
-        return "rtsp";
+        return "";
     }
 
 }

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -350,8 +350,7 @@
         wl_equipment_specific_alarm_log wlesal
         LEFT JOIN wl_equipment we ON wlesal.equipment_code = we.code
         LEFT JOIN wl_equipment_specific_alarm wlesa ON wlesa.id = wlesal.equipment_specific_alarm_id) d
-        WHERE 1=1
-        AND d.fireEquipmentName IS NOT NULL
+        WHERE d.fireEquipmentName IS NOT NULL
         <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">and
             d.warehouseStructureName like
             concat(concat("%",#{param.warehouseStructureName}),"%")