From 5f23f3f003b4d4f8528bc1f5832da4a55c65729d Mon Sep 17 00:00:00 2001 From: huangfeng Date: Wed, 4 Jun 2025 15:11:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BC=82=E5=B8=B8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xydl/cac/model/SanbizhiModel.java | 23 +++++++++++-------- .../cac/service/impl/NSensorServiceImpl.java | 6 ++++- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/xydl/cac/model/SanbizhiModel.java b/src/main/java/com/xydl/cac/model/SanbizhiModel.java index c392453..56065df 100644 --- a/src/main/java/com/xydl/cac/model/SanbizhiModel.java +++ b/src/main/java/com/xydl/cac/model/SanbizhiModel.java @@ -24,17 +24,20 @@ public class SanbizhiModel { Iterator it = map.keySet().iterator(); while (it.hasNext()) { String key = it.next(); + Object value = map.get(key); String name = key.toLowerCase(); - if (name.contains("c2h2")) { - c2h2 = Float.parseFloat(map.get(key).toString()); - } else if (name.contains("c2h4")) { - c2h4 = Float.parseFloat(map.get(key).toString()); - } else if (name.contains("ch4")) { - ch4 = Float.parseFloat(map.get(key).toString()); - } else if (name.contains("h2")) { - h2 = Float.parseFloat(map.get(key).toString()); - } else if (name.contains("c2h6")) { - c2h6 = Float.parseFloat(map.get(key).toString()); + if (value != null) { + if (name.contains("c2h2")) { + c2h2 = Float.parseFloat(value.toString()); + } else if (name.contains("c2h4")) { + c2h4 = Float.parseFloat(value.toString()); + } else if (name.contains("ch4")) { + ch4 = Float.parseFloat(value.toString()); + } else if (name.contains("h2")) { + h2 = Float.parseFloat(value.toString()); + } else if (name.contains("c2h6")) { + c2h6 = Float.parseFloat(value.toString()); + } } } if (c2h2 == null || c2h4 == null || ch4 == null || h2 == null || c2h6 == null) { diff --git a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java index d29a09e..8526cb5 100644 --- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java @@ -215,7 +215,11 @@ public class NSensorServiceImpl implements NSensorService { if (result.getContent() != null) { for (Map map : result.getContent()) { SanbizhiModel sanbizhi = new SanbizhiModel(); - sanbizhi.build(map); + try { + sanbizhi.build(map); + } catch (Exception ignore) { + sanbizhi.setStatus("有异常数据"); + } map.put("sanbizhi", sanbizhi); } }