相机筛选修改

business-service/src/main/resources/mapper/service/BaseCameraManagementMapper.xml

@@ -44,10 +44,10 @@
                 and a.dept_id =#{deptId}
             </if>
             <if test="beginMile != null and beginMile != 0">
-                and a.begin_mile &gt;=#{beginMile}
+                and a.install_mile &gt;=#{beginMile}
             </if>
             <if test="endMile != null and endMile != 0">
-                and a.end_mile &lt;=#{endMile}
+                and a.install_mile &lt;=#{endMile}
             </if>
             <if test="installMile != null and installMile != 0">
                 and a.install_mile =#{installMile}

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -695,6 +695,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         if (StringUtils.isBlank(channel)
                 || ObjectUtils.isEmpty(startTm)
                 || ObjectUtils.isEmpty(endTm)) {
+            log.info("channel-----"+channel+"----startTm"+startTm+"-----endTm"+endTm);
             return null;
         }
         Map<Date, Map<String, Object>> m = new HashMap<>();
@@ -706,9 +707,11 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         // /api/record/flv/list
         String s = HttpUtils.sendGet(webUrl + "/recordpro/api/list", param);
         // 视频拼接
+        log.info("视频拼接s-----"+s);
         if (!StringUtils.isBlank(s) || "null".equals(s)) {
             List<Map<String, Object>> maps = JSON.parseArray(s, Map.class);
             if (ObjectUtils.isEmpty(maps)) {
+                log.info("maps-----"+maps);
                 return null;
             }
             for (Map<String, Object> map : maps) {

hazard-admin/src/main/resources/application.yml

@@ -11,7 +11,7 @@ base:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: /opt/streams/record/flv
+  profile: /opt/streams/record/flvfilterRecordList
   #  profile: C:\base\uploadPath
   # 获取ip地址开关
   addressEnabled: true