Kaynağa Gözat

修复 新普惠气象设备获取预警配置报错的问题

zhaiyifei 9 ay önce
ebeveyn
işleme
0ade08bd1e

+ 2 - 1
src/main/java/com/yunfeiyun/agmp/iot/common/enums/EnumYfQxzElement.java

@@ -82,7 +82,8 @@ public enum EnumYfQxzElement {
     TYPE73("211","电导率","mS/cm"),
     TYPE74("220","土壤电导率","mS/cm")/*新浦会-土壤水势*/,
     TYPE75("277","土壤水势","KPa")/*新浦会-土壤水势,  跟201重复了,废弃201 */,
-    TYPE223("223","溶解氧","mg/L");
+    TYPE223("223","溶解氧","mg/L"),
+    TYPE178("178","电导率","mS/cm");
 
     private String eNum;
     private String cName;

+ 3 - 0
src/main/java/com/yunfeiyun/agmp/iot/common/util/dev/QxElementTypeUtil.java

@@ -6,6 +6,9 @@ public class QxElementTypeUtil {
     public static String getTypeName(String eNum){
         String typeName = null;
         EnumYfQxzElement element = EnumYfQxzElement.findEnumByeNum(eNum);
+        if(element == null){
+            return null;
+        }
         switch (element){
             case TYPE7:
             case TYPE32: