修改app推送报警信息记录显示

.idea/jarRepositories.xml

@@ -2,8 +2,8 @@
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
     <remote-repository>
-      <option name="id" value="public" />
-      <option name="name" value="aliyun nexus" />
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
       <option name="url" value="https://maven.aliyun.com/repository/public" />
     </remote-repository>
     <remote-repository>
@@ -11,6 +11,16 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="public" />
+      <option name="name" value="aliyun nexus" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
@@ -26,11 +36,6 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="custom_group" />
       <option name="name" value="Nexus Repository" />
@@ -41,10 +46,5 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
   </component>
 </project>

business-service/src/main/java/com/ozs/service/entity/vo/MsgAppPushVo.java

@@ -1,6 +1,7 @@
 package com.ozs.service.entity.vo;
 
 import com.ozs.common.vo.PageVo;
+import com.ozs.service.entity.BaseCameraManagement;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -20,6 +21,44 @@ public class MsgAppPushVo extends PageVo implements Serializable {
      */
     private String alarmId;
 
+    /**
+     * 报警行别(1上行2下行)
+     */
+    private Integer lineDir;
+
+    /**
+     * 报警里程位置
+     */
+    private String alarmMile;
+
+    /**
+     * 报警病害类型（目前只有1泥石流，后续可扩展使用）
+     */
+    private Integer alarmType;
+
+    /**
+     * 报警病害属性（可以给出泥石流的框定范围）
+     */
+    private String alarmAttr;
+
+    /**
+     * 报警图片地址
+     */
+    private String imageUrl;
+
+    /**
+     * 相机
+     */
+    private BaseCameraManagement baseCameraManagement;
+
+    public BaseCameraManagement getBaseCameraManagement() {
+        return baseCameraManagement;
+    }
+
+    public void setBaseCameraManagement(BaseCameraManagement baseCameraManagement) {
+        this.baseCameraManagement = baseCameraManagement;
+    }
+
     /**
      * 接收人
      */

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

@@ -11,18 +11,47 @@
         <result column="update_by" property="updateBy"/>
         <result column="update_time" property="updateTime"/>
         <result column="remark" property="remark"/>
+        <result column="lineDir" property="lineDir"/>
+        <result column="alarmMile" property="alarmMile"/>
+        <result column="alarmType" property="alarmType"/>
+        <result column="alarmAttr" property="alarmAttr"/>
+        <result column="imageUrl" property="imageUrl"/>
+        <association property="baseCameraManagement" javaType="com.ozs.service.entity.BaseCameraManagement">
+            <id column="id" property="id"/>
+            <result column="railway_code" property="railwayCode"/>
+            <result column="channel" property="channel"/>
+            <result column="install_mile" property="installMile"/>
+            <result column="begin_mile" property="beginMile"/>
+            <result column="end_mile" property="endMile"/>
+            <result column="install_longitude" property="installLongitude"/>
+            <result column="install_latitude" property="installLatitude"/>
+        </association>
     </resultMap>
     <select id="alarmPushMsg" resultMap="MsgAppPushVoResult">
         select
-        alarm_id,
-        receive_by,
-        status,
-        create_by,
-        create_time,
-        update_by,
-        update_time,
-        remark
-        from msg_app_push
+        m.alarm_id,
+        m.receive_by,
+        a.line_dir AS lineDir,
+        a.alarm_mile AS alarmMile,
+        a.alarm_type AS alarmType,
+        a.alarm_attr AS alarmAttr,
+        a.image_url AS imageUrl,
+        m.status,
+        m.create_by,
+        m.create_time,
+        m.update_by,
+        m.update_time,
+        m.remark,
+        b.railway_code AS railway_code,
+        b.channel AS channel,
+        b.install_mile AS install_mile,
+        b.begin_mile AS begin_mile,
+        b.end_mile AS end_mile,
+        b.install_longitude AS install_longitude,
+        b.install_latitude AS install_latitude
+        from msg_app_push m left join
+        msg_alarm AS a on m.alarm_id=a.alarm_id left join
+        base_camera_management AS b on a.camera_code=b.camera_code
         <where>
             <if test="status != null and status != 0">
                 and UPPER(status) like UPPER(CONCAT('%',#{status},'%'))