From 1ee76c252f2dbba62e0ec34cccf9eaac51de9083 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 23 七月 2025 16:25:23 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 152 insertions(+), 22 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 db0db5d..2afbda0 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
@@ -2,10 +2,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.dataInterchange.api.feignClient.UPWarnMsgAdptInfoClient;
+import com.ruoyi.dataInterchange.api.feignClient.UPWarnMsgOperationInfoClient;
import com.ruoyi.dataInterchange.api.model.enums.WarnType;
import com.ruoyi.dataInterchange.api.vo.UPWarnMsgAdptInfoVo;
+import com.ruoyi.dataInterchange.api.vo.UPWarnMsgOperationInfoVo;
import com.ruoyi.system.api.model.Car;
import com.ruoyi.system.api.model.Driver;
import com.ruoyi.system.api.model.Enterprise;
@@ -22,14 +25,12 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
/**
@@ -51,6 +52,9 @@
@Resource
private ICarService carService;
+ @Resource
+ private UPWarnMsgOperationInfoClient upWarnMsgOperationInfoClient;
+
/**
* 存储新的报警数据
@@ -71,10 +75,19 @@
List<Car> carList = carService.list();
List<Warn> warns = new ArrayList<>();
for (UPWarnMsgAdptInfoVo vo : list) {
+ long count = this.count(new LambdaQueryWrapper<Warn>().eq(Warn::getObjectId, vo.getInfoId()));
+ if(0 != count){
+ continue;
+ }
+ String warnTypeName = WarnType.getWarnTypeName(vo.getWarnType());
warn = new Warn();
Optional<Car> carOptional = carList.stream().filter(s -> s.getVehicleNumber().equals(vo.getVehicleNo())).findFirst();
if (carOptional.isPresent()) {
- warn.setCarId(carOptional.get().getId());
+ Car car = carOptional.get();
+ if(car.getOperateType().equals("出租车") && StringUtils.isNotEmpty(warnTypeName) && "疲劳驾驶报警".equals(warnTypeName)){
+ continue;
+ }
+ warn.setCarId(car.getId());
}
Optional<Driver> optional = driverList.stream().filter(s -> s.getVehicleNumber().equals(vo.getVehicleNo())).findFirst();
if (optional.isPresent()) {
@@ -84,22 +97,26 @@
warn.setEnterpriseId(enterprise.getId());
warn.setStartTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(vo.getCreateTime() * 1000), ZoneOffset.ofHours(8)).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
warn.setEndTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(vo.getCreateTime() * 1000), ZoneOffset.ofHours(8)).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- warn.setWarnType(WarnType.getWarnTypeName(vo.getWarnType()));
+ warn.setWarnType(warnTypeName);
warn.setWarnNumber(1);
warn.setSpeed(null == vo.getSpeed() ? BigDecimal.ZERO : new BigDecimal(vo.getSpeed()));
- if(null != vo.getLongitude()){
- warn.setLongitude(new BigDecimal(vo.getLongitude()).divide(new BigDecimal(1000000)).toString());
+ if(null != vo.getLongitude() && 0 != vo.getLongitude()){
+ String s = vo.getLongitude().toString();
+ warn.setLongitude(s.substring(0, 3) + "." + s.substring(3));
}
- if(null != vo.getLatitude()){
- warn.setLatitude(new BigDecimal(vo.getLatitude()).divide(new BigDecimal(1000000)).toString());
+ if(null != vo.getLatitude() && 0 != vo.getLatitude()){
+ String s = vo.getLatitude().toString();
+ warn.setLatitude(s.substring(0, 2) + "." + s.substring(2));
+ Map<String, String> geocode = null;
+ try {
+ geocode = GDMapGeocodingUtil.geocode(warn.getLongitude(), warn.getLatitude());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ if(null != geocode){
+ warn.setAddress(geocode.get("address"));
+ }
}
- Map<String, String> geocode = null;
- try {
- geocode = GDMapGeocodingUtil.geocode(warn.getLongitude(), warn.getLatitude());
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- warn.setAddress(geocode.get("address"));
switch (vo.getResult()) {
case 0x00:
warn.setTreatmentState("处理中");
@@ -114,9 +131,34 @@
warn.setTreatmentState("将来处理");
break;
}
+ if(0x00 != vo.getResult() && null == warn.getTreatmentTime()){
+ UPWarnMsgOperationInfoVo upWarnMsgOperationInfoVo = upWarnMsgOperationInfoClient.getUPWarnMsgOperationInfo(warn.getObjectId()).getData();
+ if(null != upWarnMsgOperationInfoVo){
+ warn.setTreatmentUser(upWarnMsgOperationInfoVo.getOperator());
+ warn.setTreatmentTime(LocalDateTime.ofEpochSecond(upWarnMsgOperationInfoVo.getCreateTime(), 0, ZoneOffset.ofHours(8)).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ switch (upWarnMsgOperationInfoVo.getMethod()) {
+ case 0x01:
+ warn.setTreatmentRemark("快速拍照");
+ break;
+ case 0x02:
+ warn.setTreatmentRemark("语音下发");
+ break;
+ case 0x03:
+ warn.setTreatmentRemark("不做处理");
+ break;
+ case 0x04:
+ warn.setTreatmentRemark("其他");
+ break;
+ default:
+ warn.setTreatmentRemark("其他");
+ break;
+ }
+ }
+ }
warn.setCreateTime(LocalDateTime.now());
warn.setObjectId(vo.getInfoId());
warn.setVehicleNumber(vo.getVehicleNo());
+ warn.setPicUrl(vo.getPicUrl());
warns.add(warn);
}
if (warns.size() > 0) {
@@ -141,6 +183,11 @@
}
Optional<Car> optional1 = carList.stream().filter(s -> s.getVehicleNumber().equals(warn.getVehicleNumber())).findFirst();
if (optional1.isPresent()) {
+ Car car = optional1.get();
+ if(car.getOperateType().equals("出租车") && "疲劳驾驶报警".equals(warn.getWarnType())){
+ this.removeById(warn.getId());
+ continue;
+ }
warn.setCarId(optional1.get().getId());
this.updateById(warn);
}
@@ -154,8 +201,14 @@
public void taskUpdateWarnStatus() {
List<Warn> warnList = this.list(new LambdaQueryWrapper<Warn>().eq(Warn::getTreatmentState, "处理中"));
for (Warn warn : warnList) {
+ if(null == warn.getObjectId()){
+ continue;
+ }
UPWarnMsgAdptInfoVo vo = upWarnMsgAdptInfoClient.findByInfoId(warn.getObjectId()).getData();
- if (null != vo && null != warn && vo.getResult() != 0x00) {
+ if(null == vo){
+ continue;
+ }
+ if (null != warn && vo.getResult() != 0x00) {
switch (vo.getResult()) {
case 0x00:
warn.setTreatmentState("处理中");
@@ -170,8 +223,35 @@
warn.setTreatmentState("将来处理");
break;
}
- this.updateById(warn);
}
+ if(null == warn.getPicUrl()){
+ warn.setPicUrl(vo.getPicUrl());
+ }
+ if(0x00 != vo.getResult()){
+ UPWarnMsgOperationInfoVo upWarnMsgOperationInfoVo = upWarnMsgOperationInfoClient.getUPWarnMsgOperationInfo(warn.getObjectId()).getData();
+ if(null != upWarnMsgOperationInfoVo){
+ warn.setTreatmentUser(upWarnMsgOperationInfoVo.getOperator());
+ warn.setTreatmentTime(LocalDateTime.ofEpochSecond(upWarnMsgOperationInfoVo.getCreateTime(), 0, ZoneOffset.ofHours(8)).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ switch (upWarnMsgOperationInfoVo.getMethod()) {
+ case 0x01:
+ warn.setTreatmentRemark("快速拍照");
+ break;
+ case 0x02:
+ warn.setTreatmentRemark("语音下发");
+ break;
+ case 0x03:
+ warn.setTreatmentRemark("不做处理");
+ break;
+ case 0x04:
+ warn.setTreatmentRemark("其他");
+ break;
+ default:
+ warn.setTreatmentRemark("其他");
+ break;
+ }
+ }
+ }
+ this.updateById(warn);
}
}
@@ -186,10 +266,37 @@
@Override
public PageInfo<CarWarnListResp> getCarWarnList(CarWarnListReq carWarnListReq) {
PageInfo<CarWarnListResp> pageInfo = new PageInfo<>(carWarnListReq.getPageCurr(), carWarnListReq.getPageSize());
+ String warnType = carWarnListReq.getWarnType();
+ 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);
}
-
-
+
+
+ /**
+ * 获取所有报警数据
+ * @param carWarnListReq
+ * @return
+ */
+ @Override
+ public List<Warn> getAllCarWarnList(CarWarnListReq carWarnListReq) {
+ return this.baseMapper.getAllCarWarnList(carWarnListReq);
+ }
+
/**
* 获取预警汇总统计最高的10类报警数据
*
@@ -204,7 +311,10 @@
}
if (!collect.isEmpty()) {
List<Map<String, Object>> warnGroupCount = this.baseMapper.getWarnGroupCount(collect);
- list.addAll(warnGroupCount);
+ Integer num = Integer.valueOf(warnGroupCount.get(0).get("num").toString());
+ if(num > 0){
+ list.addAll(warnGroupCount);
+ }
}
return list;
}
@@ -219,4 +329,24 @@
public List<Map<String, Object>> getWarnGroupCountTop10() {
return this.baseMapper.getWarnGroupCountTop10();
}
+
+
+ /**
+ * 获取根据车辆类型的报警汇总数据
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> getAllWarnGroupVehicleType() {
+ List<Map<String, Object>> allWarnGroupVehicleType = this.baseMapper.getAllWarnGroupVehicleType();
+ for (Map<String, Object> map : allWarnGroupVehicleType) {
+ Integer total = Integer.valueOf(map.get("total").toString());
+ Integer processed = Integer.valueOf(map.get("processed").toString());
+ if(total == 0){
+ map.put("rate", BigDecimal.ZERO);
+ }else{
+ map.put("rate", new BigDecimal(processed).divide(new BigDecimal(total), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN));
+ }
+ }
+ return allWarnGroupVehicleType;
+ }
}
--
Gitblit v1.7.1