09b2f95d 张雷

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

- 对 codMap、nh3nMap、tpMap、tnMap 和 phMap 进行空值检查
- 当这些映射对象为空时,设置默认值为 "0"
- 优化了代码结构,提高了代码的健壮性和可读性
1 个父辈 b390f8b6
...@@ -276,21 +276,56 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -276,21 +276,56 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
276 outVO.setParentId(parentId); 276 outVO.setParentId(parentId);
277 outVO.setParentName(departMap.get(parentId)); 277 outVO.setParentName(departMap.get(parentId));
278 } 278 }
279
280 if(codMap!=null) {
279 outVO.setCodUpper(codMap.getOrDefault("upper","0")); 281 outVO.setCodUpper(codMap.getOrDefault("upper","0"));
280 outVO.setCodLower(codMap.getOrDefault("lower","0")); 282 outVO.setCodLower(codMap.getOrDefault("lower","0"));
281 outVO.setCodAbnormal("0"); 283 outVO.setCodAbnormal("0");
284 }else {
285 outVO.setCodUpper("0");
286 outVO.setCodLower("0");
287 outVO.setCodAbnormal("0");
288 }
289
290 if(nh3nMap!=null) {
282 outVO.setNh3Upper(nh3nMap.getOrDefault("upper","0")); 291 outVO.setNh3Upper(nh3nMap.getOrDefault("upper","0"));
283 outVO.setNh3Lower(nh3nMap.getOrDefault("lower","0")); 292 outVO.setNh3Lower(nh3nMap.getOrDefault("lower","0"));
284 outVO.setNh3Abnormal("0"); 293 outVO.setNh3Abnormal("0");
294 }else {
295 outVO.setNh3Upper("0");
296 outVO.setNh3Lower("0");
297 outVO.setNh3Abnormal("0");
298 }
299
300 if(tpMap!=null) {
285 outVO.setTpUpper(tpMap.getOrDefault("upper","0")); 301 outVO.setTpUpper(tpMap.getOrDefault("upper","0"));
286 outVO.setTpLower(tpMap.getOrDefault("lower","0")); 302 outVO.setTpLower(tpMap.getOrDefault("lower","0"));
287 outVO.setTpAbnormal("0"); 303 outVO.setTpAbnormal("0");
304 }else {
305 outVO.setTpUpper("0");
306 outVO.setTpLower("0");
307 outVO.setTpAbnormal("0");
308 }
309
310 if(tnMap!=null) {
288 outVO.setTnUpper(tnMap.getOrDefault("upper","0")); 311 outVO.setTnUpper(tnMap.getOrDefault("upper","0"));
289 outVO.setTnLower(tnMap.getOrDefault("lower","0")); 312 outVO.setTnLower(tnMap.getOrDefault("lower","0"));
290 outVO.setTnAbnormal("0"); 313 outVO.setTnAbnormal("0");
314 }else {
315 outVO.setTnUpper("0");
316 outVO.setTnLower("0");
317 outVO.setTnAbnormal("0");
318 }
319
320 if(phMap!=null) {
291 outVO.setPhUpper(phMap.getOrDefault("upper","0")); 321 outVO.setPhUpper(phMap.getOrDefault("upper","0"));
292 outVO.setPhLower(phMap.getOrDefault("lower","0")); 322 outVO.setPhLower(phMap.getOrDefault("lower","0"));
293 outVO.setPhAbnormal("0"); 323 outVO.setPhAbnormal("0");
324 }else {
325 outVO.setPhUpper("0");
326 outVO.setPhLower("0");
327 outVO.setPhAbnormal("0");
328 }
294 if(ConvertUtils.isNotEmpty(dataMap.get("time"))){ 329 if(ConvertUtils.isNotEmpty(dataMap.get("time"))){
295 Date date = new Date(Long.parseLong(dataMap.get("time").toString()) * 1000); 330 Date date = new Date(Long.parseLong(dataMap.get("time").toString()) * 1000);
296 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 331 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!