Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/Gyee_Frame_NX

src/main/java/com/gyee/frame/service/Alertrule2ervice.java

@@ -257,7 +257,7 @@ public class Alertrule2ervice implements BaseService<Alertrule2, Alertrule2Examp
             return null;
 
         Alertrule2 rule = rules.get(0);
-        String expression = "[AI,DI](.{4})";
+        String expression = "(([A][I])|([D][I]))([0-9]+)";
         List<String> list = StringUtils.pattern(rule.getExpression(), expression);
 
         return list;