忽略行驶表详情添加终端编码，终端名称，忽略时间

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

@@ -0,0 +1,204 @@
+package com.ozs.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wyy
+ * @subject
+ * @creat 2023/5/24
+ */
+@Data
+public class MsgAlarmDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 报警唯一标识
+     */
+    private String alarmId;
+
+    /**
+     * 报警时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date alarmTime;
+
+    /**
+     * 报警线路
+     */
+    private String railwayCode;
+
+    /**
+     * 报警里程位置
+     */
+    private Integer alarmMile;
+
+    /**
+     * 报警内容
+     */
+    private String content;
+
+    /**
+     * 报警级别
+     */
+    private Integer alarmLevel;
+
+    /**
+     * 报警置信度（百分比）
+     */
+    private Integer alarmConfidence;
+
+    /**
+     * 报警行别(1上行2下行)
+     */
+    private Integer lineDir;
+
+    /**
+     * 报警病害类型（1泥石流2异物侵线 3断轨监测）
+     */
+    private Integer alarmType;
+
+    /**
+     * 框定范围
+     */
+    private String alarmAttr;
+
+    /**
+     * 解除人
+     */
+    private String releasedBy;
+
+    /**
+     * 解除时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date releasedTime;
+
+    /**
+     * 报警是否解除 1已解除2未解除
+     */
+    private Integer isRelease;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 解除内容
+     */
+    private String releaseContent;
+
+    /**
+     * 线路名称
+     */
+    private String railwayName;
+
+    /**
+     * 监控范围开始里程位置
+     */
+    private String beginMile;
+
+    /**
+     * 监控范围结束里程位置
+     */
+    private String endMile;
+
+    /**
+     * 报警里程位置字符串形式
+     */
+    private String alarmMiles;
+
+    /**
+     * 报警次数
+     */
+    private Integer alarmCount;
+
+    /**
+     * 报警图片地址网络路径
+     */
+    private List<String> imageUrls;
+
+    /**
+     * 解除人真实姓名
+     */
+    private String releasedByName;
+
+    /**
+     * 状态：1未读；2已读
+     */
+    private Integer status;
+
+    /**
+     * 推送消息ID
+     */
+    private String msgId;
+
+    /**
+     * 报警行别字符串(1上行2下行)
+     */
+    private String lineDirName;
+
+    /**
+     * 报警病害类型（目前只有1泥石流，后续可扩展使用）
+     */
+    private String alarmTypeName;
+
+    /**
+     * 报警是否解除 1已解除2未解除
+     */
+    private String  isReleaseName;
+
+    private String releasedUrl;
+
+    /**
+     * 终端编码
+     */
+    private String terminalCode;
+
+    /**
+     * 终端名称
+     */
+    private String terminalName;
+
+    /**
+     * 忽略时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ignoreTime;
+}

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

@@ -11,6 +11,10 @@ import java.io.Serializable;
 @Data
 public class TerminalIgnoreVo extends PageVo implements Serializable {
     private static final long serialVersionUID = 1L;
+    /**
+     * 忽略行驶表id
+     */
+    private  Long id;
     /**
      * 车载终端编码
      */

business-service/src/main/java/com/ozs/mapper/TerminalIgnoreAlarmMapper.java

@@ -3,6 +3,7 @@ package com.ozs.mapper;
 import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.TerminalIgnoreAlarm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.entity.vo.MsgAlarmDTO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -22,8 +23,8 @@ public interface TerminalIgnoreAlarmMapper extends BaseMapper<TerminalIgnoreAlar
      */
     List<TerminalIgnoreAlarm> list(@Param("terminalCode") String terminalCode);
     /**
-     * 终端忽略报警信息根据alarmId查询详情
-     *@param alarmId 报警编码
+     * 终端忽略报警信息根据id查询详情
+     *@param id
      */
-    MsgAlarm selectDetailByAlarmId(String alarmId);
+    MsgAlarmDTO selectDetailByAlarmId(Long id);
 }

business-service/src/main/java/com/ozs/service/TerminalIgnoreAlarmService.java

@@ -3,6 +3,7 @@ package com.ozs.service;
 import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.TerminalIgnoreAlarm;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.entity.vo.MsgAlarmDTO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,8 +24,8 @@ public interface TerminalIgnoreAlarmService extends IService<TerminalIgnoreAlarm
     List<TerminalIgnoreAlarm> list(@Param("terminalCode") String terminalCode);
 
     /**
-     * 终端忽略报警信息根据alarmId查询详情
-     *@param alarmId 报警编码
+     * 终端忽略报警信息根据id查询详情
+     *@param id 报警编码
      */
-    MsgAlarm selectDetailByAlarmId(String alarmId);
+    MsgAlarmDTO selectDetailByAlarmId(Long id);
 }

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

@@ -2,6 +2,7 @@ package com.ozs.service.impl;
 
 import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.TerminalIgnoreAlarm;
+import com.ozs.entity.vo.MsgAlarmDTO;
 import com.ozs.mapper.TerminalIgnoreAlarmMapper;
 import com.ozs.service.TerminalIgnoreAlarmService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -29,8 +30,8 @@ public class TerminalIgnoreAlarmServiceImpl extends ServiceImpl<TerminalIgnoreAl
     }
 
     @Override
-    public MsgAlarm selectDetailByAlarmId(String alarmId) {
-        MsgAlarm msgAlarm = terminalIgnoreAlarmMapper.selectDetailByAlarmId(alarmId);
-        return msgAlarm;
+    public MsgAlarmDTO selectDetailByAlarmId(Long id) {
+        MsgAlarmDTO msgAlarmDTO = terminalIgnoreAlarmMapper.selectDetailByAlarmId(id);
+        return msgAlarmDTO;
     }
 }

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

@@ -33,11 +33,13 @@
         </where>
     </select>
 
-    <select id="selectDetailByAlarmId" resultType="com.ozs.entity.MsgAlarm">
-        select a.*,b.railway_name
+    <select id="selectDetailByAlarmId" resultType="com.ozs.entity.vo.MsgAlarmDTO">
+        select a.*,b.railway_name,t.terminal_code,bt.terminal_name,t.ignore_time
         from msg_alarm as a inner join
-        base_railway_management as b on a.railway_code=b.railway_code
-        where alarm_id = #{alarmId} limit 1
+        base_railway_management as b on a.railway_code=b.railway_code left join
+        terminal_ignore_alarm as t on a.alarm_id=t.alarm_id left join
+        base_vehicle_terminal as bt on t.terminal_code = bt.terminal_code
+        where t.id = #{id}
     </select>
 
 </mapper>

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/TerminalIgnoreAlarmController.java

@@ -13,6 +13,7 @@ import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.entity.BaseVehicleTerminal;
 import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.TerminalIgnoreAlarm;
+import com.ozs.entity.vo.MsgAlarmDTO;
 import com.ozs.entity.vo.TerminalIgnoreVo;
 import com.ozs.service.BaseVehicleTerminalService;
 import com.ozs.service.TerminalIgnoreAlarmService;
@@ -88,20 +89,20 @@ public class TerminalIgnoreAlarmController extends BaseController {
     @PostMapping("/detail")
     @Log(title = "终端忽略报警信息详情", businessType = BusinessType.SELECT)
     public AjaxResult detail(@RequestBody TerminalIgnoreVo terminalIgnoreVo) {
-        MsgAlarm msgAlarm = terminalIgnoreAlarmService.selectDetailByAlarmId(terminalIgnoreVo.getAlarmId());
-        if(!ObjectUtils.isEmpty(msgAlarm.getLineDir())){//行别
-            msgAlarm.setLineDirName(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
+        MsgAlarmDTO msgAlarmDTO = terminalIgnoreAlarmService.selectDetailByAlarmId(terminalIgnoreVo.getId());
+        if(!ObjectUtils.isEmpty(msgAlarmDTO.getLineDir())){//行别
+            msgAlarmDTO.setLineDirName(msgAlarmDTO.getLineDir() == 1 ? "上行" : "下行");
         }
-        if(!ObjectUtils.isEmpty(msgAlarm.getAlarmType())){//报警类型
-            msgAlarm.setAlarmTypeName(dictDataService.selectDictLabel("sys_alarm_type", String.valueOf(msgAlarm.getAlarmType())));
+        if(!ObjectUtils.isEmpty(msgAlarmDTO.getAlarmType())){//报警类型
+            msgAlarmDTO.setAlarmTypeName(dictDataService.selectDictLabel("sys_alarm_type", String.valueOf(msgAlarmDTO.getAlarmType())));
         }
-        if(!ObjectUtils.isEmpty(msgAlarm.getAlarmMile())){//里程位置
-            msgAlarm.setAlarmMiles(AppendUtils.stringAppend(Integer.valueOf(msgAlarm.getAlarmMile())));
+        if(!ObjectUtils.isEmpty(msgAlarmDTO.getAlarmMile())){//里程位置
+            msgAlarmDTO.setAlarmMiles(AppendUtils.stringAppend(Integer.valueOf(msgAlarmDTO.getAlarmMile())));
         }
-        if(!ObjectUtils.isEmpty(msgAlarm.getIsRelease())){//状态
-            msgAlarm.setIsReleaseName(msgAlarm.getIsRelease() == 1 ? "已解除" : "未解除");
+        if(!ObjectUtils.isEmpty(msgAlarmDTO.getIsRelease())){//状态
+            msgAlarmDTO.setIsReleaseName(msgAlarmDTO.getIsRelease() == 1 ? "已解除" : "未解除");
         }
-        return AjaxResult.success(msgAlarm);
+        return AjaxResult.success(msgAlarmDTO);
     }
 
     @ApiOperation(value = "终端忽略报警信息导出")