优化功能

Pu Zhibing

2025-05-30 ba7d9b39ade09fc8d68ccec8cb22578cd7453a2f

优化功能

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CarController.java

@@ -305,6 +305,9 @@
                car.setLatitude(new BigDecimal(gnssDataVo.getLat()).divide(new BigDecimal(1000000)).toString());
                car.setSpeed(gnssDataVo.getVec1());
            }
            Enterprise enterprise = enterpriseService.getById(car.getEnterpriseId());
            car.setEnterpriseName(enterprise.getName());
            car.setCompanyCode(enterprise.getCode());
        }
        return R.ok(list);
    }

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/query/CarWarnListReq.java

@@ -5,6 +5,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author zhibing.pu
 * @Date 2025/3/27 14:40
@@ -14,6 +16,8 @@
public class CarWarnListReq extends BasePage {
    @ApiModelProperty(value = "预警类型")
    private String warnType;
    @ApiModelProperty(value = "预警类型")
    private List<String> warnTypes;
    @ApiModelProperty(value = "车辆类型")
    private String carType;
    @ApiModelProperty(value = "车辆号牌")

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java

@@ -28,10 +28,7 @@
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.*;


/**
@@ -198,6 +195,21 @@
    @Override
    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;
        }
        return this.baseMapper.getCarWarnList(pageInfo, carWarnListReq);
    }


 ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/WarnMapper.xml

@@ -27,8 +27,11 @@
        left join t_driver c on (a.driver_id = c.id)
        left join t_enterprise d on (a.enterprise_id = d.id)
        <where>
            <if test="null != item.warnType and '' != item.warnType">
                and a.warn_type = #{item.warnType}
            <if test="null != item.warnTypes and warnTypes.size() > 0">
                and a.warn_type in
                <foreach collection="warnTypes" item="item" index="index" separator="," open="(" close=")">
                    #{item}
                </foreach>
            </if>
            <if test="null != item.carType and '' != item.carType">
                and b.operate_type = #{item.carType}