监测系统管理时间类型修改

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

@@ -240,4 +240,10 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      */
     @TableField(exist = false)
     private String sourceName;
+
+    /**
+     * 车次
+     */
+    @TableField(exist = false)
+    private  String trainNumName;
 }

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

@@ -51,7 +51,7 @@ public class MsgAlarmController extends BaseController {
     @Resource
     MsgAlarmService msgAlarmService;
     @Resource
-    MsgAlarmMapper msgAlarmMapper;
+    MsgHeartbeatAlarmMessageService msgHeartbeatAlarmMessageService;
     @Resource
     MsgAlarmFrequencyService msgAlarmFrequencyService;
     @Autowired
@@ -200,11 +200,14 @@ public class MsgAlarmController extends BaseController {
                         o.setAlarmTypeName(sysDictData.getDictLabel());
                     }
                 });
-//                LambdaQueryWrapper<MsgAlarmFrequency> wrapper = new LambdaQueryWrapper<MsgAlarmFrequency>();
-//                if (!ObjectUtils.isEmpty(o.getAlarmId())) {
-//                    wrapper.eq(MsgAlarmFrequency::getAlarmId, o.getAlarmId());
-//                }
-//                 o.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
+                LambdaQueryWrapper<MsgHeartbeatAlarmMessage> lw = new LambdaQueryWrapper<>();
+                if (!StringUtils.isBlank(o.getAlarmId())) {
+                    lw.eq(MsgHeartbeatAlarmMessage::getAlarmId, o.getAlarmId());
+                }
+                List<MsgHeartbeatAlarmMessage> list = msgHeartbeatAlarmMessageService.list(lw);
+                for (MsgHeartbeatAlarmMessage msgHeartbeatAlarmMessage : list) {
+                    o.setTrainNumName(msgHeartbeatAlarmMessage.getTrainNum()+",");
+                }              
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);