Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

business-service/src/main/java/com/ozs/service/entity/MsgAlarm.java

@@ -176,4 +176,10 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      */
     @TableField(exist = false)
     private String releasedByName;
+
+    /**
+     * 状态：1未读；2已读
+     */
+    @TableField(exist = false)
+    private Integer status;
 }

business-service/src/main/java/com/ozs/service/service/impl/MsgAppPushServiceImpl.java

@@ -45,7 +45,6 @@ public class MsgAppPushServiceImpl extends ServiceImpl<MsgAppPushMapper, MsgAppP
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue());
         pageR.setSize(page.size());
         pageR.setTotal(page.getTotal());
-        pageR.setTotal(page.getTotal());
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getResult())) {
             List<MsgAlarm> dto1 = page.getResult().stream().map(o -> {
                 String[] split = o.getImageUrl().split(";");

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

@@ -79,15 +79,15 @@
     </update>
 
     <select id="messageMoreApp" parameterType="com.ozs.service.entity.vo.MsgAlarmVo" resultType="com.ozs.service.entity.MsgAlarm">
-        select b.*
+        select b.*, a.status
         from msg_app_push AS a
         join msg_alarm AS b on a.alarm_id = b.alarm_id
         join base_camera_management AS c on b.camera_code = c.camera_code
         <where>
-            <if test="userId != null and userId != 0">
+            <if test="userId != null and userId != ''">
                 and a.receive_by = #{userId}
             </if>
-            <if test="status != null and status != ''">
+            <if test="status != null and status != 0">
                 and a.status = #{status}
             </if>
         </where>

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

@@ -21,7 +21,7 @@
 
     <select id="messageMore" parameterType="com.ozs.service.entity.vo.MsgAlarmVo"
             resultType="com.ozs.service.entity.MsgAlarm">
-        select b.*
+        select b.*, a.status
         from msg_web_push AS a
         join msg_alarm AS b on a.alarm_id = b.alarm_id
         join base_camera_management AS c on b.camera_code = c.camera_code

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

@@ -402,6 +402,7 @@ public class CameraUtil {
 
         //遍历每个进行视频录制的摄像头
         File file = new File(transcribeFilePath);
+        log.info("file.Name()======================================" + file.getName());
         log.info("file.exists()======================================" + file.exists());
         if (file.exists() && file.isDirectory()) {
             //获取文件夹中所有的子文件夹和文件
@@ -409,6 +410,7 @@ public class CameraUtil {
             if (!ObjectUtils.isEmpty(files) && files.length > 0) {
                 for (File file1 : files) {
                     //   file1=/opt/streams/record/flv/34020000001320000167
+                    log.info("file1.Name()======================================" + file1.getName());
                     if (file1.exists() && file1.isDirectory()) {
                         //相机文件
                         File[] fs = file1.listFiles();
@@ -417,6 +419,7 @@ public class CameraUtil {
                                 //    f=/opt/streams/record/flv/34020000001320000167/20230328_192033_192037-91509173-cd5a-11ed-8a42-fa163e4e1e9f.flv
                                 //fName=20230328_192033_192037-91509173-cd5a-11ed-8a42-fa163e4e1e9f.flv
                                 String fName = f.getName();
+                                log.info("fName======================================" + fName);
                                 String[] split = fName.split("_");
                                 if (split.length > 0) {
                                     //20230328