lxw
2023-12-14 c58e6ab34ae1cfbc8f805ec667af94bc686e5f35
历史加属性
2个文件已修改
13 ■■■■■ 已修改文件
src/main/java/com/whyc/pojo/db_ckpwrdev_break_alarm/CKPowerDevBreakAlarmHistory.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/SubTablePageInfoService.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_ckpwrdev_break_alarm/CKPowerDevBreakAlarmHistory.java
@@ -1,6 +1,7 @@
package com.whyc.pojo.db_ckpwrdev_break_alarm;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.util.Date;
@@ -29,4 +30,11 @@
    private Date almConfirmedTime;
    private Integer almClearedType;
    @TableField(exist = false)
    private String breakerType;
    @TableField(exist = false)
    private String breakerName;
    @TableField(exist = false)
    private String breakerAddr;
}
src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -171,7 +171,7 @@
    //查询break历史告警数量
    public List getListBreakAlm(BreakAlarmDto alm){
        String sql="select  breakAlarm.* from db_ckpwrdev_break_alarm." +alm.getRecordYear()+" breakAlarm,db_ckpwrdev_break_alarm.tb_ckpowerdev_break_alarm_config,db_ckpwrdev_inf.tb_breaker_inf"
        String sql="select  breakAlarm.*,breaker_type,breaker_name,breaker_addr from db_ckpwrdev_break_alarm." +alm.getRecordYear()+" breakAlarm,db_ckpwrdev_break_alarm.tb_ckpowerdev_break_alarm_config,db_ckpwrdev_inf.tb_breaker_inf"
                +" where   breakAlarm.alm_id=tb_ckpowerdev_break_alarm_config.alm_id " +
                "            and tb_ckpowerdev_break_alarm_config.break_id=tb_breaker_inf.breaker_id ";
        if(alm.getAlmStarttime()!=null){
@@ -206,6 +206,9 @@
                    ph.setAlmIsConfirmed(rs.getInt("alm_is_confirmed"));
                    ph.setAlmConfirmedTime(rs.getTimestamp("alm_confirmed_time"));
                    ph.setAlmClearedType(rs.getInt("alm_cleared_type"));
                    ph.setBreakerType(rs.getString("breaker_type"));
                    ph.setBreakerName(rs.getString("breaker_name"));
                    ph.setBreakerAddr(rs.getString("breaker_addr"));
                    list.add(ph);
                }
                return list;