规则执行结果动态存储

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

@@ -3,19 +3,12 @@ package cn.ibizlab.core.extensions.service;
 import cn.ibizlab.core.lite.extensions.service.DbEntityService;
 import cn.ibizlab.core.rule.domain.ExecResult;
 import cn.ibizlab.core.rule.service.impl.ExecResultServiceImpl;
-import com.alibaba.druid.pool.DruidDataSource;
-import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-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.sql.DataSource;
 import java.util.*;
 
 /**
@@ -26,16 +19,9 @@ import java.util.*;
 @Service("ExecResultExService")
 public class ExecResultExService extends ExecResultServiceImpl {
 
-    @Autowired
-    private DstDataSourceExService dstDataSourceService;
-
     @Autowired
     private DbEntityService dbEntityService;
 
-    @Autowired
-    @Lazy
-    private DynamicRoutingDataSource dynamicRoutingDataSource;
-
     private Map<String, List<ExecResult>> resultsSaveAsync = new HashMap<>();
     private Object objResultSaveAsyncLock = new Object();
     private Timer timerSaveAsync = null;
@@ -66,7 +52,6 @@ public class ExecResultExService extends ExecResultServiceImpl {
             timerSaveAsync = new Timer();
             //schedule方法是执行时间定时任务的方法
             timerSaveAsync.schedule(new TimerTask() {
-
                 //run方法就是具体需要定时执行的任务
                 @Override
                 public void run() {
@@ -74,25 +59,20 @@ public class ExecResultExService extends ExecResultServiceImpl {
                         synchronized (objResultSaveAsyncLock) {
                             if (resultsSaveAsync.size() > 0) {
                                 for (Map.Entry<String, List<ExecResult>> entry : resultsSaveAsync.entrySet()) {
-                                    String tabName = "";
                                     String dsName = entry.getKey();
                                     List<ExecResult> execResults = entry.getValue();
                                     List<ExecResult> tempExecResults = new ArrayList<>();
                                     if (execResults.size() > 0) {
-                                        dstDataSourceService.initDataSource(dsName);
-                                        DynamicDataSourceContextHolder.push(dsName);
                                         for (ExecResult execResult : execResults) {
                                             tempExecResults.add(execResult);
-                                            Object objTabName = execResult.get(RuleEngineExService.Setting_ResultTableName);
-                                            if (StringUtils.isEmpty(tabName) && !ObjectUtils.isEmpty(objTabName)) {
-                                                tabName = String.valueOf(objTabName);
-                                            }
                                             if (tempExecResults.size() >= 500) {
-                                                saveResultBatch(tempExecResults, dsName, tabName);
+                                                dbEntityService.saveResultBatch(tempExecResults,dsName);
+                                                tempExecResults.clear();
                                             }
                                         }
                                         if (tempExecResults.size() > 0) {
-                                            saveResultBatch(tempExecResults, dsName, tabName);
+                                            dbEntityService.saveResultBatch(tempExecResults,dsName);
+                                            tempExecResults.clear();
                                         }
                                         resultsSaveAsync.remove(dsName);
                                     }
@@ -101,10 +81,7 @@ public class ExecResultExService extends ExecResultServiceImpl {
                         }
                     } catch (Exception ex) {
                         log.error(ex.getMessage());
-                    } finally {
-                        DynamicDataSourceContextHolder.poll();
                     }
-
                 }
             }, 1000, 10000);
         }
@@ -135,25 +112,18 @@ public class ExecResultExService extends ExecResultServiceImpl {
                         synchronized (objResultDeleteAsyncLock) {
                             if (resultsDeleteAsync.size() > 0) {
                                 for (Map.Entry<String, List<ExecResult>> entry : resultsDeleteAsync.entrySet()) {
-                                    String tabName = "";
                                     String dsName = entry.getKey();
                                     List<ExecResult> execResults = entry.getValue();
                                     List<ExecResult> tempExecResults = new ArrayList<>();
                                     if (execResults.size() > 0) {
-                                        dstDataSourceService.initDataSource(dsName);
-                                        DynamicDataSourceContextHolder.push(dsName);
                                         for (ExecResult execResult : execResults) {
                                             tempExecResults.add(execResult);
-                                            Object objTabName = execResult.get(RuleEngineExService.Setting_ResultTableName);
-                                            if (StringUtils.isEmpty(tabName) && !ObjectUtils.isEmpty(objTabName)) {
-                                                tabName = String.valueOf(objTabName);
-                                            }
                                             if (tempExecResults.size() >= 500) {
-                                                dbEntityService.clearResultBatch(tempExecResults, tabName);
+                                                dbEntityService.clearResultBatch(tempExecResults,dsName);
                                             }
                                         }
                                         if (tempExecResults.size() > 0) {
-                                            dbEntityService.clearResultBatch(tempExecResults, tabName);
+                                            dbEntityService.clearResultBatch(tempExecResults,dsName);
                                         }
                                         resultsDeleteAsync.remove(dsName);
                                     }
@@ -162,10 +132,7 @@ public class ExecResultExService extends ExecResultServiceImpl {
                         }
                     } catch (Exception ex) {
                         log.error(ex.getMessage());
-                    } finally {
-                        DynamicDataSourceContextHolder.poll();
                     }
-
                 }
             }, 1000, 10000);
         }
@@ -195,27 +162,5 @@ public class ExecResultExService extends ExecResultServiceImpl {
             }});
         }
     }
-
-    /**
-     * 根据数据源类型保存结果
-     * @param args
-     * @param
-     */
-    private void saveResultBatch(List<ExecResult> args, String dsName, String tabName) {
-        Map<String, DataSource> dynamicDSMap = dynamicRoutingDataSource.getCurrentDataSources();
-        if (!ObjectUtils.isEmpty(dynamicDSMap) && dynamicDSMap.containsKey(dsName)) {
-            DataSource ds = dynamicDSMap.get(dsName);
-            if (ds instanceof DruidDataSource) {
-                DruidDataSource druidDataSource = (DruidDataSource) dynamicDSMap.get(dsName);
-                if ("oracle".equals(druidDataSource.getDbType())) {
-                    dbEntityService.saveResultBatchByOracle(args, tabName);
-                    args.clear();
-                    return;
-                }
-            }
-        }
-        dbEntityService.saveResultBatch(args, tabName);
-        args.clear();
-    }
 }