From 96d3ae20a572460e3dc226204398c44b4d0c8484 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Fri, 18 Jun 2021 16:54:05 +0800 Subject: [PATCH] screen-api 增加编辑组织型号因子的显示单位以及报警等级接口 --- screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmQueryVO.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmQueryVO.java index 2e4e945..d0e7274 100644 --- a/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmQueryVO.java +++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmQueryVO.java @@ -62,7 +62,8 @@ vo.setUnitKey(organizationUnitAlarm.getUnitKey()); vo.setShowUnitKey(organizationUnitAlarm.getShowUnitKey()); //alarmLevel Json������������������ - if (!ObjectUtils.isEmpty(organizationUnitAlarm.getAlarmLevel())) { + vo.setAlarmLevel(organizationUnitAlarm.getAlarmLevel()); + /*if (!ObjectUtils.isEmpty(organizationUnitAlarm.getAlarmLevel())) { StringBuilder alarmLevelStr = new StringBuilder(organizationUnitAlarm.getAlarmLevel()); List<Integer> alarmLevel = new ArrayList<>(); alarmLevelStr.deleteCharAt(0); @@ -72,7 +73,7 @@ alarmLevel.add(Integer.parseInt(level)); } vo.setAlarmLevel(alarmLevel); - } + }*/ return vo; } -- Gitblit v1.8.0