app我的页面修改添加railwayName字段

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

@@ -24,6 +24,14 @@ public class MsgAppPushVo extends PageVo implements Serializable {
      * 报警唯一标识
      */
     private String alarmId;
+    /**
+     * 线路名称
+     */
+    private String railwayName;
+    /**
+     * 线路类型
+     */
+    private Integer railwayType;
 
     /**
      * 报警行别(1上行2下行)

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

@@ -12,6 +12,8 @@
         <result column="update_time" property="updateTime"/>
         <result column="remark" property="remark"/>
         <result column="lineDir" property="lineDir"/>
+        <result column="railwayName" property="railwayName"/>
+        <result column="railwayType" property="railwayType"/>
         <result column="alarmMile" property="alarmMile"/>
         <result column="alarmType" property="alarmType"/>
         <result column="alarmAttr" property="alarmAttr"/>
@@ -44,6 +46,8 @@
         m.update_time,
         m.remark,
         b.railway_code AS railway_code,
+        r.railway_name AS railwayName,
+        r.railway_type AS railwayType,
         b.channel AS channel,
         b.install_mile AS install_mile,
         b.begin_mile AS begin_mile,
@@ -52,7 +56,8 @@
         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
+        base_camera_management AS b on a.camera_code=b.camera_code left join
+        base_railway_management AS r on b.railway_code=r.railway_code
         <where>
             <if test="status != null and status != 0">
                 and UPPER(status) like UPPER(CONCAT('%',#{status},'%'))