src/main/java/com/whyc/pojo/db_alarm/DevalarmDataYear.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/util/SubTablePageInfoUtil.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/pojo/db_alarm/DevalarmDataYear.java
@@ -42,6 +42,9 @@ @ApiModelProperty(value = "告警ID") private Integer almId; @TableField(exist = false) private String almName; @ApiModelProperty(value = "告警类型【1-上限告警 2-下限告警】") private Integer almSignalId; src/main/java/com/whyc/util/SubTablePageInfoUtil.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.whyc.constant.DevAlmEnum; import com.whyc.dto.DalmDto; import com.whyc.factory.ThreadPoolExecutorFactory; import com.whyc.mapper.CommonMapper; @@ -117,6 +118,8 @@ int uid=year.getConfirmedUid(); DevInf dinf=dinfService.getDinfByDevId(devId); UserInf uinf=uinfService.getUinfByUId(uid); int almId=year.getAlmId(); year.setAlmName(DevAlmEnum.getValue(almId)); year.setDevInf(dinf); year.setConfirmedUname(uinf!=null?uinf.getUname():""); }