配置和任务

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

 package cn.ibizlab.core.extensions.service;
 
 import cn.ibizlab.core.lite.domain.DstDataSource;
-import cn.ibizlab.core.lite.extensions.domain.Setting;
-import cn.ibizlab.core.lite.extensions.domain.SysModel;
+import cn.ibizlab.util.helper.Setting;
 import cn.ibizlab.core.lite.service.impl.DstDataSourceServiceImpl;
-import cn.ibizlab.util.domain.LiquibaseProp;
-import cn.ibizlab.util.errors.BadRequestAlertException;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
 import com.baomidou.dynamic.datasource.creator.DataSourceCreator;
@@ -17,14 +14,11 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
-import javax.annotation.Resource;
 import javax.sql.DataSource;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 实体[数据源] 自定义服务对象

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

@@ -5,7 +5,7 @@ import cn.ibizlab.core.extensions.domain.EngineMQMsg;
 import cn.ibizlab.core.extensions.util.DefaultMQProducerService;
 import cn.ibizlab.core.extensions.util.MQConsumeMsgListenerProcessor;
 import cn.ibizlab.core.lite.extensions.domain.EntityObj;
-import cn.ibizlab.core.lite.extensions.domain.Setting;
+import cn.ibizlab.util.helper.Setting;
 import cn.ibizlab.core.lite.extensions.model.DataModel;
 import cn.ibizlab.core.lite.extensions.service.LiteDataCallback;
 import cn.ibizlab.core.lite.extensions.service.LiteDataService;

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

@@ -2,7 +2,7 @@ package cn.ibizlab.core.lite.extensions.domain;
 
 import cn.ibizlab.core.lite.domain.MetaDataSet;
 import cn.ibizlab.core.lite.domain.MetaEntity;
-import com.alibaba.fastjson.JSONArray;
+import cn.ibizlab.util.helper.Setting;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

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

-package cn.ibizlab.core.lite.extensions.domain;
-
-import com.alibaba.fastjson.JSONArray;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@Accessors(chain = true)
-public class Setting {
-    private String property;
-    private String value;
-
-
-    public static String getValue(String configString,String propertyName)
-    {
-        if(!(StringUtils.isEmpty(configString)))
-        {
-            List<Setting> settings= JSONArray.parseArray(configString,Setting.class);
-            for(Setting setting:settings)
-            {
-                if(propertyName.equals(setting.getProperty()))
-                {
-                    return setting.getValue();
-                }
-            }
-        }
-        return "";
-    }
-}

ibzdst-core/src/main/java/cn/ibizlab/core/util/job/AnalysisBuildJobHandler.java

 package cn.ibizlab.core.util.job;
 
+import cn.ibizlab.core.analysis.filter.DABuildSearchContext;
 import com.baomidou.jobs.api.JobsResponse;
 import com.baomidou.jobs.exception.JobsException;
 import com.baomidou.jobs.handler.IJobsHandler;
@@ -7,6 +8,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
 
 @Slf4j
 @Component("AnalysisBuildJobHandler")
@@ -20,8 +22,25 @@ public class AnalysisBuildJobHandler implements IJobsHandler {
     public JobsResponse execute(String tenantId, String param) throws JobsException {
         cn.ibizlab.core.analysis.domain.DABuild entity = cn.ibizlab.util.helper.Setting.getEntity(param, new cn.ibizlab.core.analysis.domain.DABuild());
         entity.set("tenantid", tenantId);
-        entity.set("param", param);
-        dabuildService.run(entity);
+        if(!StringUtils.isEmpty(entity.getBuildId()))
+        {
+            dabuildService.run(entity);
+        }
+        else
+        {
+            DABuildSearchContext context=new DABuildSearchContext();
+
+            if(!StringUtils.isEmpty(entity.getModelId()))
+                context.setN_modelid_eq(entity.getModelId());
+            if(!StringUtils.isEmpty(entity.getModelName()))
+                context.setN_modelname_eq(entity.getModelName());
+            if(!StringUtils.isEmpty(entity.getSystemId()))
+                context.setN_systemid_eq(entity.getSystemId());
+            context.setSize(Short.MAX_VALUE);
+            dabuildService.searchDefault(context).getContent().forEach(item->{
+                dabuildService.run(item);
+            });
+        }
         log.info("执行 DemoJobHandler tenantId=" + tenantId + ",param=" + param);
         return JobsResponse.ok();
     }

ibzdst-core/src/main/java/cn/ibizlab/core/util/job/RuleExecJobHandler.java

 package cn.ibizlab.core.util.job;
 
+import cn.ibizlab.core.rule.filter.RuleEngineSearchContext;
+import cn.ibizlab.util.helper.Setting;
 import com.baomidou.jobs.api.JobsResponse;
 import com.baomidou.jobs.exception.JobsException;
 import com.baomidou.jobs.handler.IJobsHandler;
@@ -7,6 +9,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
 
 @Slf4j
 @Component("RuleExecJobHandler")
@@ -18,10 +21,30 @@ public class RuleExecJobHandler implements IJobsHandler {
 
     @Override
     public JobsResponse execute(String tenantId, String param) throws JobsException {
-        cn.ibizlab.core.rule.domain.RuleEngine entity = cn.ibizlab.util.helper.Setting.getEntity(param, new cn.ibizlab.core.rule.domain.RuleEngine());
-        entity.set("tenantid", tenantId);
-        entity.set("param", param);
-        ruleengineService.run(entity);
+        cn.ibizlab.core.rule.domain.RuleEngine entity= Setting.getEntity(param,new cn.ibizlab.core.rule.domain.RuleEngine());
+        entity.set("tenantid",tenantId);
+
+        if(!StringUtils.isEmpty(entity.getEngineId()))
+        {
+            ruleengineService.run(entity);
+        }
+        else
+        {
+            RuleEngineSearchContext context=new RuleEngineSearchContext();
+            if(!StringUtils.isEmpty(entity.getGroup()))
+                context.getSearchCond().like("rulegroup",entity.getGroup());
+            if(!StringUtils.isEmpty(entity.getModelId()))
+                context.setN_modelid_eq(entity.getModelId());
+            if(!StringUtils.isEmpty(entity.getModelName()))
+                context.setN_modelname_eq(entity.getModelName());
+            if(!StringUtils.isEmpty(entity.getSystemId()))
+                context.setN_systemid_eq(entity.getSystemId());
+            context.setSize(Short.MAX_VALUE);
+            ruleengineService.searchDefault(context).getContent().forEach(item->{
+                ruleengineService.run(item);
+            });
+        }
+
         log.info("执行 DemoJobHandler tenantId=" + tenantId + ",param=" + param);
         return JobsResponse.ok();
     }