|
@@ -115,12 +115,12 @@ public class MsgAlarmMatterController extends BaseController {
|
|
|
o.setAlarmMiles(mils);
|
|
|
o.setLineDirName(o.getLineDir() == 1 ? "上行" : "下行");
|
|
|
o.setIsReleaseName(o.getIsRelease() == 1 ? "已处置" : (o.getIsRelease() == 2 ? "未处置" : "未知"));
|
|
|
- List<SysDictData> data = dictTypeService.selectDictDataByType("sys_alarm_type");
|
|
|
- data.stream().forEach(sysDictData -> {
|
|
|
- if (sysDictData.getDictValue().equals(o.getAlarmType().toString())) {
|
|
|
- o.setAlarmTypeName(sysDictData.getDictLabel());
|
|
|
- }
|
|
|
- });
|
|
|
+// List<SysDictData> data = dictTypeService.selectDictDataByType("sys_alarm_type");
|
|
|
+// data.stream().forEach(sysDictData -> {
|
|
|
+// if (sysDictData.getDictValue().equals(o.getAlarmType().toString())) {
|
|
|
+ o.setAlarmTypeName("异物侵限");
|
|
|
+// }
|
|
|
+// });
|
|
|
|
|
|
List<MsgAlarmExt> list1 = msgAlarmExtService.list(new LambdaQueryWrapper<MsgAlarmExt>().eq(MsgAlarmExt::getAlarmId, o.getAlarmId()));
|
|
|
if (!ObjectUtils.isEmpty(list1)) {
|