From 270a71a74ad59775b9447f3c109e92480cc2fa7f Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Thu, 9 Nov 2023 09:17:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csdevice/service/impl/CsDeviceUserPOServiceImpl.java | 4 ++++ .../main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java | 5 ++++- .../njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java index d750c56..c215878 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java @@ -192,6 +192,10 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl event = data.stream().filter(temp -> temp.getType() == 0).collect(Collectors.toList()); List harmonic = data.stream().filter(temp -> temp.getType() == 1).collect(Collectors.toList()); List alarm = data.stream().filter(temp -> temp.getType() == 3).collect(Collectors.toList()); + + if(Objects.equals(userRole, AppRoleEnum.APP_VIP_USER.getCode())){ + alarm = alarm.stream().filter(temp -> Objects.equals("3", temp.getLevel())).collect(Collectors.toList()); + } List run = data.stream().filter(temp -> temp.getType() == 2).collect(Collectors.toList()); if(Objects.equals(userRole,AppRoleEnum.APP_VIP_USER.getCode())||Objects.equals(userRole,AppRoleEnum.TOURIST.getCode()) ||Objects.equals(userRole,AppRoleEnum.MARKET_USER.getCode())){ diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java index 1cd69ff..01aeca8 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java @@ -87,7 +87,10 @@ public class EventDetailVO { * RMS波形图，存在多张的情况 */ private String rmsPics; - + @ApiModelProperty(value = " /**\n" + + " * 事件等级(1:Ⅰ级 2:Ⅱ级 3:Ⅲ级)\n" + + " */") + private String level; /** * 状态(0:未读取 1:已读取) diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml index 30bcb60..727d0e5 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml @@ -37,7 +37,7 @@ 1 status, b.device_id deviceId,b.line_id lineId, - b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.code code + b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.code code,b.level level from cs_event_user a inner join cs_event b on a.event_id=b.id inner join cs_equipment_delivery c on b.device_id=c.id where 1=1 and b.process=c.process @@ -83,7 +83,7 @@ 1 status, b.device_id deviceId,b.line_id lineId,b.code code, - b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type + b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.level level from cs_event_user a inner join cs_event b on a.event_id=b.id inner join cs_equipment_delivery c on b.device_id=c.id where 1=1 and b.process=c.process