whycxzp
2025-03-25 a6b7035f3f359fc47e4fc0acb9b059839cac6d67
告警类型对应
5个文件已修改
5个文件已添加
115 ■■■■■ 已修改文件
src/main/java/com/whyc/mapper/BattAlarmCfgMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/PowerAlarmCfgMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_param/BattAlarmCfg.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarm.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarmHistory.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattAlarmCfgService.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattAlarmService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/PowerAlarmCfgService.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BattAlarmCfgMapper.java
New file
@@ -0,0 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.db_param.BattAlarmCfg;
public interface BattAlarmCfgMapper extends CustomMapper<BattAlarmCfg> {
}
src/main/java/com/whyc/mapper/PowerAlarmCfgMapper.java
New file
@@ -0,0 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.db_power_alarm.PowerAlarmCfg;
public interface PowerAlarmCfgMapper extends CustomMapper<PowerAlarmCfg> {
}
src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java
@@ -73,4 +73,7 @@
    @TableField(exist = false)
    @ApiModelProperty("电源名称")
    private String powerName;
    @TableField(exist = false)
    private String almName;
}
src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
@@ -59,6 +59,9 @@
    private String powerName;
    @TableField(exist = false)
    private String almName;
    @TableField(exist = false)
    @ApiModelProperty("表名字拼接")
    private String recordYear;
src/main/java/com/whyc/pojo/db_param/BattAlarmCfg.java
New file
@@ -0,0 +1,38 @@
package com.whyc.pojo.db_param;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.ToString;
@TableName(schema = "db_alarm",value = "batt_alarm_cfg")
@ToString
public class BattAlarmCfg {
    private Integer num;
    private Integer almId;
    private String almName;
    public Integer getNum() {
        return num;
    }
    public void setNum(Integer num) {
        this.num = num;
    }
    public Integer getAlmId() {
        return almId;
    }
    public void setAlmId(Integer almId) {
        this.almId = almId;
    }
    public String getAlmName() {
        return almName;
    }
    public void setAlmName(String almName) {
        this.almName = almName;
    }
}
src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarm.java
@@ -63,4 +63,7 @@
    @TableField(exist = false)
    @ApiModelProperty("电源名称")
    private String powerName;
    @TableField(exist = false)
    private String almName;
}
src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarmHistory.java
@@ -62,6 +62,9 @@
    private String powerName;
    @TableField(exist = false)
    private String almName;
    @TableField(exist = false)
    @ApiModelProperty("表名字拼接")
    private String recordYear;
src/main/java/com/whyc/service/BattAlarmCfgService.java
New file
@@ -0,0 +1,24 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.whyc.mapper.BattAlarmCfgMapper;
import com.whyc.pojo.db_alarm.BattAlarm;
import com.whyc.pojo.db_param.BattAlarmCfg;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class BattAlarmCfgService {
    @Autowired
    private BattAlarmCfgMapper mapper;
    public List<BattAlarmCfg> getList(){
        return mapper.selectList((Wrapper<BattAlarmCfg>) ActionUtil.objeNull);
    }
}
src/main/java/com/whyc/service/BattAlarmService.java
@@ -6,6 +6,7 @@
import com.whyc.dto.Response;
import com.whyc.mapper.BattAlarmMapper;
import com.whyc.pojo.db_alarm.BattAlarm;
import com.whyc.pojo.db_param.BattAlarmCfg;
import com.whyc.util.ActionUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,9 @@
    @Autowired(required = false)
    private BattAlarmMapper mapper;
    @Autowired
    private BattAlarmCfgService cfgService;
    /*
     在用电池组实时推送告警信息
     **/
@@ -30,6 +34,8 @@
    public Response getPage(Integer almLevel, String startTime, String endTime ,int pageNum, int pageSize) {
        PageHelper.startPage(pageNum,pageSize);
        List<BattAlarm> list=mapper.getList(almLevel, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1));
        List<BattAlarmCfg> cfg = cfgService.getList();
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list!=null,pageInfo,"查询分页");
    }
src/main/java/com/whyc/service/PowerAlarmCfgService.java
New file
@@ -0,0 +1,23 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.whyc.mapper.PowerAlarmCfgMapper;
import com.whyc.pojo.db_power_alarm.PowerAlarmCfg;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class PowerAlarmCfgService {
    @Autowired
    private PowerAlarmCfgMapper mapper;
    public List<PowerAlarmCfg> getList(){
        return mapper.selectList((Wrapper<PowerAlarmCfg>) ActionUtil.objeNull);
    }
}