diff --git a/src/main/java/com/xydl/cac/model/SanbizhiModel.java b/src/main/java/com/xydl/cac/model/SanbizhiModel.java index 56065df..f69ccf0 100644 --- a/src/main/java/com/xydl/cac/model/SanbizhiModel.java +++ b/src/main/java/com/xydl/cac/model/SanbizhiModel.java @@ -25,17 +25,17 @@ public class SanbizhiModel { while (it.hasNext()) { String key = it.next(); Object value = map.get(key); - String name = key.toLowerCase(); + String name = key.toLowerCase().replace("ppm", ""); if (value != null) { - if (name.contains("c2h2")) { + if (name.equals("c2h2")) { c2h2 = Float.parseFloat(value.toString()); - } else if (name.contains("c2h4")) { + } else if (name.equals("c2h4")) { c2h4 = Float.parseFloat(value.toString()); - } else if (name.contains("ch4")) { + } else if (name.equals("ch4")) { ch4 = Float.parseFloat(value.toString()); - } else if (name.contains("h2")) { + } else if (name.equals("h2")) { h2 = Float.parseFloat(value.toString()); - } else if (name.contains("c2h6")) { + } else if (name.equals("c2h6")) { c2h6 = Float.parseFloat(value.toString()); } }