From 4ad32c37e3317fb6cb7cbfb034b53d3220c27db4 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 30 五月 2025 17:59:16 +0800 Subject: [PATCH] 优化报警 --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java index b2afff4..d13c1c0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java @@ -196,19 +196,21 @@ public PageInfo<CarWarnListResp> getCarWarnList(CarWarnListReq carWarnListReq) { PageInfo<CarWarnListResp> pageInfo = new PageInfo<>(carWarnListReq.getPageCurr(), carWarnListReq.getPageSize()); String warnType = carWarnListReq.getWarnType(); - switch (warnType) { - case "前向碰撞报警": - carWarnListReq.setWarnTypes(Arrays.asList("前向碰撞报警", "碰撞预警")); - break; - case "车道偏离报警": - carWarnListReq.setWarnTypes(Arrays.asList("车道偏离报警", "偏离路线报警", "车道偏离报警")); - break; - case "疲劳驾驶报警": - carWarnListReq.setWarnTypes(Arrays.asList("疲劳驾驶报警", "疲劳驾驶报警(生理疲劳)")); - break; - default: - carWarnListReq.setWarnTypes(Arrays.asList(warnType)); - break; + if(StringUtils.isNotEmpty(warnType)){ + switch (warnType) { + case "前向碰撞报警": + carWarnListReq.setWarnTypes(Arrays.asList("前向碰撞报警", "碰撞预警")); + break; + case "车道偏离报警": + carWarnListReq.setWarnTypes(Arrays.asList("车道偏离报警", "偏离路线报警", "车道偏离报警")); + break; + case "疲劳驾驶报警": + carWarnListReq.setWarnTypes(Arrays.asList("疲劳驾驶报警", "疲劳驾驶报警(生理疲劳)")); + break; + default: + carWarnListReq.setWarnTypes(Arrays.asList(warnType)); + break; + } } return this.baseMapper.getCarWarnList(pageInfo, carWarnListReq); } -- Gitblit v1.7.1