添加告警名称

whyclxw

2025-06-04 52e7490e08cd4b591d8f81d9330b57ab5070773a

添加告警名称

 src/main/java/com/whyc/constant/BattAlarmIdEnum.java

@@ -4,34 +4,13 @@
import java.util.Map;

public enum BattAlarmIdEnum {
    ALARM_1(1,"在线电压上上限告警"),
    ALARM_2(2,"在线电压上限告警"),
    ALARM_3(3,"在线电压下限告警"),
    ALARM_4(4,"在线电压下下限告警"),
    ALARM_5(5,"组端电压上上限告警"),
    ALARM_6(6,"组端电压上限告警"),
    ALARM_7(7,"组端电压下限告警"),
    ALARM_8(8,"组端电压下下限告警"),
    ALARM_9(9,"充电电流上上限告警"),
    ALARM_10(10,"充电电流上限告警"),
    ALARM_11(11,"充电电流下限告警"),
    ALARM_12(12,"充电电流下下限告警"),
    ALARM_13(13,"放电电流上上限告警"),
    ALARM_14(14,"放电电流上限告警"),
    ALARM_15(15,"放电电流下限告警"),
    ALARM_16(16,"放电电流下下限告警"),
    ALARM_17(17,"单体电压上上限告警"),
    ALARM_18(18,"单体电压上限告警"),
    ALARM_19(19,"单体电压下限告警"),
    ALARM_20(20,"单体电压下下限告警"),
    ALARM_21(21,"单体温度上上限告警"),
    ALARM_22(22,"单体温度上限告警"),
    ALARM_23(23,"单体温度下限告警"),
    ALARM_24(24,"单体温度下下限告警"),
    ALARM_25(25,"单体内阻上上限告警"),
    ALARM_26(26,"单体内阻上限告警"),
    ALARM_27(27,"单体内阻下限告警"),
    ALARM_28(28,"单体内阻下下限告警"),
    ALARM_119001(119001,"在线电压告警"),
    ALARM_119002(119002,"组端电压告警"),
    ALARM_119003(119003,"充电电流告警"),
    ALARM_119004(119004,"放电电流告警"),
    ALARM_119005(119005,"单体电压告警"),
    ALARM_119006(119006,"单体温度告警"),
    ALARM_119007(119007,"单体内阻告警")
    ;

    private Integer stateId;
@@ -61,4 +40,12 @@
        }
        return null;
    }
    public static Map<Integer,String> getOpInfo() {
        Map<Integer,String> map=new HashMap<>();
        for (BattAlarmIdEnum logOpEnum : BattAlarmIdEnum.values()) {
            map.put(logOpEnum.getStateId(),logOpEnum.getStateName());
        }
        return map;
    }

}

 src/main/java/com/whyc/constant/BattSingalIdEnum.java

@@ -1,16 +1,34 @@
package com.whyc.constant;

import java.util.HashMap;
import java.util.Map;

public enum BattSingalIdEnum {
    ALARM_119001(119001,"在线电压告警"),
    ALARM_119002(119002,"组端电压告警"),
    ALARM_119003(119003,"充电电流告警"),
    ALARM_119004(119004,"放电电流告警"),
    ALARM_119005(119005,"单体电压告警"),
    ALARM_119006(119006,"单体温度告警"),
    ALARM_119007(119007,"单体内阻告警")
    ALARM_1(1,"在线电压上上限告警"),
    ALARM_2(2,"在线电压上限告警"),
    ALARM_3(3,"在线电压下限告警"),
    ALARM_4(4,"在线电压下下限告警"),
    ALARM_5(5,"组端电压上上限告警"),
    ALARM_6(6,"组端电压上限告警"),
    ALARM_7(7,"组端电压下限告警"),
    ALARM_8(8,"组端电压下下限告警"),
    ALARM_9(9,"充电电流上上限告警"),
    ALARM_10(10,"充电电流上限告警"),
    ALARM_11(11,"充电电流下限告警"),
    ALARM_12(12,"充电电流下下限告警"),
    ALARM_13(13,"放电电流上上限告警"),
    ALARM_14(14,"放电电流上限告警"),
    ALARM_15(15,"放电电流下限告警"),
    ALARM_16(16,"放电电流下下限告警"),
    ALARM_17(17,"单体电压上上限告警"),
    ALARM_18(18,"单体电压上限告警"),
    ALARM_19(19,"单体电压下限告警"),
    ALARM_20(20,"单体电压下下限告警"),
    ALARM_21(21,"单体温度上上限告警"),
    ALARM_22(22,"单体温度上限告警"),
    ALARM_23(23,"单体温度下限告警"),
    ALARM_24(24,"单体温度下下限告警"),
    ALARM_25(25,"单体内阻上上限告警"),
    ALARM_26(26,"单体内阻上限告警"),
    ALARM_27(27,"单体内阻下限告警"),
    ALARM_28(28,"单体内阻下下限告警"),
    ;

    private Integer stateId;
@@ -40,12 +58,4 @@
        }
        return null;
    }
    public static Map<Integer,String> getOpInfo() {
        Map<Integer,String> map=new HashMap<>();
        for (BattSingalIdEnum logOpEnum : BattSingalIdEnum.values()) {
            map.put(logOpEnum.getStateId(),logOpEnum.getStateName());
        }
        return map;
    }

}

 src/main/java/com/whyc/constant/PowerAlarmEnum.java

@@ -181,4 +181,12 @@
        }
        return null;
    }

    public static Map<Integer,String> getOpInfo() {
        Map<Integer,String> map=new HashMap<>();
        for (PowerAlarmEnum logOpEnum : PowerAlarmEnum.values()) {
            map.put(logOpEnum.getStateId(),logOpEnum.getStateName());
        }
        return map;
    }
}

 src/main/java/com/whyc/controller/ConditionController.java

@@ -29,6 +29,12 @@
    private BattalarmDataService  almDataService;

    @Autowired
    private DevalarmDataService  devAlmService;

    @Autowired
    private PwrdevAlarmService  pwrAlmService;

    @Autowired
    private DeviceStateService  deviceStateService;

    @Autowired
@@ -141,9 +147,20 @@
    }

    @ApiOperation(value = "获取电池告警类型(下拉)")
    @GetMapping("getSingalIdIdType")
    public Response getSingalIdIdType(){
        return almDataService.getSingalIdType();
    @GetMapping("getAlarmIdType")
    public Response getAlarmIdType(){
        return almDataService.getAlarmIdType();
    }

    @ApiOperation(value = "获取设备告警类型(下拉)")
    @GetMapping("getDevAlmIdType")
    public Response getDevAlmIdType(){
        return devAlmService.getDevAlmIdType();
    }
    @ApiOperation(value = "获取电源告警类型(下拉)")
    @GetMapping("getPwrAlmIdType")
    public Response getPwrAlmIdType(){
        return pwrAlmService.getPwrAlmIdType();
    }

    @ApiOperation(value = "获取设备工作类型(下拉)")

 src/main/java/com/whyc/pojo/db_alarm/BattalarmData.java

@@ -45,6 +45,9 @@
    @ApiModelProperty(value = "告警类型")
    private Integer almSignalId;

    @TableField(exist = false)
    private String almName;

    @ApiModelProperty(value = "告警等级")
    private Integer almLevel;


 src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java

@@ -42,6 +42,9 @@
    @ApiModelProperty(value = "告警ID")
    private Integer almId;

    @TableField(exist = false)
    private String almName;

    @ApiModelProperty(value = "告警等级")
    private Integer almLevel;


 src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java

@@ -39,6 +39,9 @@
    @ApiModelProperty(value = "告警ID")
    private Integer almId;

    @TableField(exist = false)
    private String almName;

    @ApiModelProperty(value = "告警等级")
    private Integer almLevel;


 src/main/java/com/whyc/service/BattalarmDataService.java

@@ -6,6 +6,7 @@
import com.github.pagehelper.PageInfo;
import com.whyc.constant.BattAlarmIdEnum;
import com.whyc.constant.BattSingalIdEnum;
import com.whyc.constant.DevAlarmEnum;
import com.whyc.dto.Real.AlmDto;
import com.whyc.dto.Response;
import com.whyc.mapper.BattalarmDataMapper;
@@ -16,7 +17,6 @@

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -28,6 +28,9 @@
    public Response getBattAlmReal(AlmDto almDto) {
        PageHelper.startPage(almDto.getPageNum(),almDto.getPageSize());
        List<BattalarmData> list=mapper.getBattAlmReal(almDto);
        list.forEach(data->{
            data.setAlmName(BattSingalIdEnum.getValue(data.getAlmSignalId()));
        });
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list!=null,pageInfo,"获取电池组实时告警信息");
    }
@@ -51,8 +54,8 @@
        return list!=null?list.size():0;
    }
    //获取电池告警类型(下拉)
    public Response getSingalIdType() {
       Map<Integer,String> map= BattSingalIdEnum.getOpInfo();
    public Response getAlarmIdType() {
       Map<Integer,String> map= BattAlarmIdEnum.getOpInfo();
       return new Response().setII(1,true,map,"获取电池告警类型(下拉)");
    }
}

 src/main/java/com/whyc/service/DevalarmDataService.java

@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.constant.BattAlarmIdEnum;
import com.whyc.constant.BattSingalIdEnum;
import com.whyc.constant.DevAlarmEnum;
import com.whyc.dto.Real.AlmDto;
import com.whyc.dto.Response;
import com.whyc.mapper.DevalarmDataMapper;
import com.whyc.pojo.db_alarm.BattalarmData;
import com.whyc.pojo.db_alarm.DevalarmData;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +18,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;

@Service
public class DevalarmDataService {
@@ -25,6 +28,9 @@
    public Response getDevAlmReal(AlmDto almDto) {
        PageHelper.startPage(almDto.getPageNum(),almDto.getPageSize());
        List<DevalarmData> list=mapper.getDevAlmReal(almDto);
        list.forEach(data->{
            data.setAlmName(DevAlarmEnum.getValue(data.getAlmId()));
        });
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list!=null,pageInfo,"获取设备实时告警信息");
    }
@@ -47,4 +53,9 @@
        List<DevalarmData> list=mapper.selectList(wrapper);
        return list!=null?list.size():0;
    }
    //获取设备告警类型(下拉)
    public Response getDevAlmIdType() {
        Map<Integer,String> map= DevAlarmEnum.getOpInfo();
        return new Response().setII(1,true,map,"获取设备告警类型(下拉)");
    }
}

 src/main/java/com/whyc/service/DeviceStateService.java

@@ -3,13 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.constant.BattSingalIdEnum;
import com.whyc.constant.DevStateEnum;
import com.whyc.dto.Response;
import com.whyc.dto.Statistic.DeviceStateStic;
import com.whyc.mapper.DeviceStateMapper;
import com.whyc.pojo.db_batt_testdata.BatttestdataInf;
import com.whyc.pojo.db_ram_db.BattRtstate;
import com.whyc.pojo.db_ram_db.DeviceState;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

 src/main/java/com/whyc/service/PwrdevAlarmService.java

@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.constant.DevAlarmEnum;
import com.whyc.constant.PowerAlarmEnum;
import com.whyc.dto.Real.AlmDto;
import com.whyc.dto.Response;
import com.whyc.mapper.PwrdevAlarmMapper;
@@ -16,6 +18,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;

@Service
public class PwrdevAlarmService {
@@ -25,6 +28,9 @@
    public Response getPwrAlmReal(AlmDto almDto) {
        PageHelper.startPage(almDto.getPageNum(),almDto.getPageSize());
        List<PwrdevAlarm> list=mapper.getPwrAlmReal(almDto);
        list.forEach(data->{
            data.setAlmName(PowerAlarmEnum.getValue(data.getAlmId()));
        });
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list!=null,pageInfo,"获取电源实时告警信息");
    }
@@ -47,4 +53,9 @@
        List<DevalarmData> list=mapper.selectList(wrapper);
        return list!=null?list.size():0;
    }
    //获取电源告警类型(下拉)
    public Response getPwrAlmIdType() {
        Map<Integer,String> map= PowerAlarmEnum.getOpInfo();
        return new Response().setII(1,true,map,"获取设备告警类型(下拉)");
    }
}