预警详情添加线路字段

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

@@ -21,6 +21,7 @@
         <association property="baseCameraManagement" javaType="com.ozs.service.entity.BaseCameraManagement">
             <id column="id" property="id"/>
             <result column="railway_code" property="railwayCode"/>
+            <result column="railwayName" property="railwayName"/>
             <result column="channel" property="channel"/>
             <result column="install_mile" property="installMile"/>
             <result column="begin_mile" property="beginMile"/>
@@ -51,11 +52,13 @@
         b.begin_mile AS begin_mile,
         b.end_mile AS end_mile,
         b.install_longitude AS install_longitude,
-        b.install_latitude AS install_latitude
+        b.install_latitude AS install_latitude,
+        c.railway_name AS railwayName
         FROM
         msg_alarm AS a left join
         base_camera_management AS b on a.camera_code=b.camera_code left join
-        msg_web_push m on a.alarm_id = m.alarm_id
+        msg_web_push m on a.alarm_id = m.alarm_id left join
+        base_railway_management c on b.railway_code=c.railway_code
 
         <where>
             <if test="railwayCode != null and railwayCode != ''">

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -340,7 +340,6 @@ public class MsgAlarmController extends BaseController {
     public void exportDataStatistic(HttpServletResponse response, @RequestBody AlarmStatisticResVo alarmStatisticResVo) {
         SysUser user = getLoginUser().getUser();
         String userId = getUserId();
-        ;
         if (user.isAdmin(user.getId())) {
             userId = "";
         }
@@ -354,6 +353,7 @@ public class MsgAlarmController extends BaseController {
                 String lineDir = l.getLineDir();
                 String lineDirValue = dictDataService.selectDictLabel("sys_line_dir", lineDir);
                 l.setLineDirValue(lineDirValue);
+
             });
             ExcelUtil<AlarmStatisticDto> util = new ExcelUtil<>(AlarmStatisticDto.class);
             util.exportExcel(response, list, "报警数据详情");