whyclxw
2024-09-12 cd3954fe19e320856894bef2c21b565ace05451d
实时告警历史告警加确认人
6个文件已修改
47 ■■■■ 已修改文件
src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_alarm/DevalarmDataYear.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/DevInfService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/DevalarmDataService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/UserInfService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/util/SubTablePageInfoUtil.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java
@@ -58,6 +58,9 @@
    @ApiModelProperty(value = "确认用户ID")
    private Integer confirmedUid;
    @TableField(exist = false)
    private String confirmedUname;
    @ApiModelProperty(value = "确认时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date confirmedTime;
src/main/java/com/whyc/pojo/db_alarm/DevalarmDataYear.java
@@ -58,6 +58,9 @@
    @ApiModelProperty(value = "确认用户ID")
    private Integer confirmedUid;
    @TableField(exist = false)
    private String confirmedUname;
    @ApiModelProperty(value = "确认时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date confirmedTime;
src/main/java/com/whyc/service/DevInfService.java
@@ -238,4 +238,13 @@
        return map;
    }
    //根据devId获取设备信息
    public DevInf getDinfByDevId(int devId){
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("dev_id",devId);
        wrapper.last("limit 1");
        DevInf dinf=mapper.selectOne(wrapper);
        return dinf;
    }
}
src/main/java/com/whyc/service/DevalarmDataService.java
@@ -28,11 +28,18 @@
    @Autowired(required = false)
    private SubTablePageInfoUtil service;
    @Autowired(required = false)
    private UserInfService uinfService;
    //获取设备告警信息
    public Response getDAlmInf(int uid, DalmDto dto) {
        PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
        dto.setUid(uid);
        List<DevalarmData> list=mapper.getDAlmInf(dto);
        for (DevalarmData data:list) {
            UserInf uinf=uinfService.getUinfByUId(data.getConfirmedUid());
            data.setConfirmedUname(uinf!=null?uinf.getUname():"");
        }
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list!=null,pageInfo,"获取设备告警信息");
    }
src/main/java/com/whyc/service/UserInfService.java
@@ -7,6 +7,7 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.UserInfMapper;
import com.whyc.pojo.db_lithium_ram_db.DevInf;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.util.MD5Util;
import com.whyc.util.RSAUtil;
@@ -232,4 +233,12 @@
        List<UserInf> list=mapper.selectList(wrapper);
        return new Response().setII(1,list!=null,list,"查询所有用户信息(不分页用于包机组)");
    }
    //根据uId获取设备信息
    public UserInf getUinfByUId(int uId){
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("uid",uId);
        wrapper.last("limit 1");
        UserInf uinf=mapper.selectOne(wrapper);
        return uinf;
    }
}
src/main/java/com/whyc/util/SubTablePageInfoUtil.java
@@ -8,7 +8,10 @@
import com.whyc.mapper.DevInfMapper;
import com.whyc.pojo.db_alarm.DevalarmDataYear;
import com.whyc.pojo.db_lithium_ram_db.DevInf;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.service.DevInfService;
import com.whyc.service.SubTablePageInfoService;
import com.whyc.service.UserInfService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -31,7 +34,10 @@
    private SubTablePageInfoService service;
    @Autowired(required = false)
    private DevInfMapper dinfMapper;
    private DevInfService dinfService;
    @Autowired(required = false)
    private UserInfService uinfService;
    /**按年份表分页查询*/
    public PageInfo<Object> getPageInfo(int pageNum,int pageSize,
@@ -108,11 +114,11 @@
                List<DevalarmDataYear> list =  service.getListDevAlm(dto);
               for (DevalarmDataYear year:list) {
                   int devId=year.getDevId();
                   QueryWrapper wrapper=new QueryWrapper();
                   wrapper.eq("dev_id",devId);
                   wrapper.last("limit 1");
                   DevInf dinf=dinfMapper.selectOne(wrapper);
                   int uid=year.getConfirmedUid();
                   DevInf dinf=dinfService.getDinfByDevId(devId);
                   UserInf uinf=uinfService.getUinfByUId(uid);
                   year.setDevInf(dinf);
                   year.setConfirmedUname(uinf!=null?uinf.getUname():"");
               }
                dataList.addAll(list);
            }