ruleid bug fix

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

@@ -14,5 +14,5 @@ public interface BaseEntityService {
 
 	void reset(String keyContainer);
 	ExecLog processAll(BaseRequest msg);
-	void saveResult(ModelObj param, String RULECODE, String RULENAME, String RU_EXECRESULTNAME, Object BUSINESSCAT, Integer RETVALUE, Object KEYVALUEFIELD, Object DOMAINSFIELD,Object DIMFIELD, Object METRICFIELD, Object TIMEFIELD, Object EXT1FIELD, Object EXT2FIELD);
+	void saveResult(ModelObj param, String RULEID, String RULECODE, String RULENAME, String RU_EXECRESULTNAME, Object BUSINESSCAT, Integer RETVALUE, Object KEYVALUEFIELD, Object DOMAINSFIELD,Object DIMFIELD, Object METRICFIELD, Object TIMEFIELD, Object EXT1FIELD, Object EXT2FIELD);
  }
\ No newline at end of file

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

@@ -53,11 +53,11 @@ public class BaseEntityServiceImpl implements BaseEntityService
 	}
 
 
-	public void saveResult(ModelObj param, String RULECODE, String RULENAME, String RU_EXECRESULTNAME, Object BUSINESSCAT, Integer RETVALUE,
+	public void saveResult(ModelObj param, String RULEID,String RULECODE, String RULENAME, String RU_EXECRESULTNAME, Object BUSINESSCAT, Integer RETVALUE,
 			Object KEYVALUEFIELD, Object DOMAINSFIELD,Object DIMFIELD, Object METRICFIELD, Object TIMEFIELD, Object EXT1FIELD, Object EXT2FIELD)
 	{
 		ExecResult result=new ExecResult();
-		result.setRuleId(RULECODE);
+		result.setRuleId(RULEID);
 		result.setRuleName(RULENAME);
 		result.setName(RU_EXECRESULTNAME);
 		result.setRetValue(RETVALUE);
@@ -134,6 +134,7 @@ public class BaseEntityServiceImpl implements BaseEntityService
 			result.setId(result.getDefaultKey(true).toString());
 			if(result.getRetValue()==1)
 			{
+				result.setRuleId(RULECODE);
 				ruExecResultService.saveAsync(result);
 			}
 			else

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 rulecode??>${rulecode}</#if>","<#if rulename??>${rulename}</#if>","<#if memo??>${memo}</#if>",<#if hasbusinesscatfield>${businesscatfield}<#else>"${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>",<#if hasbusinesscatfield>${businesscatfield}<#else>"${businesscat}"</#if>,1,${keyvaluefield},${domainsfield},${dimfield},${metricfield},${timefield},${ext1field},${ext2field});
 end
 rule "<#if ruleid??>${ruleid}_d</#if>"
 salience 0
@@ -19,5 +19,5 @@ activation-group "<#if ruleid??>${ruleid}</#if>"
     when
         ${datamodelname}:ModelObj( )
     then
-        BaseService.saveResult(${datamodelname},"<#if rulecode??>${rulecode}</#if>",null,null,null,0,${keyvaluefield_d},null,${dimfield_d},0,null,null,null);
+        BaseService.saveResult(${datamodelname},"<#if ruleid??>${ruleid}</#if>","<#if rulecode??>${rulecode}</#if>",null,null,null,0,${keyvaluefield_d},null,${dimfield_d},0,null,null,null);
 end
\ No newline at end of file