优化报警

puzhibing

2025-05-30 4ad32c37e3317fb6cb7cbfb034b53d3220c27db4

优化报警

 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);
    }

 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/util/mqtt/MqttInit.java

@@ -25,6 +25,6 @@


    public void subscribeAllTopics() {
        messageDrivenChannelAdapter.addTopic("artemis/event_msa_alarm/5201154049/admin", "artemis/event_msa_pic/5201301505/admin");
        messageDrivenChannelAdapter.addTopic("artemis/event_msa_alarm/5201154049/admin");
    }
}