文件生成逻辑调整

ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/RuleItemExService.java

@@ -135,16 +135,23 @@ public class RuleItemExService extends RuleItemServiceImpl {
 
 
 
-                String strCond="";
+
+                boolean b=false;
                 for(String key : modelset.keySet()) {
-                    if(!StringUtils.isEmpty(strCond))
-                    {
-                        strCond+=",";
-                    }
-                    strCond+=key;
-                    strCond+="-";
+                    if(key.equalsIgnoreCase("datamodelname"))
+                        continue;
+                    if(key.equalsIgnoreCase("EXIST"))
+                        continue;
+                    b=true;
+                    break;
+
                 }
-                et.setCond(strCond);
+                if(!b)
+                {
+                    log.error(String.format("由于[%s-%s]规则尚未配置规则，将不予生成drl规则文件~!",strRuleid,strRulename));
+                    return et;
+                }
+
                 param.put("metricfield",getFieldset(strMetricfield,modelset));
                 param.put("timefield",getFieldset(strTimefield,modelset));
                 param.put("ext1field",getFieldset(strExt1field,modelset));
@@ -162,6 +169,18 @@ public class RuleItemExService extends RuleItemServiceImpl {
                     param.put("businesscat", strBusinesscatfield);
                 }
                 param.put("hasbusinesscatfield", hasBusinesscatField);
+
+                JSONArray cond = new JSONArray();
+                for(String key : modelset.keySet()) {
+                    if(key.equalsIgnoreCase("datamodelname"))
+                        continue;
+                    if(key.equalsIgnoreCase("EXIST"))
+                        continue;
+                    cond.add(key);
+
+                }
+                et.setCond(cond.toJSONString());
+
             }
 
             String[] groupArr=strRuleGroup.split(";");
@@ -324,27 +343,7 @@ public class RuleItemExService extends RuleItemServiceImpl {
         String relaEntity=relationObj.getString("releationentity");//实体
         JSONArray relaGroup=relationObj.getJSONArray("group");//规则数组
 
-        if(relaConn.equals("exists"))
-        {
-
-            if(modelset!=null)
-            {
-
-                if(!StringUtils.isEmpty(relaEntity))
-                {
-                    if(!modelset.containsKey(relaEntity))
-                    {
-                        modelset.put(relaEntity, relaEntity);
-                    }
-                    else
-                    {
-                        modelset.remove(relaEntity);
-                        modelset.put(relaEntity, relaEntity);
-                    }
 
-                }
-            }
-        }
 
         String strGroupCond="";
         if((!StringUtils.isEmpty(relaGroup)) && relaGroup.size()>0){
@@ -386,11 +385,14 @@ public class RuleItemExService extends RuleItemServiceImpl {
             String[] arr=fieldName.split("[.]");
             if(arr.length>=2)
             {
+                modelset.put(arr[0],arr[0]);
                 if(modelset.containsKey("EXIST"))
                 {
                     return modelset.get("EXIST")+".$(\""+	fieldName+"\")";
                 }
 
+
+
             }
         }
         return modelset.get("datamodelname")+".$(\""+	fieldName+"\")";