whycxzp
2025-03-25 af4b37529ace213471f3381c45efa2e86446660f
告警类型对应
3个文件已修改
43 ■■■■ 已修改文件
src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarmCfg.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/PowerAlarmHistoryService.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/PowerAlarmService.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarmCfg.java
@@ -6,15 +6,14 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import lombok.experimental.Accessors;
import java.io.Serializable;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName(schema ="db_power_alarm",value = "power_alarm_cfg")
@ApiModel(value="PowerAlarmCfg", description="")
@ToString
@Data
public class PowerAlarmCfg implements Serializable {
    private static final long serialVersionUID = 1L;
@@ -29,6 +28,6 @@
    @TableField("alm_name")
    @ApiModelProperty("告警名称")
    private Integer almName;
    private String almName;
}
src/main/java/com/whyc/service/PowerAlarmHistoryService.java
@@ -2,6 +2,8 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.pojo.db_power_alarm.PowerAlarm;
import com.whyc.pojo.db_power_alarm.PowerAlarmCfg;
import com.whyc.pojo.db_power_alarm.PowerAlarmHistory;
import com.whyc.util.SubTablePageInfoUtil;
import com.whyc.util.ThreadLocalUtil;
@@ -9,11 +11,15 @@
import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.util.List;
@Service
public class PowerAlarmHistoryService {
    @Autowired
    private SubTablePageInfoUtil util;
    @Autowired
    private PowerAlarmCfgService cfgService;
    //查询电源历史时间告警
    public Response getHisPage(Integer almLevel, String startTime, String endTime, int pageNum, int pageSize) throws ParseException {
@@ -21,6 +27,17 @@
        his.setAlmLevel(almLevel);
        PageInfo pageInfo=util.getPageInfo(pageNum,pageSize, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1)
                ,"db_power_alarm","power_alarm_history",his);
        return new Response().setII(1,pageInfo.getList()!=null,pageInfo,"查询历史-分页");
        List<PowerAlarm> list = pageInfo.getList();
        List<PowerAlarmCfg> cfgList = cfgService.getList();
        list.stream().forEach(item->{
            Integer almId = item.getAlmId();
            for (int i = 0; i < cfgList.size(); i++) {
                if(almId.intValue() == cfgList.get(i).getAlmId()){
                    item.setAlmName(cfgList.get(i).getAlmName());
                    break;
                }
            }
        });
        return new Response().setII(1, list !=null,pageInfo,"查询历史-分页");
    }
}
src/main/java/com/whyc/service/PowerAlarmService.java
@@ -6,7 +6,9 @@
import com.whyc.dto.Response;
import com.whyc.mapper.PowerAlarmMapper;
import com.whyc.pojo.db_alarm.BattAlarm;
import com.whyc.pojo.db_param.BattAlarmCfg;
import com.whyc.pojo.db_power_alarm.PowerAlarm;
import com.whyc.pojo.db_power_alarm.PowerAlarmCfg;
import com.whyc.util.ActionUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +22,9 @@
    @Autowired(required = false)
    private PowerAlarmMapper mapper;
    @Autowired(required = false)
    private PowerAlarmCfgService cfgService;
    /*
     在用电源实时推送告警信息
     **/
@@ -32,6 +37,16 @@
        PageHelper.startPage(pageNum,pageSize);
        List<PowerAlarm> list=mapper.getList(almLevel, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1));
        PageInfo pageInfo=new PageInfo(list);
        List<PowerAlarmCfg> cfgList = cfgService.getList();
        list.stream().forEach(item->{
            Integer almId = item.getAlmId();
            for (int i = 0; i < cfgList.size(); i++) {
                if(almId.intValue() == cfgList.get(i).getAlmId()){
                    item.setAlmName(cfgList.get(i).getAlmName());
                    break;
                }
            }
        });
        return new Response().setII(1,list!=null,pageInfo,"查询-分页");
    }
    //确认告警