From 41c64a5680521bf1d41fa6b9caadc55feac68ca3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 05 六月 2025 16:12:59 +0800
Subject: [PATCH] 优化报警
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WarnController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WarnController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WarnController.java
index 29da125..9ef5e24 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WarnController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WarnController.java
@@ -61,7 +61,7 @@
PageInfo<CarWarnListResp> pageInfo = warnService.getCarWarnList(carWarnListReq);
Map<String, Object> map = new HashMap<>();
map.put("page", pageInfo);
- List<Warn> list = warnService.list();
+ List<Warn> list = warnService.getAllCarWarnList(carWarnListReq);
map.put("total", list.size());
map.put("processed", list.stream().filter(s->!s.getTreatmentState().equals("处理中")).count());
map.put("unprocessed", list.stream().filter(s->s.getTreatmentState().equals("处理中")).count());
@@ -106,7 +106,7 @@
return R.ok();
}
String time = LocalDateTime.now().minusMinutes(15).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- List<Warn> list = warnService.list(new LambdaQueryWrapper<Warn>().eq(Warn::getCarId, car.getId()).lt(Warn::getStartTime, time).orderByDesc(Warn::getCreateTime));
+ List<Warn> list = warnService.list(new LambdaQueryWrapper<Warn>().eq(Warn::getCarId, car.getId()).gt(Warn::getStartTime, time).orderByDesc(Warn::getStartTime));
CarWarnInfoResp carWarnInfoResp = new CarWarnInfoResp();
carWarnInfoResp.setVehicleNumber(vehicleNumber);
GnssDataVo gnssDataVo = upExgMsgRealLocationClient.getVehicleSpeed(vehicleNumber).getData();
@@ -130,6 +130,7 @@
warnResp.setLon(new BigDecimal(warn.getLongitude()));
warnResp.setLat(new BigDecimal(warn.getLatitude()));
warnResp.setAddress(warn.getAddress());
+ warnResp.setImageUrl(warn.getPicUrl());
warnList.add(warnResp);
}
carWarnInfoResp.setWarnList(warnList);
@@ -149,4 +150,14 @@
List<Map<String, Object>> warnGroupCountTop10 = warnService.getWarnGroupCountTop10();
return R.ok(warnGroupCountTop10);
}
+
+
+
+
+ @GetMapping("/getAllWarnGroupVehicleType")
+ @ApiOperation(value = "获取根据车辆类型的报警汇总数据", tags = {"首页"})
+ public R<List<Map<String, Object>>> getAllWarnGroupVehicleType(){
+ List<Map<String, Object>> allWarnGroupVehicleType = warnService.getAllWarnGroupVehicleType();
+ return R.ok(allWarnGroupVehicleType);
+ }
}
--
Gitblit v1.7.1