未读消息

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

@@ -187,5 +187,5 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      * 推送消息ID
      */
     @TableField(exist = false)
-    private Long msgId;
+    private String msgId;
 }

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

@@ -76,6 +76,7 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
                 String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
                 msgAlarmResp.setAlarmMile(mile);
                 msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
+                msgAlarmResp.setPushId(msgAlarm.getMsgId());
                 msgAlarmRespList.add(msgAlarmResp);
             }
         }

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

@@ -10,7 +10,7 @@
     </select>
 
     <select id="webAlarm" parameterType="java.lang.String" resultType="com.ozs.service.entity.MsgAlarm">
-        select b.*
+        select b.*, a.push_id as msgId
         from msg_web_push AS a
         join msg_alarm AS b on a.alarm_id = b.alarm_id
         where a.status = 1