规则引擎构建参数传递engineId

ibzdst-core/src/main/java/cn/ibizlab/core/extensions/domain/BaseRequest.java

@@ -43,6 +43,7 @@ public class BaseRequest
 
 	private List<ModelObj> datas;
 	private String model;
+	private String engineId;
 	private String resultDataSource;
 	private String resultTableName;
 	private String batch;

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

@@ -43,6 +43,8 @@ import java.util.List;
 public class BaseEntityServiceImpl implements BaseEntityService
 {
 
+	public static final String Tag_EngineId = "engineId";
+
 	public BaseEntityServiceImpl()
 	{
 		System.setProperty("drools.dateformat", "yyyy/MM/dd HH:mm:ss");
@@ -104,6 +106,7 @@ public class BaseEntityServiceImpl implements BaseEntityService
 			result.setExt1Field(EXT1FIELD.toString());
 		if(EXT2FIELD!=null)
 			result.setExt2Field(EXT2FIELD.toString());
+		result.set(Tag_EngineId,param.get(Tag_EngineId));
 		if(param.containsKey(RuleEngineExService.Setting_ResultDataSource)){
 			result.set(RuleEngineExService.Setting_ResultDataSource, param.get(RuleEngineExService.Setting_ResultDataSource));
 		}
@@ -392,6 +395,7 @@ public class BaseEntityServiceImpl implements BaseEntityService
 
 						count++;
 						modelObj.set("BATCH",msg.getBatch());
+						modelObj.set(Tag_EngineId, msg.getEngineId());
 						if(!StringUtils.isEmpty(msg.getResultDataSource())){
 							modelObj.set(RuleEngineExService.Setting_ResultDataSource, msg.getResultDataSource());
 						}

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

@@ -19,7 +19,6 @@ import cn.ibizlab.core.rule.service.impl.RuleEngineServiceImpl;
 import cn.ibizlab.util.filter.QueryFilter;
 import cn.ibizlab.util.helper.CachedBeanCopier;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -113,6 +112,7 @@ public class RuleEngineExService extends RuleEngineServiceImpl {
             BaseRequest msg=new BaseRequest();
             msg.setId(IdWorker.getIdStr());
             msg.setModel(et.getModelName());
+            msg.setEngineId(et.getEngineId());
             String resultDataSource = Setting.getValue(et.getExtParams(), Setting_ResultDataSource);
             String resultTableName = Setting.getValue(et.getExtParams(), Setting_ResultTableName);
             if(!StringUtils.isEmpty(resultDataSource)){
@@ -269,6 +269,7 @@ public class RuleEngineExService extends RuleEngineServiceImpl {
             msg.setModel(et.getModelName());
             msg.setBatch(engineMQMsg.getBatch());
             msg.setSystemid(et.getSystemId());
+            msg.setEngineId(engineMQMsg.getEngineId());
             String resultDataSource = Setting.getValue(et.getExtParams(), Setting_ResultDataSource);
             String resultTableName = Setting.getValue(et.getExtParams(), Setting_ResultTableName);
             if(!StringUtils.isEmpty(resultDataSource)){