From 93c20ce82e56710f7cf93789e7ac7a06153111a1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 04 六月 2025 16:13:28 +0800
Subject: [PATCH] 优化附件
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 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..962be7e 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
@@ -121,6 +121,7 @@
warn.setCreateTime(LocalDateTime.now());
warn.setObjectId(vo.getInfoId());
warn.setVehicleNumber(vo.getVehicleNo());
+ warn.setPicUrl(vo.getPicUrl());
warns.add(warn);
}
if (warns.size() > 0) {
@@ -179,8 +180,11 @@
warn.setTreatmentState("将来处理");
break;
}
- this.updateById(warn);
}
+ if(null == warn.getPicUrl()){
+ warn.setPicUrl(vo.getPicUrl());
+ }
+ this.updateById(warn);
}
}
@@ -196,19 +200,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