假报警解除开发

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

@@ -45,7 +45,6 @@ public class BaseVehicle implements Serializable {
     /**
      * 机车名称
      */
-    @Excel(name = "机车名称")
     private String vehicleName;
 
     /**

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

@@ -244,5 +244,27 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      * 车次
      */
     @TableField(exist = false)
+    @Excel(name = "车次")
     private  String trainNumName;
+
+
+    /**
+     * 机车编码
+     */
+    @Excel(name = "车号")
+    @TableField(exist = false)
+    private String vehicleCode;
+
+
+    /**
+     * 终端名称
+     */
+    @TableField(exist = false)
+    @Excel(name = "终端名称")
+    private String terminalName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "推送时间")
+    @TableField(exist = false)
+    private Date createTimes;
 }

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

@@ -38,7 +38,7 @@ public class MsgHeartbeatAlarmMessage implements Serializable {
     private String alarmId;
 
     /**
-     * 机车编码
+     * 终端编码
      */
     private String terminalCode;
 

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

@@ -3,6 +3,7 @@ package com.ozs.web.controller.accountmanagment;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
@@ -65,13 +66,15 @@ public class MsgAlarmController extends BaseController {
     @Autowired
     private DataScoreUtil dataScoreUtil;
     @Resource
-    private BaseUserService baseUserService;
+    private BaseVehicleTerminalService baseVehicleTerminalService;
     @Autowired
-    private ISysDeptService deptService;
+    private BaseVehicleService baseVehicleService;
     @Autowired
     private ISysDictTypeService dictTypeService;
     @Autowired
     private MonitorSystemService monitorSystemService;
+    @Autowired
+    private BaseTerminalService baseTerminalService;
 
     /**
      * web更多消息-总数，已读数
@@ -185,9 +188,9 @@ public class MsgAlarmController extends BaseController {
 //                    }
                     o.setReleasedByName(o.getReleasedBy());
                 }
-                if(!ObjectUtils.isEmpty(o.getSource())){
+                if (!ObjectUtils.isEmpty(o.getSource())) {
                     MonitorSystem monitorSystem = monitorSystemService.selectByClientId(o.getSource());
-                    if(!ObjectUtils.isEmpty(monitorSystem)){
+                    if (!ObjectUtils.isEmpty(monitorSystem)) {
                         o.setSourceName(monitorSystem.getMonitorSystemName());
                     }
                 }
@@ -267,9 +270,40 @@ public class MsgAlarmController extends BaseController {
                     o.setAlarmTypeName(sysDictData.getDictLabel());
                 }
             });
+
+
+            QueryWrapper<MsgHeartbeatAlarmMessage> lw = new QueryWrapper<>();
+            if (!StringUtils.isBlank(msgAlarmVo.getAlarmId())) {
+                lw.eq("alarm_id", msgAlarmVo.getAlarmId());
+                lw.orderByDesc("create_time");
+                lw.last("limit 1");
+                MsgHeartbeatAlarmMessage msgHeartbeatAlarmMessage = msgHeartbeatAlarmMessageService.getOne(lw);
+                if (!ObjectUtils.isEmpty(msgHeartbeatAlarmMessage)) {
+                    o.setTrainNumName(msgHeartbeatAlarmMessage.getTrainNum());
+                    o.setCreateTimes(msgHeartbeatAlarmMessage.getCreateTime());
+                    LambdaQueryWrapper<BaseTerminal> wrapper5 = new LambdaQueryWrapper<>();
+                    wrapper5.eq(BaseTerminal::getTerminalCode, msgHeartbeatAlarmMessage.getTerminalCode());
+                    BaseTerminal baseTerminal = baseTerminalService.getOne(wrapper5);
+                    if (!ObjectUtils.isEmpty(baseTerminal)) {
+                        o.setTerminalName(baseTerminal.getTerminalName());
+                    }
+                    LambdaQueryWrapper<BaseVehicleTerminal> wrapper1 = new LambdaQueryWrapper<>();
+                    wrapper1.eq(BaseVehicleTerminal::getTerminalCode, msgHeartbeatAlarmMessage.getTerminalCode());
+                    BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalService.getOne(wrapper1);
+                    if (!ObjectUtils.isEmpty(baseVehicleTerminal)) {
+                        LambdaQueryWrapper<BaseVehicle> wrapper2 = new LambdaQueryWrapper<>();
+                        wrapper2.eq(BaseVehicle::getVehicleCode, baseVehicleTerminal.getVehicleCode());
+                        BaseVehicle baseVehicle = baseVehicleService.getOne(wrapper2);
+                        if (!ObjectUtils.isEmpty(baseVehicle)) {
+                            o.setVehicleCode(baseVehicle.getVehicleCode());
+                        }
+                    }
+
+                }
+            }
+            ExcelUtil<MsgAlarm> util = new ExcelUtil<>(MsgAlarm.class);
+            util.exportExcel(response, msgAlarmList, "报警信息管理");
         }
-        ExcelUtil<MsgAlarm> util = new ExcelUtil<>(MsgAlarm.class);
-        util.exportExcel(response, msgAlarmList, "报警信息管理");
     }
 
     @GetMapping(value = "/{id}")
@@ -336,7 +370,7 @@ public class MsgAlarmController extends BaseController {
                 if (sysDictData.getDictValue().equals(msgAlarm.getAlarmType().toString())) {
                     msgAlarmResp.setAlarmTypeName(sysDictData.getDictLabel());
                 }
-                if(!ObjectUtils.isEmpty(msgAlarm.getSource())){
+                if (!ObjectUtils.isEmpty(msgAlarm.getSource())) {
                     MonitorSystem monitorSystem = monitorSystemService.selectByClientId(msgAlarm.getSource());
                     msgAlarmResp.setSourceName(monitorSystem.getMonitorSystemName());
                 }