|
@@ -168,7 +168,7 @@ public class MsgAlarmMatterController extends BaseController {
|
|
|
String mils = AppendUtils.stringAppend(o.getAlarmMile());
|
|
|
o.setAlarmMiles(mils);
|
|
|
o.setLineDirName(o.getLineDir() == 1 ? "上行" : "下行");
|
|
|
- o.setAlarmTypeStr(o.getAlarmType() == 1 ? "泥石流" : (o.getAlarmType() == 2 ? "异物侵限" : (o.getAlarmType() == 3 ? "断轨监测" : "未知")));
|
|
|
+ o.setAlarmTypeStr(o.getAlarmType() == 1 ? "异物侵限" : (o.getAlarmType() == 2 ? "泥石流" : (o.getAlarmType() == 3 ? "断轨监测" : "未知")));
|
|
|
o.setIsReleaseName(o.getIsRelease() == 1 ? "已解除" : (o.getIsRelease() == 2 ? "未解除" : "未知"));
|
|
|
List<SysDictData> data = dictTypeService.selectDictDataByType("sys_alarm_type");
|
|
|
data.stream().forEach(sysDictData -> {
|