src/main/java/com/whyc/constant/DevAlmEnum.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/SubTablePageInfoService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/util/SubTablePageInfoUtil.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/constant/DevAlmEnum.java
@@ -25,7 +25,10 @@ return almName; } public static String getValue(int code) { public static String getValue(Integer code) { if(code==null){ return ""; } for (DevAlmEnum ele : values()) { if(ele.getAlmId().equals(code)) { return ele.getAlmName(); src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -139,6 +139,7 @@ DevalarmDataYear dataYear=new DevalarmDataYear(); dataYear.setNum(rs.getInt("num")); dataYear.setDevId(rs.getInt("dev_id")); dataYear.setAlmId(rs.getInt("alm_id")); dataYear.setAlmSignalId(rs.getInt("alm_signal_id")); dataYear.setAlmStarttime(rs.getTimestamp("alm_starttime")); dataYear.setAlmValue(rs.getFloat("alm_value")); src/main/java/com/whyc/util/SubTablePageInfoUtil.java
@@ -119,7 +119,8 @@ DevInf dinf=dinfService.getDinfByDevId(devId); UserInf uinf=uinfService.getUinfByUId(uid); int almId=year.getAlmId(); year.setAlmName(DevAlmEnum.getValue(almId)); String almName=DevAlmEnum.getValue(almId); year.setAlmName(almName!=null?almName:""); year.setDevInf(dinf); year.setConfirmedUname(uinf!=null?uinf.getUname():""); }