zhouweidong 发布系统代码 [ibz-dst，应用]

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DABuildServiceImpl.java

@@ -54,6 +54,9 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
     @Autowired
     @Lazy
     protected cn.ibizlab.core.lite.service.IMetaModelService metamodelService;
+    @Autowired
+    @Lazy
+    IDABuildService proxyService;
 
     protected int batchSize = 500;
 
@@ -160,7 +163,7 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
+            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
         }
     }
 
@@ -168,7 +171,21 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
     @Transactional
     public boolean saveBatch(Collection<DABuild> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<DABuild> create = new ArrayList<>();
+        List<DABuild> update = new ArrayList<>();
+        for (DABuild et : list) {
+            if (ObjectUtils.isEmpty(et.getBuildId()) || ObjectUtils.isEmpty(getById(et.getBuildId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
         return true;
     }
 
@@ -176,7 +193,21 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
     @Transactional
     public void saveBatch(List<DABuild> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<DABuild> create = new ArrayList<>();
+        List<DABuild> update = new ArrayList<>();
+        for (DABuild et : list) {
+            if (ObjectUtils.isEmpty(et.getBuildId()) || ObjectUtils.isEmpty(getById(et.getBuildId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DAChartServiceImpl.java

@@ -48,6 +48,9 @@ import org.springframework.util.StringUtils;
 @Service("DAChartServiceImpl")
 public class DAChartServiceImpl extends ServiceImpl<DAChartMapper, DAChart> implements IDAChartService {
 
+    @Autowired
+    @Lazy
+    IDAChartService proxyService;
 
     protected int batchSize = 500;
 
@@ -133,21 +136,49 @@ public class DAChartServiceImpl extends ServiceImpl<DAChartMapper, DAChart> impl
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
+            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
         }
     }
 
     @Override
     @Transactional
     public boolean saveBatch(Collection<DAChart> list) {
-        saveOrUpdateBatch(list,batchSize);
+        List<DAChart> create = new ArrayList<>();
+        List<DAChart> update = new ArrayList<>();
+        for (DAChart et : list) {
+            if (ObjectUtils.isEmpty(et.getChartId()) || ObjectUtils.isEmpty(getById(et.getChartId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
         return true;
     }
 
     @Override
     @Transactional
     public void saveBatch(List<DAChart> list) {
-        saveOrUpdateBatch(list,batchSize);
+        List<DAChart> create = new ArrayList<>();
+        List<DAChart> update = new ArrayList<>();
+        for (DAChart et : list) {
+            if (ObjectUtils.isEmpty(et.getChartId()) || ObjectUtils.isEmpty(getById(et.getChartId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DAMetricServiceImpl.java

@@ -51,6 +51,9 @@ public class DAMetricServiceImpl extends ServiceImpl<DAMetricMapper, DAMetric> i
     @Autowired
     @Lazy
     protected cn.ibizlab.core.analysis.service.IDABuildService dabuildService;
+    @Autowired
+    @Lazy
+    IDAMetricService proxyService;
 
     protected int batchSize = 500;
 
@@ -141,7 +144,7 @@ public class DAMetricServiceImpl extends ServiceImpl<DAMetricMapper, DAMetric> i
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
+            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
         }
     }
 
@@ -149,7 +152,21 @@ public class DAMetricServiceImpl extends ServiceImpl<DAMetricMapper, DAMetric> i
     @Transactional
     public boolean saveBatch(Collection<DAMetric> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<DAMetric> create = new ArrayList<>();
+        List<DAMetric> update = new ArrayList<>();
+        for (DAMetric et : list) {
+            if (ObjectUtils.isEmpty(et.getMetricId()) || ObjectUtils.isEmpty(getById(et.getMetricId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
         return true;
     }
 
@@ -157,7 +174,21 @@ public class DAMetricServiceImpl extends ServiceImpl<DAMetricMapper, DAMetric> i
     @Transactional
     public void saveBatch(List<DAMetric> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<DAMetric> create = new ArrayList<>();
+        List<DAMetric> update = new ArrayList<>();
+        for (DAMetric et : list) {
+            if (ObjectUtils.isEmpty(et.getMetricId()) || ObjectUtils.isEmpty(getById(et.getMetricId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
     }
 
     @Override

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DAReportServiceImpl.java

@@ -48,6 +48,9 @@ import org.springframework.util.StringUtils;
 @Service("DAReportServiceImpl")
 public class DAReportServiceImpl extends ServiceImpl<DAReportMapper, DAReport> implements IDAReportService {
 
+    @Autowired
+    @Lazy
+    IDAReportService proxyService;
 
     protected int batchSize = 500;
 
@@ -133,21 +136,49 @@ public class DAReportServiceImpl extends ServiceImpl<DAReportMapper, DAReport> i
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
+            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
         }
     }
 
     @Override
     @Transactional
     public boolean saveBatch(Collection<DAReport> list) {
-        saveOrUpdateBatch(list,batchSize);
+        List<DAReport> create = new ArrayList<>();
+        List<DAReport> update = new ArrayList<>();
+        for (DAReport et : list) {
+            if (ObjectUtils.isEmpty(et.getReportId()) || ObjectUtils.isEmpty(getById(et.getReportId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
         return true;
     }
 
     @Override
     @Transactional
     public void saveBatch(List<DAReport> list) {
-        saveOrUpdateBatch(list,batchSize);
+        List<DAReport> create = new ArrayList<>();
+        List<DAReport> update = new ArrayList<>();
+        for (DAReport et : list) {
+            if (ObjectUtils.isEmpty(et.getReportId()) || ObjectUtils.isEmpty(getById(et.getReportId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstDataSourceServiceImpl.java

@@ -51,6 +51,9 @@ public class DstDataSourceServiceImpl extends ServiceImpl<DstDataSourceMapper, D
     @Autowired
     @Lazy
     protected cn.ibizlab.core.lite.service.IMetaEntityService metaentityService;
+    @Autowired
+    @Lazy
+    IDstDataSourceService proxyService;
 
     protected int batchSize = 500;
 
@@ -152,21 +155,49 @@ public class DstDataSourceServiceImpl extends ServiceImpl<DstDataSourceMapper, D
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
+            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
         }
     }
 
     @Override
     @Transactional
     public boolean saveBatch(Collection<DstDataSource> list) {
-        saveOrUpdateBatch(list,batchSize);
+        List<DstDataSource> create = new ArrayList<>();
+        List<DstDataSource> update = new ArrayList<>();
+        for (DstDataSource et : list) {
+            if (ObjectUtils.isEmpty(et.getDsId()) || ObjectUtils.isEmpty(getById(et.getDsId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
         return true;
     }
 
     @Override
     @Transactional
     public void saveBatch(List<DstDataSource> list) {
-        saveOrUpdateBatch(list,batchSize);
+        List<DstDataSource> create = new ArrayList<>();
+        List<DstDataSource> update = new ArrayList<>();
+        for (DstDataSource et : list) {
+            if (ObjectUtils.isEmpty(et.getDsId()) || ObjectUtils.isEmpty(getById(et.getDsId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstSystemServiceImpl.java

@@ -57,6 +57,9 @@ public class DstSystemServiceImpl extends ServiceImpl<DstSystemMapper, DstSystem
     @Autowired
     @Lazy
     protected cn.ibizlab.core.lite.service.IMetaModuleService metamoduleService;
+    @Autowired
+    @Lazy
+    IDstSystemService proxyService;
 
     protected int batchSize = 500;
 
@@ -142,21 +145,49 @@ public class DstSystemServiceImpl extends ServiceImpl<DstSystemMapper, DstSystem
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
+            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
         }
     }
 
     @Override
     @Transactional
     public boolean saveBatch(Collection<DstSystem> list) {
-        saveOrUpdateBatch(list,batchSize);
+        List<DstSystem> create = new ArrayList<>();
+        List<DstSystem> update = new ArrayList<>();
+        for (DstSystem et : list) {
+            if (ObjectUtils.isEmpty(et.getPssystemid()) || ObjectUtils.isEmpty(getById(et.getPssystemid()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
         return true;
     }
 
     @Override
     @Transactional
     public void saveBatch(List<DstSystem> list) {
-        saveOrUpdateBatch(list,batchSize);
+        List<DstSystem> create = new ArrayList<>();
+        List<DstSystem> update = new ArrayList<>();
+        for (DstSystem et : list) {
+            if (ObjectUtils.isEmpty(et.getPssystemid()) || ObjectUtils.isEmpty(getById(et.getPssystemid()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
     }
 
     @Override

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaDataSetServiceImpl.java

@@ -51,6 +51,9 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
     @Autowired
     @Lazy
     protected cn.ibizlab.core.lite.service.IMetaEntityService metaentityService;
+    @Autowired
+    @Lazy
+    IMetaDataSetService proxyService;
 
     protected int batchSize = 500;
 
@@ -141,7 +144,7 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
+            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
         }
     }
 
@@ -149,7 +152,21 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
     @Transactional
     public boolean saveBatch(Collection<MetaDataSet> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<MetaDataSet> create = new ArrayList<>();
+        List<MetaDataSet> update = new ArrayList<>();
+        for (MetaDataSet et : list) {
+            if (ObjectUtils.isEmpty(et.getDatasetId()) || ObjectUtils.isEmpty(getById(et.getDatasetId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
         return true;
     }
 
@@ -157,7 +174,21 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
     @Transactional
     public void saveBatch(List<MetaDataSet> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<MetaDataSet> create = new ArrayList<>();
+        List<MetaDataSet> update = new ArrayList<>();
+        for (MetaDataSet et : list) {
+            if (ObjectUtils.isEmpty(et.getDatasetId()) || ObjectUtils.isEmpty(getById(et.getDatasetId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
     }
 
 
@@ -170,9 +201,6 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
         this.remove(new QueryWrapper<MetaDataSet>().eq("entityid",entity_id));
     }
 
-    @Autowired
-    @Lazy
-    IMetaDataSetService proxyService;
 	@Override
     public void saveByEntityId(String entity_id,List<MetaDataSet> list) {
         if(list==null)

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaEntityServiceImpl.java

@@ -66,6 +66,9 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
     @Autowired
     @Lazy
     protected cn.ibizlab.core.lite.service.IMetaModuleService metamoduleService;
+    @Autowired
+    @Lazy
+    IMetaEntityService proxyService;
 
     protected int batchSize = 500;
 
@@ -188,7 +191,7 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
+            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
         }
     }
 
@@ -196,7 +199,21 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
     @Transactional
     public boolean saveBatch(Collection<MetaEntity> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<MetaEntity> create = new ArrayList<>();
+        List<MetaEntity> update = new ArrayList<>();
+        for (MetaEntity et : list) {
+            if (ObjectUtils.isEmpty(et.getEntityId()) || ObjectUtils.isEmpty(getById(et.getEntityId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
         return true;
     }
 
@@ -204,7 +221,21 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
     @Transactional
     public void saveBatch(List<MetaEntity> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<MetaEntity> create = new ArrayList<>();
+        List<MetaEntity> update = new ArrayList<>();
+        for (MetaEntity et : list) {
+            if (ObjectUtils.isEmpty(et.getEntityId()) || ObjectUtils.isEmpty(getById(et.getEntityId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaFieldServiceImpl.java

@@ -56,6 +56,9 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
     @Autowired
     @Lazy
     protected cn.ibizlab.core.lite.service.IMetaRelationshipService metarelationshipService;
+    @Autowired
+    @Lazy
+    IMetaFieldService proxyService;
 
     protected int batchSize = 500;
 
@@ -146,7 +149,7 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
+            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
         }
     }
 
@@ -154,7 +157,21 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
     @Transactional
     public boolean saveBatch(Collection<MetaField> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<MetaField> create = new ArrayList<>();
+        List<MetaField> update = new ArrayList<>();
+        for (MetaField et : list) {
+            if (ObjectUtils.isEmpty(et.getFieldId()) || ObjectUtils.isEmpty(getById(et.getFieldId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
         return true;
     }
 
@@ -162,7 +179,21 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
     @Transactional
     public void saveBatch(List<MetaField> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<MetaField> create = new ArrayList<>();
+        List<MetaField> update = new ArrayList<>();
+        for (MetaField et : list) {
+            if (ObjectUtils.isEmpty(et.getFieldId()) || ObjectUtils.isEmpty(getById(et.getFieldId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
     }
 
 
@@ -175,9 +206,6 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
         this.remove(new QueryWrapper<MetaField>().eq("entityid",entity_id));
     }
 
-    @Autowired
-    @Lazy
-    IMetaFieldService proxyService;
 	@Override
     public void saveByEntityId(String entity_id,List<MetaField> list) {
         if(list==null)

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaModelServiceImpl.java

@@ -60,6 +60,9 @@ public class MetaModelServiceImpl extends ServiceImpl<MetaModelMapper, MetaModel
     @Autowired
     @Lazy
     protected cn.ibizlab.core.lite.service.IDstSystemService dstsystemService;
+    @Autowired
+    @Lazy
+    IMetaModelService proxyService;
 
     protected int batchSize = 500;
 
@@ -161,21 +164,49 @@ public class MetaModelServiceImpl extends ServiceImpl<MetaModelMapper, MetaModel
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
+            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
         }
     }
 
     @Override
     @Transactional
     public boolean saveBatch(Collection<MetaModel> list) {
-        saveOrUpdateBatch(list,batchSize);
+        List<MetaModel> create = new ArrayList<>();
+        List<MetaModel> update = new ArrayList<>();
+        for (MetaModel et : list) {
+            if (ObjectUtils.isEmpty(et.getId()) || ObjectUtils.isEmpty(getById(et.getId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
         return true;
     }
 
     @Override
     @Transactional
     public void saveBatch(List<MetaModel> list) {
-        saveOrUpdateBatch(list,batchSize);
+        List<MetaModel> create = new ArrayList<>();
+        List<MetaModel> update = new ArrayList<>();
+        for (MetaModel et : list) {
+            if (ObjectUtils.isEmpty(et.getId()) || ObjectUtils.isEmpty(getById(et.getId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaModuleServiceImpl.java

@@ -54,6 +54,9 @@ public class MetaModuleServiceImpl extends ServiceImpl<MetaModuleMapper, MetaMod
     @Autowired
     @Lazy
     protected cn.ibizlab.core.lite.service.IDstSystemService dstsystemService;
+    @Autowired
+    @Lazy
+    IMetaModuleService proxyService;
 
     protected int batchSize = 500;
 
@@ -139,21 +142,49 @@ public class MetaModuleServiceImpl extends ServiceImpl<MetaModuleMapper, MetaMod
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
+            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
         }
     }
 
     @Override
     @Transactional
     public boolean saveBatch(Collection<MetaModule> list) {
-        saveOrUpdateBatch(list,batchSize);
+        List<MetaModule> create = new ArrayList<>();
+        List<MetaModule> update = new ArrayList<>();
+        for (MetaModule et : list) {
+            if (ObjectUtils.isEmpty(et.getId()) || ObjectUtils.isEmpty(getById(et.getId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
         return true;
     }
 
     @Override
     @Transactional
     public void saveBatch(List<MetaModule> list) {
-        saveOrUpdateBatch(list,batchSize);
+        List<MetaModule> create = new ArrayList<>();
+        List<MetaModule> update = new ArrayList<>();
+        for (MetaModule et : list) {
+            if (ObjectUtils.isEmpty(et.getId()) || ObjectUtils.isEmpty(getById(et.getId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaRelationshipServiceImpl.java

@@ -54,6 +54,9 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
     @Autowired
     @Lazy
     protected cn.ibizlab.core.lite.service.IMetaEntityService metaentityService;
+    @Autowired
+    @Lazy
+    IMetaRelationshipService proxyService;
 
     protected int batchSize = 500;
 
@@ -144,7 +147,7 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
+            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
         }
     }
 
@@ -152,7 +155,21 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
     @Transactional
     public boolean saveBatch(Collection<MetaRelationship> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<MetaRelationship> create = new ArrayList<>();
+        List<MetaRelationship> update = new ArrayList<>();
+        for (MetaRelationship et : list) {
+            if (ObjectUtils.isEmpty(et.getId()) || ObjectUtils.isEmpty(getById(et.getId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
         return true;
     }
 
@@ -160,7 +177,21 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
     @Transactional
     public void saveBatch(List<MetaRelationship> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<MetaRelationship> create = new ArrayList<>();
+        List<MetaRelationship> update = new ArrayList<>();
+        for (MetaRelationship et : list) {
+            if (ObjectUtils.isEmpty(et.getId()) || ObjectUtils.isEmpty(getById(et.getId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
     }
 
 
@@ -173,9 +204,6 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
         this.remove(new QueryWrapper<MetaRelationship>().eq("entityid",entity_id));
     }
 
-    @Autowired
-    @Lazy
-    IMetaRelationshipService proxyService;
 	@Override
     public void saveByEntityId(String entity_id,List<MetaRelationship> list) {
         if(list==null)

ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/ExecLogServiceImpl.java

@@ -48,6 +48,9 @@ import org.springframework.util.StringUtils;
 @Service("ExecLogServiceImpl")
 public class ExecLogServiceImpl extends ServiceImpl<ExecLogMapper, ExecLog> implements IExecLogService {
 
+    @Autowired
+    @Lazy
+    IExecLogService proxyService;
 
     protected int batchSize = 500;
 
@@ -133,21 +136,49 @@ public class ExecLogServiceImpl extends ServiceImpl<ExecLogMapper, ExecLog> impl
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
+            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
         }
     }
 
     @Override
     @Transactional
     public boolean saveBatch(Collection<ExecLog> list) {
-        saveOrUpdateBatch(list,batchSize);
+        List<ExecLog> create = new ArrayList<>();
+        List<ExecLog> update = new ArrayList<>();
+        for (ExecLog et : list) {
+            if (ObjectUtils.isEmpty(et.getId()) || ObjectUtils.isEmpty(getById(et.getId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
         return true;
     }
 
     @Override
     @Transactional
     public void saveBatch(List<ExecLog> list) {
-        saveOrUpdateBatch(list,batchSize);
+        List<ExecLog> create = new ArrayList<>();
+        List<ExecLog> update = new ArrayList<>();
+        for (ExecLog et : list) {
+            if (ObjectUtils.isEmpty(et.getId()) || ObjectUtils.isEmpty(getById(et.getId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
     }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/ExecResultServiceImpl.java

@@ -51,6 +51,9 @@ public class ExecResultServiceImpl extends ServiceImpl<ExecResultMapper, ExecRes
     @Autowired
     @Lazy
     protected cn.ibizlab.core.rule.service.IRuleItemService ruleitemService;
+    @Autowired
+    @Lazy
+    IExecResultService proxyService;
 
     protected int batchSize = 500;
 
@@ -157,7 +160,7 @@ public class ExecResultServiceImpl extends ServiceImpl<ExecResultMapper, ExecRes
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
+            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
         }
     }
 
@@ -165,7 +168,21 @@ public class ExecResultServiceImpl extends ServiceImpl<ExecResultMapper, ExecRes
     @Transactional
     public boolean saveBatch(Collection<ExecResult> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<ExecResult> create = new ArrayList<>();
+        List<ExecResult> update = new ArrayList<>();
+        for (ExecResult et : list) {
+            if (ObjectUtils.isEmpty(et.getId()) || ObjectUtils.isEmpty(getById(et.getId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
         return true;
     }
 
@@ -173,7 +190,21 @@ public class ExecResultServiceImpl extends ServiceImpl<ExecResultMapper, ExecRes
     @Transactional
     public void saveBatch(List<ExecResult> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<ExecResult> create = new ArrayList<>();
+        List<ExecResult> update = new ArrayList<>();
+        for (ExecResult et : list) {
+            if (ObjectUtils.isEmpty(et.getId()) || ObjectUtils.isEmpty(getById(et.getId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
     }
 
     @Override

ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/RuleItemServiceImpl.java

@@ -54,6 +54,9 @@ public class RuleItemServiceImpl extends ServiceImpl<RuleItemMapper, RuleItem> i
     @Autowired
     @Lazy
     protected cn.ibizlab.core.lite.service.IMetaModelService metamodelService;
+    @Autowired
+    @Lazy
+    IRuleItemService proxyService;
 
     protected int batchSize = 500;
 
@@ -176,7 +179,7 @@ public class RuleItemServiceImpl extends ServiceImpl<RuleItemMapper, RuleItem> i
         if (null == et) {
             return false;
         } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
+            return checkKey(et) ? proxyService.update(et) : proxyService.create(et);
         }
     }
 
@@ -184,7 +187,21 @@ public class RuleItemServiceImpl extends ServiceImpl<RuleItemMapper, RuleItem> i
     @Transactional
     public boolean saveBatch(Collection<RuleItem> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<RuleItem> create = new ArrayList<>();
+        List<RuleItem> update = new ArrayList<>();
+        for (RuleItem et : list) {
+            if (ObjectUtils.isEmpty(et.getRuleId()) || ObjectUtils.isEmpty(getById(et.getRuleId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
         return true;
     }
 
@@ -192,7 +209,21 @@ public class RuleItemServiceImpl extends ServiceImpl<RuleItemMapper, RuleItem> i
     @Transactional
     public void saveBatch(List<RuleItem> list) {
         list.forEach(item->fillParentData(item));
-        saveOrUpdateBatch(list,batchSize);
+        List<RuleItem> create = new ArrayList<>();
+        List<RuleItem> update = new ArrayList<>();
+        for (RuleItem et : list) {
+            if (ObjectUtils.isEmpty(et.getRuleId()) || ObjectUtils.isEmpty(getById(et.getRuleId()))) {
+                create.add(et);
+            } else {
+                update.add(et);
+            }
+        }
+        if (create.size() > 0) {
+            proxyService.createBatch(create);
+        }
+        if (update.size() > 0) {
+            proxyService.updateBatch(update);
+        }
     }
 
 

ibzdst-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[DA_BUILD]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-da_build-54-1">
+    <changeSet author="root" id="tab-da_build-54-1">
         <createTable tableName="IBZDABUILD">
                 <column name="BUILDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_BUILD_BUILDID"/>
@@ -32,7 +32,7 @@
 
 
     <!--输出实体[DA_CHART]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-da_chart-22-2">
+    <changeSet author="root" id="tab-da_chart-22-2">
         <createTable tableName="IBZDACHART">
                 <column name="CHARTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_CHART_CHARTID"/>
@@ -54,7 +54,7 @@
 
 
     <!--输出实体[DA_METRIC]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-da_metric-59-3">
+    <changeSet author="root" id="tab-da_metric-59-3">
         <createTable tableName="IBZDAMETRIC">
                 <column name="DA_METRICID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_METRIC_DA_METRICID"/>
@@ -82,7 +82,7 @@
 
 
     <!--输出实体[DA_REPORT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-da_report-24-4">
+    <changeSet author="root" id="tab-da_report-24-4">
         <createTable tableName="IBZDAREPORT">
                 <column name="REPORTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_REPORT_REPORTID"/>
@@ -104,7 +104,7 @@
 
 
     <!--输出实体[DST_DATASOURCE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_datasource-6-5">
+    <changeSet author="root" id="tab-dst_datasource-6-5">
         <createTable tableName="IBZDATASOURCE">
                 <column name="DSID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
@@ -120,7 +120,7 @@
 
 
     <!--输出实体[DST_SYSTEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_system-5-6">
+    <changeSet author="root" id="tab-dst_system-5-6">
         <createTable tableName="IBZPSSYSTEM">
                 <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
@@ -140,7 +140,7 @@
 
 
     <!--输出实体[RU_EXECLOG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ru_execlog-31-7">
+    <changeSet author="root" id="tab-ru_execlog-31-7">
         <createTable tableName="IBZRULELOG">
                 <column name="RU_EXECLOGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_EXECLOG_RU_EXECLOGID"/>
@@ -170,7 +170,7 @@
 
 
     <!--输出实体[RU_EXECRESULT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ru_execresult-46-8">
+    <changeSet author="root" id="tab-ru_execresult-46-8">
         <createTable tableName="IBZRULERESULT">
                 <column name="RU_EXECRESULTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_EXECRESULT_RU_EXECRESULT"/>
@@ -210,7 +210,7 @@
 
 
     <!--输出实体[META_DATASET]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_dataset-2-9">
+    <changeSet author="root" id="tab-meta_dataset-2-9">
         <createTable tableName="IBZDATASET">
                 <column name="DATASETID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
@@ -232,7 +232,7 @@
 
 
     <!--输出实体[META_ENTITY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_entity-13-10">
+    <changeSet author="root" id="tab-meta_entity-13-10">
         <createTable tableName="IBZENTITY">
                 <column name="ENTITYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
@@ -264,7 +264,7 @@
 
 
     <!--输出实体[META_FIELD]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_field-7-11">
+    <changeSet author="root" id="tab-meta_field-7-11">
         <createTable tableName="IBZFIELD">
                 <column name="FIELDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
@@ -328,7 +328,7 @@
 
 
     <!--输出实体[META_MODEL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_model-18-12">
+    <changeSet author="root" id="tab-meta_model-18-12">
         <createTable tableName="IBZMODEL">
                 <column name="MODELID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
@@ -354,7 +354,7 @@
 
 
     <!--输出实体[META_MODULE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_module-7-13">
+    <changeSet author="root" id="tab-meta_module-7-13">
         <createTable tableName="IBZMODULE">
                 <column name="MODULEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
@@ -372,7 +372,7 @@
 
 
     <!--输出实体[META_RELATION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_relation-6-14">
+    <changeSet author="root" id="tab-meta_relation-6-14">
         <createTable tableName="IBZRELATION">
                 <column name="RELATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
@@ -404,7 +404,7 @@
 
 
     <!--输出实体[RU_ENGINE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ru_engine-45-15">
+    <changeSet author="root" id="tab-ru_engine-45-15">
         <createTable tableName="IBZRULEENGINE">
                 <column name="ENGINEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_ENGINE_ENGINEID"/>
@@ -432,7 +432,7 @@
 
 
     <!--输出实体[RU_ITEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ru_item-77-16">
+    <changeSet author="root" id="tab-ru_item-77-16">
         <createTable tableName="IBZRULE">
                 <column name="RULEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_ITEM_RULEID"/>
@@ -469,7 +469,7 @@
         <!--输出实体[DA_BUILD]外键关系 -->
         <!--输出实体[DA_CHART]外键关系 -->
         <!--输出实体[DA_METRIC]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-da_metric-59-17">
+    <changeSet author="root" id="fk-da_metric-59-17">
        <addForeignKeyConstraint baseColumnNames="BUILDID" baseTableName="IBZDAMETRIC" constraintName="DER1N_DA_METRIC_DA_BUILD_BUILD" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BUILDID" referencedTableName="IBZDABUILD" validate="true"/>
     </changeSet>
         <!--输出实体[DA_REPORT]外键关系 -->

ibzdst-dependencies/pom.xml

@@ -31,9 +31,6 @@
         <mybatis-plus.version>3.3.1</mybatis-plus.version>
         <mybatis-plus-dynamic-datasource.version>3.0.0</mybatis-plus-dynamic-datasource.version>
 
-        <!--  Liquibase -->
-        <liquibase.version>3.6.3</liquibase.version>
-
         <!--  Swagger2 -->
         <springfox-swagger.version>2.9.2</springfox-swagger.version>
 
@@ -60,7 +57,7 @@
         <jsonwebtoken-jjwt.version>0.9.1</jsonwebtoken-jjwt.version>
 
         <!--Liquibase数据库版本更新工具-->
-        <liquibase.version>3.8.7</liquibase.version>
+        <liquibase.version>3.9.0</liquibase.version>
 
         <!--H2内存数据库-->
         <h2.version>1.4.200</h2.version>