|
@@ -205,9 +205,14 @@ public class MsgAlarmController extends BaseController {
|
|
|
lw.eq(MsgHeartbeatAlarmMessage::getAlarmId, o.getAlarmId());
|
|
|
}
|
|
|
List<MsgHeartbeatAlarmMessage> list = msgHeartbeatAlarmMessageService.list(lw);
|
|
|
- for (MsgHeartbeatAlarmMessage msgHeartbeatAlarmMessage : list) {
|
|
|
- o.setTrainNumName(msgHeartbeatAlarmMessage.getTrainNum()+",");
|
|
|
- }
|
|
|
+ if (!ObjectUtils.isEmpty(list)) {
|
|
|
+ StringBuilder stringBuilder = new StringBuilder();
|
|
|
+ for (MsgHeartbeatAlarmMessage msgHeartbeatAlarmMessage : list) {
|
|
|
+ stringBuilder.append(msgHeartbeatAlarmMessage.getTrainNum()).append(",");
|
|
|
+ }
|
|
|
+ String name = stringBuilder.toString();
|
|
|
+ o.setTrainNumName(name.substring(0, stringBuilder.lastIndexOf(",")));
|
|
|
+ }
|
|
|
return o;
|
|
|
}).collect(Collectors.toList());
|
|
|
page.setRecords(dto1);
|