发布规则文件bug修复

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

@@ -159,15 +159,12 @@ public class RuleItemExService extends RuleItemServiceImpl {
                 param.put("domainsfield",getFieldset(strDomainsfield,modelset));
                 param.put("dimfield",getFieldset(strDimfield,modelset));
                 param.put("dimfield_d",dataModel.getDataModelName()+".$(\""+strDimfield+"\")");
-                param.put("keyvaluefield_d",StringUtils.isEmpty(strKeyvaluefield)?dataModel.getDataModelName()+".getRowKey()":dataModel.getDataModelName()+".$(\""+strKeyvaluefield+"\")");
+                param.put("keyvaluefield_d",StringUtils.isEmpty(strKeyvaluefield)?dataModel.getDataModelName()+".$K()":dataModel.getDataModelName()+".$(\""+strKeyvaluefield+"\")");
                 if (!StringUtils.isEmpty(strBusinesscatfield)) {
-                    hasBusinesscatField = true;
                     param.put("businesscatfield", getFieldset(strBusinesscatfield, modelset));
                 } else {
-                    strBusinesscatfield = StringUtils.isEmpty(et.getBusinessCat())?"":et.getBusinessCat().replace("\\", "");
-                    param.put("businesscat", strBusinesscatfield);
+                    param.put("businesscatfield", getStaticFieldset(et.getBusinessCat(), modelset));
                 }
-                param.put("hasbusinesscatfield", hasBusinesscatField);
 
                 LinkedHashSet<String> cond = new LinkedHashSet();
                 for(String key : modelset.keySet()) {
@@ -183,6 +180,7 @@ public class RuleItemExService extends RuleItemServiceImpl {
                     cond.add(key);
 
                 }
+
                 et.setCond(JSONArray.toJSONString(cond));
 
             }
@@ -378,7 +376,7 @@ public class RuleItemExService extends RuleItemServiceImpl {
     {
         String str=this.getFieldset(fieldName, modelset);
         if(str.equals("null"))
-            return modelset.get("datamodelname")+".getRowKey()";
+            return modelset.get("datamodelname")+".$K()";
         return str+"";
     }
 
@@ -403,5 +401,11 @@ public class RuleItemExService extends RuleItemServiceImpl {
         }
         return modelset.get("datamodelname")+".$(\""+	fieldName+"\")";
     }
+
+    private String getStaticFieldset(String value,Hashtable<String,String> modelset)
+    {
+        String staticValue = StringUtils.isEmpty(value)?"":value.replace("\\", "");
+        return modelset.get("datamodelname")+".$S(\""+staticValue+"\")";
+    }
 }
 

ibzdst-core/src/main/resources/ftl/DSTRule.drl.ftl

@@ -11,7 +11,7 @@ activation-group "<#if ruleid??>${ruleid}</#if>"
         ${datamodelname}:ModelObj( <#if rulecond??>${rulecond}</#if> )
         <#if (releationcond??)>${releationcond}</#if>
     then
-        BaseService.saveResult(${datamodelname},"<#if ruleid??>${ruleid}</#if>","<#if rulecode??>${rulecode}</#if>","<#if rulename??>${rulename}</#if>","<#if memo??>${memo}</#if>",<#if hasbusinesscatfield>${businesscatfield}<#else>$S("${businesscat}")</#if>,1,${keyvaluefield},${domainsfield},${dimfield},${metricfield},${timefield},${ext1field},${ext2field});
+        BaseService.saveResult(${datamodelname},"<#if ruleid??>${ruleid}</#if>","<#if rulecode??>${rulecode}</#if>","<#if rulename??>${rulename}</#if>","<#if memo??>${memo}</#if>",${businesscatfield},1,${keyvaluefield},${domainsfield},${dimfield},${metricfield},${timefield},${ext1field},${ext2field});
 end
 rule "<#if ruleid??>${ruleid}_d</#if>"
 salience 0