假报警解除开发

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

@@ -264,7 +264,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     private String terminalName;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "推送时间")
+    @Excel(name = "推送时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @TableField(exist = false)
     private Date createTimes;
 }

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

@@ -188,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());
                     }
                 }
@@ -270,11 +270,10 @@ 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());
+            
+            if (!StringUtils.isBlank(o.getAlarmId())) {
+                QueryWrapper<MsgHeartbeatAlarmMessage> lw = new QueryWrapper<>();
+                lw.eq("alarm_id", o.getAlarmId());
                 lw.orderByDesc("create_time");
                 lw.last("limit 1");
                 MsgHeartbeatAlarmMessage msgHeartbeatAlarmMessage = msgHeartbeatAlarmMessageService.getOne(lw);
@@ -301,9 +300,9 @@ public class MsgAlarmController extends BaseController {
 
                 }
             }
-            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}")
@@ -370,7 +369,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());
                 }