09b2f95d 张雷

fix(datafill): 修复水质数据为空时的处理逻辑

- 对 codMap、nh3nMap、tpMap、tnMap 和 phMap 进行空值检查
- 当这些映射对象为空时,设置默认值为 "0"
- 优化了代码结构,提高了代码的健壮性和可读性
1 个父辈 b390f8b6
......@@ -276,21 +276,56 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
outVO.setParentId(parentId);
outVO.setParentName(departMap.get(parentId));
}
outVO.setCodUpper(codMap.getOrDefault("upper","0"));
outVO.setCodLower(codMap.getOrDefault("lower","0"));
outVO.setCodAbnormal("0");
outVO.setNh3Upper(nh3nMap.getOrDefault("upper","0"));
outVO.setNh3Lower(nh3nMap.getOrDefault("lower","0"));
outVO.setNh3Abnormal("0");
outVO.setTpUpper(tpMap.getOrDefault("upper","0"));
outVO.setTpLower(tpMap.getOrDefault("lower","0"));
outVO.setTpAbnormal("0");
outVO.setTnUpper(tnMap.getOrDefault("upper","0"));
outVO.setTnLower(tnMap.getOrDefault("lower","0"));
outVO.setTnAbnormal("0");
outVO.setPhUpper(phMap.getOrDefault("upper","0"));
outVO.setPhLower(phMap.getOrDefault("lower","0"));
outVO.setPhAbnormal("0");
if(codMap!=null) {
outVO.setCodUpper(codMap.getOrDefault("upper","0"));
outVO.setCodLower(codMap.getOrDefault("lower","0"));
outVO.setCodAbnormal("0");
}else {
outVO.setCodUpper("0");
outVO.setCodLower("0");
outVO.setCodAbnormal("0");
}
if(nh3nMap!=null) {
outVO.setNh3Upper(nh3nMap.getOrDefault("upper","0"));
outVO.setNh3Lower(nh3nMap.getOrDefault("lower","0"));
outVO.setNh3Abnormal("0");
}else {
outVO.setNh3Upper("0");
outVO.setNh3Lower("0");
outVO.setNh3Abnormal("0");
}
if(tpMap!=null) {
outVO.setTpUpper(tpMap.getOrDefault("upper","0"));
outVO.setTpLower(tpMap.getOrDefault("lower","0"));
outVO.setTpAbnormal("0");
}else {
outVO.setTpUpper("0");
outVO.setTpLower("0");
outVO.setTpAbnormal("0");
}
if(tnMap!=null) {
outVO.setTnUpper(tnMap.getOrDefault("upper","0"));
outVO.setTnLower(tnMap.getOrDefault("lower","0"));
outVO.setTnAbnormal("0");
}else {
outVO.setTnUpper("0");
outVO.setTnLower("0");
outVO.setTnAbnormal("0");
}
if(phMap!=null) {
outVO.setPhUpper(phMap.getOrDefault("upper","0"));
outVO.setPhLower(phMap.getOrDefault("lower","0"));
outVO.setPhAbnormal("0");
}else {
outVO.setPhUpper("0");
outVO.setPhLower("0");
outVO.setPhAbnormal("0");
}
if(ConvertUtils.isNotEmpty(dataMap.get("time"))){
Date date = new Date(Long.parseLong(dataMap.get("time").toString()) * 1000);
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!