Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/yunfeiyun/agmp/iot/common/constant/devicetype/IotDeviceTypeLv1Enum.java

@@ -69,4 +69,19 @@ public enum IotDeviceTypeLv1Enum {
     public String getName() {
         return name;
     }
+
+    /**
+     * 根据code查找
+     *
+     * @param code 枚举code
+     * @return 枚举对象
+     */
+    public static IotDeviceTypeLv1Enum findEnumByCode(String code) {
+        for (IotDeviceTypeLv1Enum item : IotDeviceTypeLv1Enum.values()) {
+            if (item.getCode().equals(code)) {
+                return item;
+            }
+        }
+        return null;
+    }
 }

src/main/java/com/yunfeiyun/agmp/iot/common/enums/EnumWarnRuleOp.java

@@ -9,7 +9,7 @@ public enum EnumWarnRuleOp {
     GREATER_THAN("gt","大于",">"),
     LT_EQUAL("lte","小于等于","<="),
     GT_EQUAL("gte","大于等于",">="),
-    BETWEEN("b","介于","[min,max]")   // min<= value <= max
+    BETWEEN("between","介于","[min,max]")   // min<= value <= max
     ;
     private final String code;
     private final String name;