diff --git a/app.platform/src/main/java/app/platform/Application.java b/app.platform/src/main/java/app/platform/Application.java
index fbf65453..e8a7f8e9 100644
--- a/app.platform/src/main/java/app/platform/Application.java
+++ b/app.platform/src/main/java/app/platform/Application.java
@@ -2,14 +2,9 @@ package app.platform;
import io.sc.platform.core.ApplicationLauncher;
import io.sc.platform.core.PlatformSpringBootServletInitializer;
-import io.sc.platform.orm.service.support.QueryParameter;
-import io.sc.platform.orm.service.support.criteria.Criteria;
-import io.sc.platform.orm.service.support.criteria.impl.GreaterOrEquals;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.web.WebApplicationInitializer;
-import java.util.List;
-
/**
* 应用程序入口
*/
@@ -17,118 +12,5 @@ import java.util.List;
public class Application extends PlatformSpringBootServletInitializer implements WebApplicationInitializer {
public static void main(String[] args) throws Exception {
ApplicationLauncher.run(Application.class,args);
- String xml ="\n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " {\"A2\":\"platformAssigneeQueryService\"}\n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " ";
}
}
diff --git a/cips.frontend/package.json b/cips.frontend/package.json
index 88e9e7a6..4dd6eeb8 100644
--- a/cips.frontend/package.json
+++ b/cips.frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "cips.frontend",
- "version": "8.2.34",
+ "version": "8.2.35",
"description": "",
"private": false,
"keywords": [],
@@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6",
"pinia": "2.3.0",
"pinia-undo": "0.2.4",
- "platform-core": "8.2.127",
+ "platform-core": "8.2.128",
"quasar": "2.17.6",
"sort-array": "5.0.0",
"svg-path-commander": "2.1.7",
diff --git a/erm.frontend/package.json b/erm.frontend/package.json
index 2f899ea1..1d84e840 100644
--- a/erm.frontend/package.json
+++ b/erm.frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "erm.frontend",
- "version": "8.2.34",
+ "version": "8.2.35",
"description": "",
"private": false,
"keywords": [],
@@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6",
"pinia": "2.3.0",
"pinia-undo": "0.2.4",
- "platform-core": "8.2.127",
+ "platform-core": "8.2.128",
"quasar": "2.17.6",
"sort-array": "5.0.0",
"svg-path-commander": "2.1.7",
diff --git a/gradle.properties b/gradle.properties
index b8850e93..b5f28e0b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -37,9 +37,9 @@ application_version=1.0.0
# platform
###########################################################
platform_group=io.sc
-platform_version=8.2.34
+platform_version=8.2.35
platform_plugin_version=8.2.10
-platform_core_frontend_version=8.2.127
+platform_core_frontend_version=8.2.128
###########################################################
# dependencies version
diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json
index ccfcf15b..47602526 100644
--- a/io.sc.engine.mv.frontend/package.json
+++ b/io.sc.engine.mv.frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "io.sc.engine.mv.frontend",
- "version": "8.2.34",
+ "version": "8.2.35",
"description": "",
"private": false,
"keywords": [],
@@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6",
"pinia": "2.3.0",
"pinia-undo": "0.2.4",
- "platform-core": "8.2.127",
+ "platform-core": "8.2.128",
"quasar": "2.17.6",
"sort-array": "5.0.0",
"svg-path-commander": "2.1.7",
diff --git a/io.sc.engine.rule.client/src/main/resources/META-INF/platform/plugins/exportable-resources.json b/io.sc.engine.rule.client/src/main/resources/META-INF/platform/plugins/exportable-resources.json
index 45d85b8e..79ca3bf5 100644
--- a/io.sc.engine.rule.client/src/main/resources/META-INF/platform/plugins/exportable-resources.json
+++ b/io.sc.engine.rule.client/src/main/resources/META-INF/platform/plugins/exportable-resources.json
@@ -29,31 +29,31 @@
},
{
"type" :"file",
- "name" :"io.sc.engine.rule.core-8.2.27.jar",
- "description" :"io.sc.engine.rule.core-8.2.27.jar",
- "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.engine.rule.core-8.2.27.jar"],
- "target" :"${dir.engine.rule.classpath}/io.sc.engine.rule.core-8.2.27.jar"
+ "name" :"io.sc.engine.rule.core-8.2.34.jar",
+ "description" :"io.sc.engine.rule.core-8.2.34.jar",
+ "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.engine.rule.core-8.2.34.jar"],
+ "target" :"${dir.engine.rule.classpath}/io.sc.engine.rule.core-8.2.34.jar"
},
{
"type" :"file",
- "name" :"io.sc.platform.util-8.2.27.jar",
- "description" :"io.sc.platform.util-8.2.27.jar",
- "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.platform.util-8.2.27.jar"],
- "target" :"${dir.engine.rule.classpath}/io.sc.platform.util-8.2.27.jar"
+ "name" :"io.sc.platform.util-8.2.34.jar",
+ "description" :"io.sc.platform.util-8.2.34.jar",
+ "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.platform.util-8.2.34.jar"],
+ "target" :"${dir.engine.rule.classpath}/io.sc.platform.util-8.2.34.jar"
},
{
"type" :"file",
- "name" :"io.sc.creditreport.core-8.2.27.jar",
- "description" :"io.sc.creditreport.core-8.2.27.jar",
- "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.creditreport.core-8.2.27.jar"],
- "target" :"${dir.engine.rule.classpath}/io.sc.creditreport.core-8.2.27.jar"
+ "name" :"io.sc.creditreport.core-8.2.34.jar",
+ "description" :"io.sc.creditreport.core-8.2.34.jar",
+ "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.creditreport.core-8.2.34.jar"],
+ "target" :"${dir.engine.rule.classpath}/io.sc.creditreport.core-8.2.34.jar"
},
{
"type" :"file",
- "name" :"io.sc.engine.rule.client.spring-8.2.27.jar",
- "description" :"io.sc.engine.rule.client.spring-8.2.27.jar",
- "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.engine.rule.client.spring-8.2.27.jar"],
- "target" :"${dir.engine.rule.classpath}/io.sc.engine.rule.client.spring-8.2.27.jar"
+ "name" :"io.sc.engine.rule.client.spring-8.2.34.jar",
+ "description" :"io.sc.engine.rule.client.spring-8.2.34.jar",
+ "sources" :["classpath:/io/sc/engine/rule/client/jars/io.sc.engine.rule.client.spring-8.2.34.jar"],
+ "target" :"${dir.engine.rule.classpath}/io.sc.engine.rule.client.spring-8.2.34.jar"
},
{
diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json
index c6e9e5d3..d0cb74a8 100644
--- a/io.sc.engine.rule.frontend/package.json
+++ b/io.sc.engine.rule.frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "io.sc.engine.rule.frontend",
- "version": "8.2.34",
+ "version": "8.2.35",
"description": "",
"private": false,
"keywords": [],
@@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6",
"pinia": "2.3.0",
"pinia-undo": "0.2.4",
- "platform-core": "8.2.127",
+ "platform-core": "8.2.128",
"quasar": "2.17.6",
"sort-array": "5.0.0",
"svg-path-commander": "2.1.7",
diff --git a/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/controller/ParameterWebController.java b/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/controller/ParameterWebController.java
index 9229118a..7c2df198 100644
--- a/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/controller/ParameterWebController.java
+++ b/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/controller/ParameterWebController.java
@@ -47,7 +47,7 @@ public class ParameterWebController extends RestCrudController entities =service.findParametersByModelId(modelId);
- ParameterAndValueType parameterAndValueType =parameterAndValueTypeService.findInParameterByResourceId(rootModelEntity.getResource().getId(),locale);
+ ParameterAndValueType parameterAndValueType =parameterAndValueTypeService.findByModelId(modelId,Locale.getDefault());
VariableCodeAndNameReplacer.replace(entities,parameterAndValueType, ReplaceMode.CODE_TO_NAME);
return EntityVoUtil.toVo(entities);
}
diff --git a/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/service/impl/ParameterInOptionItemServiceImpl.java b/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/service/impl/ParameterInOptionItemServiceImpl.java
index 1643670b..919fea59 100644
--- a/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/service/impl/ParameterInOptionItemServiceImpl.java
+++ b/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/service/impl/ParameterInOptionItemServiceImpl.java
@@ -72,7 +72,8 @@ public class ParameterInOptionItemServiceImpl extends DaoServiceImpl {
}
needFetchData.value = false;
customDisplayValue.value = '';
+ console.info('modelValue.value', modelValue.value);
if (Array.isArray(modelValue.value)) {
if (props.grid['tree']) {
fieldMethodsClass.clearValue();
diff --git a/io.sc.platform.core.frontend/src/views/testcase/form/form.vue b/io.sc.platform.core.frontend/src/views/testcase/form/form.vue
index a793640d..8e85a6e1 100644
--- a/io.sc.platform.core.frontend/src/views/testcase/form/form.vue
+++ b/io.sc.platform.core.frontend/src/views/testcase/form/form.vue
@@ -1,82 +1,199 @@
-
+
diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json
index 49ddf4a5..5ef81b7b 100644
--- a/io.sc.platform.core.frontend/template-project/package.json
+++ b/io.sc.platform.core.frontend/template-project/package.json
@@ -1,6 +1,6 @@
{
"name": "platform-core",
- "version": "8.2.127",
+ "version": "8.2.128",
"description": "前端核心包,用于快速构建前端的脚手架",
"private": false,
"keywords": [],
@@ -111,7 +111,7 @@
"mockjs": "1.1.0",
"node-sql-parser": "5.3.6",
"pinia": "2.3.0",
- "platform-core": "8.2.127",
+ "platform-core": "8.2.128",
"quasar": "2.17.6",
"sort-array": "5.0.0",
"svg-path-commander": "2.1.7",
diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/form/form.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/form.vue
index a793640d..8e85a6e1 100644
--- a/io.sc.platform.core.frontend/template-project/src/views/testcase/form/form.vue
+++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/form.vue
@@ -1,82 +1,199 @@
-
+
diff --git a/io.sc.platform.developer.frontend/src/i18n/messages.json b/io.sc.platform.developer.frontend/src/i18n/messages.json
index 9b604d5c..4c90d6d3 100644
--- a/io.sc.platform.developer.frontend/src/i18n/messages.json
+++ b/io.sc.platform.developer.frontend/src/i18n/messages.json
@@ -46,6 +46,7 @@
"developer.backend.import.liquibase.import.tip": "Are you sure to import?",
"developer.backend.export.liquibase.datasource": "Datasource",
+ "developer.backend.export.liquibase.catalog": "Catalog",
"developer.backend.export.liquibase.schema": "Schema",
"developer.backend.export.liquibase.tables": "Tables",
"developer.backend.export.liquibase.export.tip": "Are you sure to export?",
diff --git a/io.sc.platform.developer.frontend/src/i18n/messages_tw_CN.json b/io.sc.platform.developer.frontend/src/i18n/messages_tw_CN.json
index 9c22c827..ae0d03a7 100644
--- a/io.sc.platform.developer.frontend/src/i18n/messages_tw_CN.json
+++ b/io.sc.platform.developer.frontend/src/i18n/messages_tw_CN.json
@@ -46,6 +46,7 @@
"developer.backend.import.liquibase.import.tip": "您確定要導入嗎?",
"developer.backend.export.liquibase.datasource": "數據源",
+ "developer.backend.export.liquibase.catalog": "目錄",
"developer.backend.export.liquibase.schema": "方案",
"developer.backend.export.liquibase.tables": "表",
"developer.backend.export.liquibase.export.tip": "您確定要導出嗎?",
diff --git a/io.sc.platform.developer.frontend/src/i18n/messages_zh_CN.json b/io.sc.platform.developer.frontend/src/i18n/messages_zh_CN.json
index 3c990656..e28924b1 100644
--- a/io.sc.platform.developer.frontend/src/i18n/messages_zh_CN.json
+++ b/io.sc.platform.developer.frontend/src/i18n/messages_zh_CN.json
@@ -46,6 +46,7 @@
"developer.backend.import.liquibase.import.tip": "您确定要导入吗?",
"developer.backend.export.liquibase.datasource": "数据源",
+ "developer.backend.export.liquibase.catalog": "目录",
"developer.backend.export.liquibase.schema": "方案",
"developer.backend.export.liquibase.tables": "表",
"developer.backend.export.liquibase.export.tip": "您确定要导出吗?",
diff --git a/io.sc.platform.developer.frontend/src/remote-components/remote-components.json b/io.sc.platform.developer.frontend/src/remote-components/remote-components.json
index 46e62520..8e2b7eeb 100644
--- a/io.sc.platform.developer.frontend/src/remote-components/remote-components.json
+++ b/io.sc.platform.developer.frontend/src/remote-components/remote-components.json
@@ -5,8 +5,4 @@
"componentPath": "组件 .vue 文件路径"
}
*/
- {
- "component": "component.remote.developer.XXX",
- "componentPath": "@/views/XXX.vue"
- }
]
diff --git a/io.sc.platform.developer.frontend/src/views/XXX.vue b/io.sc.platform.developer.frontend/src/views/XXX.vue
deleted file mode 100644
index 66471465..00000000
--- a/io.sc.platform.developer.frontend/src/views/XXX.vue
+++ /dev/null
@@ -1,4 +0,0 @@
-
- XXX
-
-
diff --git a/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase copy.vue b/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase copy.vue
new file mode 100644
index 00000000..4b648152
--- /dev/null
+++ b/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase copy.vue
@@ -0,0 +1,245 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
{
const datasourceChanged = (datasource: string) => {
datasource = datasource || '';
- axios.get(Environment.apiContextPath('/api/jdbc/metadata/getSchemas?datasource=' + datasource)).then((response) => {
+ axios.get(Environment.apiContextPath('/api/jdbc/metadata/getCatalogs?datasource=' + datasource)).then((response) => {
const data = response?.data;
- const schemaOptions = [];
+ const catalogOptions = [];
if (data && data.length > 0) {
for (let item of data) {
- schemaOptions.push({ label: item.name, value: item.name });
+ catalogOptions.push({ label: item.name, value: item.name });
}
}
- schemaOptionsRef.value = schemaOptions;
+ catalogOptionsRef.value = catalogOptions;
+ schemaOptionsRef.value = [];
tablesOptionsRef.value = [];
});
};
-const schemaChanged = (datasource: string, schema: string) => {
+const catalogChanged = (datasource: string, catalog: string) => {
datasource = datasource || '';
- schema = schema || '';
- axios.get(Environment.apiContextPath('/api/jdbc/metadata/getTables?datasource=' + datasource + '&schema=' + schema)).then((response) => {
+ axios.get(Environment.apiContextPath('/api/jdbc/metadata/getSchemas?datasource=' + datasource + '&catalog=' + catalog)).then((response) => {
const data = response?.data;
- const tablesOptions = [];
+ const schemaOptions = [];
if (data && data.length > 0) {
for (let item of data) {
- tablesOptions.push({ label: item.name, value: item.name });
+ schemaOptions.push({ label: item.name, value: item.name });
}
}
- tablesOptionsRef.value = tablesOptions;
+ schemaOptionsRef.value = schemaOptions;
+ tablesOptionsRef.value = [];
+ if (schemaOptions.length === 0) {
+ schemaChanged(datasource, catalog, '');
+ } else if (schemaOptions.length === 1) {
+ schemaChanged(datasource, catalog, schemaOptions[0]);
+ }
});
};
+const schemaChanged = (datasource: string, catalog: string, schema: string) => {
+ datasource = datasource || '';
+ catalog = catalog || '';
+ schema = schema || '';
+ axios
+ .get(Environment.apiContextPath('/api/jdbc/metadata/getTables?datasource=' + datasource + '&catalog=' + catalog + '&schema=' + schema))
+ .then((response) => {
+ const data = response?.data;
+ const tablesOptions = [];
+ if (data && data.length > 0) {
+ for (let item of data) {
+ tablesOptions.push({ label: item.name + ' - ' + item.remarks, value: item.name });
+ }
+ }
+ tablesOptionsRef.value = tablesOptions;
+ });
+};
+
const exportData = (e) => {
DialogManager.confirm(t('developer.backend.export.liquibase.export.tip'), () => {
const data = valueReactive;
diff --git a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessOperationServiceImpl.java b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessOperationServiceImpl.java
index ab2216ad..8c90bb89 100644
--- a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessOperationServiceImpl.java
+++ b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessOperationServiceImpl.java
@@ -264,6 +264,8 @@ public class ProcessOperationServiceImpl implements ProcessOperationService {
//是否是退回操作
boolean isReturn =isReturn(task,newTask);
+ //是否退回后原路提交
+ boolean isSubmit2Return =isSubmit2Return(transientVariables);
//如果未分配到单一的一个处理人,需要根据流程定义查找可用的处理人
String taskDefinitionKey =newTask.getTaskDefinitionKey();
@@ -298,7 +300,8 @@ public class ProcessOperationServiceImpl implements ProcessOperationService {
}
}
String historyAssignee =historyTask.getAssignee();
- if(StringUtils.hasText(historyAssignee) && isReturn) {
+ //如果是退回或者退回后再原路提交, 则直接分配给原处理人
+ if(StringUtils.hasText(historyAssignee) && (isReturn || isSubmit2Return)) {
AgentEntity agent =getAgent(historyAssignee);
if(agent!=null){
taskService.setAssignee(newTask.getId(), agent.getAgentLoginName());
@@ -430,6 +433,33 @@ public class ProcessOperationServiceImpl implements ProcessOperationService {
return value<0;
}
+ /**
+ * 是否退回后原路提交(即: 退回后, 提交给上一个退回的节点及处理人)
+ * 判断条件: submit 在 (-900,-800] 区间内
+ * @param transientVariables 临时变量
+ * @return 是否退回后原路提交
+ */
+ private boolean isSubmit2Return(Map transientVariables){
+ if(transientVariables==null || transientVariables.isEmpty()){
+ return false;
+ }
+ Object submit =transientVariables.get("submit");
+ if(submit==null){
+ return false;
+ }
+ if(submit instanceof Integer){
+ Integer value =(Integer)submit;
+ return value>-900 && value <=-800;
+ }else{
+ try {
+ Integer value = Integer.parseInt(submit.toString());
+ return value>-900 && value <=-800;
+ } catch (NumberFormatException e) {
+ return false;
+ }
+ }
+ }
+
@Override
@Transactional
public List getGobacks(String taskId) throws Exception {
diff --git a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/support/BusinessKeyAndDescriptionWrapperMapper.java b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/support/BusinessKeyAndDescriptionWrapperMapper.java
index b65e4141..b46efe7c 100644
--- a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/support/BusinessKeyAndDescriptionWrapperMapper.java
+++ b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/support/BusinessKeyAndDescriptionWrapperMapper.java
@@ -9,7 +9,7 @@ public class BusinessKeyAndDescriptionWrapperMapper implements RowMapper tables =MetaDataLoader.newInstance().getTables(dataSource,configure.getSchema(),tableNames);
+ List tables =MetaDataLoader.newInstance().getTables(dataSource,configure.getCatalog(),configure.getSchema());
String outPutDir =OUTPUT_PATH + "/" + configure.getSchema();
FileUtil.deldirs(outPutDir);
String dataDir =outPutDir + "/data";
diff --git a/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/LiquibaseSchemaExporter.java b/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/LiquibaseSchemaExporter.java
index 9c5060df..950fbe2e 100644
--- a/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/LiquibaseSchemaExporter.java
+++ b/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/LiquibaseSchemaExporter.java
@@ -35,7 +35,7 @@ public class LiquibaseSchemaExporter implements SchemaExporter {
private void exportSingleFile(DataSource dataSource, SchemaExportConfigure configure) throws XMLStreamException, FileNotFoundException, UnsupportedEncodingException, MetaDataAccessException {
XMLStreamWriter writer = WriterUtil.xmlStreamWriter(OUTPUT_PATH + File.separator + "schema." + configure.getSchema() + ".xml");
writeHeader(writer,configure.getSchema());
- List tables =MetaDataLoader.newInstance().getTables(dataSource,configure.getSchema(),configure.getTables());
+ List tables =MetaDataLoader.newInstance().getTables(dataSource,configure.getCatalog(), configure.getSchema());
for(Table table : tables){
writeTable(table,writer);
}
@@ -45,7 +45,7 @@ public class LiquibaseSchemaExporter implements SchemaExporter {
}
private void exportMultiFile(DataSource dataSource, SchemaExportConfigure configure) throws MetaDataAccessException, XMLStreamException, FileNotFoundException, UnsupportedEncodingException {
- List tables =MetaDataLoader.newInstance().getTables(dataSource,configure.getSchema(),configure.getTables());
+ List tables =MetaDataLoader.newInstance().getTables(dataSource, configure.getCatalog(), configure.getSchema());
for(Table table : tables){
XMLStreamWriter writer = WriterUtil.xmlStreamWriter(OUTPUT_PATH + File.separator + "schema." + configure.getSchema() + "." + table.getName() + ".xml");
writeHeader(writer,configure.getSchema() + "." + table.getName());
diff --git a/io.sc.platform.jdbc.schemacrawler/src/main/java/io/sc/platform/jdbc/schemacrawler/MetaDataLoaderImpl.java b/io.sc.platform.jdbc.schemacrawler/src/main/java/io/sc/platform/jdbc/schemacrawler/MetaDataLoaderImpl.java
index 83bd51a5..5f3cbef4 100644
--- a/io.sc.platform.jdbc.schemacrawler/src/main/java/io/sc/platform/jdbc/schemacrawler/MetaDataLoaderImpl.java
+++ b/io.sc.platform.jdbc.schemacrawler/src/main/java/io/sc/platform/jdbc/schemacrawler/MetaDataLoaderImpl.java
@@ -3,22 +3,23 @@ package io.sc.platform.jdbc.schemacrawler;
import io.sc.platform.jdbc.DatabaseType;
import io.sc.platform.jdbc.meta.MetaDataLoader;
import io.sc.platform.jdbc.meta.support.*;
+import io.sc.platform.jdbc.util.SqlTypeUtil;
import io.sc.platform.util.CollectionUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import schemacrawler.inclusionrule.RegularExpressionExclusionRule;
import schemacrawler.schema.ColumnReference;
import schemacrawler.schema.TableRelationshipType;
+import schemacrawler.schema.TableType;
import schemacrawler.schemacrawler.*;
import schemacrawler.tools.utility.SchemaCrawlerUtility;
import us.fatehi.utility.datasource.DatabaseConnectionSource;
import us.fatehi.utility.datasource.DatabaseConnectionSources;
import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.sql.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -26,186 +27,201 @@ import java.util.List;
@Service("io.sc.platform.jdbc.schemacrawler.MetaDataLoaderImpl")
public class MetaDataLoaderImpl implements MetaDataLoader {
- @Override
- public List getSchemas(DataSource dataSource) throws MetaDataAccessException {
- DatabaseConnectionSource innerDataSource = DatabaseConnectionSources.fromDataSource(dataSource);
- LimitOptions limitOptions = getDefaultLimitOptionsBuilder(dataSource).toOptions();
- LoadOptions loadOptions = getLoadOptions(SchemaInfoLevelBuilder.minimum());
- SchemaCrawlerOptions options =SchemaCrawlerOptionsBuilder.newSchemaCrawlerOptions()
- .withLimitOptions(limitOptions)
- .withLoadOptions(loadOptions);
- schemacrawler.schema.Catalog catalog = SchemaCrawlerUtility.getCatalog(innerDataSource, options);
- Collection schemas =catalog.getSchemas();
- List result =new ArrayList<>();
- for(schemacrawler.schema.Schema schema: schemas) {
- result.add(from(schema));
- }
- return result;
- }
+ private static final Logger log = LoggerFactory.getLogger(MetaDataLoaderImpl.class);
- public List getTableSummary(DataSource dataSource, String schemaName,boolean isCount) throws MetaDataAccessException {
- DatabaseConnectionSource innerDataSource = DatabaseConnectionSources.fromDataSource(dataSource);
- LimitOptions limitOptions =getLimitOptions(dataSource,schemaName);
- LoadOptions loadOptions = getLoadOptions(SchemaInfoLevelBuilder.minimum());
- SchemaCrawlerOptions options =SchemaCrawlerOptionsBuilder.newSchemaCrawlerOptions()
- .withLimitOptions(limitOptions)
- .withLoadOptions(loadOptions);
- schemacrawler.schema.Catalog catalog = SchemaCrawlerUtility.getCatalog(innerDataSource, options);
- if(!catalog.getSchemas().isEmpty()) {
- List tables =new ArrayList<>(catalog.getTables(catalog.getSchemas().iterator().next()));
- List result = new ArrayList<>();
- for (schemacrawler.schema.Table table : tables) {
- TableSummary tableSummary =new TableSummary();
- tableSummary.setName(table.getName());
- tableSummary.setRemarks(table.getRemarks());
- if(isCount){
- try(
- Connection connection =dataSource.getConnection();
- PreparedStatement ps =connection.prepareStatement("select count(1) from " + table.getName());
- ResultSet rs =ps.executeQuery();
- ){
- rs.next();
- tableSummary.setCount(rs.getLong(1));
- }catch (SQLException e){
- throw new MetaDataAccessException(e);
- }
- }
- result.add(tableSummary);
+ public List getCatalogs(DataSource dataSource) throws MetaDataAccessException {
+ List result =new ArrayList<>();
+ Connection connection =null;
+ ResultSet rs =null;
+ try {
+ connection =dataSource.getConnection();
+ DatabaseMetaData databaseMetaData =connection.getMetaData();
+ rs =databaseMetaData.getCatalogs();
+ while (rs.next()){
+ Catalog catalog =new Catalog();
+ catalog.setName(rs.getString("TABLE_CAT"));
+ result.add(catalog);
}
return result;
+ }catch (SQLException e){
+ throw new MetaDataAccessException(e);
+ }finally {
+ try{rs.close();} catch (SQLException e) {}
+ try{connection.close();} catch (SQLException e) {}
}
- return Collections.emptyList();
}
-
@Override
- public List getTables(DataSource dataSource, String schemaName, String... tableNames) throws MetaDataAccessException {
- DatabaseConnectionSource innerDataSource = DatabaseConnectionSources.fromDataSource(dataSource);
- LimitOptions limitOptions =getLimitOptions(dataSource,schemaName,tableNames);
- LoadOptions loadOptions = getLoadOptions(SchemaInfoLevelBuilder.standard());
- SchemaCrawlerOptions options =SchemaCrawlerOptionsBuilder.newSchemaCrawlerOptions()
- .withLimitOptions(limitOptions)
- .withLoadOptions(loadOptions);
- schemacrawler.schema.Catalog catalog = SchemaCrawlerUtility.getCatalog(innerDataSource, options);
- if(!catalog.getSchemas().isEmpty()) {
- List tables =new ArrayList<>(catalog.getTables(catalog.getSchemas().iterator().next()));
- CollectionUtil.bubbleSort(tables,new ParentAndChildrenTableComparator());
- List result = new ArrayList<>();
- for (schemacrawler.schema.Table table : tables) {
- Table innerTable =from(table);
- innerTable.setSelfReference(isSelfReference(table));
- result.add(innerTable);
+ public List getSchemas(DataSource dataSource, String catalogName) throws MetaDataAccessException {
+ List result =new ArrayList<>();
+ Connection connection =null;
+ ResultSet rs =null;
+ try {
+ connection =dataSource.getConnection();
+ DatabaseMetaData databaseMetaData =connection.getMetaData();
+ rs =databaseMetaData.getSchemas(catalogName,null);
+ while (rs.next()){
+ Schema schema =new Schema();
+ schema.setName(rs.getString("TABLE_SCHEM"));
+ result.add(schema);
}
return result;
+ }catch (SQLException e){
+ throw new MetaDataAccessException(e);
+ }finally {
+ try{rs.close();} catch (SQLException e) {}
+ try{connection.close();} catch (SQLException e) {}
}
- return Collections.emptyList();
- }
-
- public boolean isSelfReference(schemacrawler.schema.Table table) {
- Collection parentTables =table.getRelatedTables(TableRelationshipType.parent);
- if(parentTables!=null && !parentTables.isEmpty()) {
- for(schemacrawler.schema.Table parentTable : parentTables) {
- if(parentTable.equals(table)) {
- return true;
- }
- }
- }
- return false;
}
- private LimitOptions getLimitOptions(DataSource dataSource, String schemaName, String... tableNames) throws MetaDataAccessException {
- LimitOptions limitOptions =null;
-
- if(StringUtils.hasText(schemaName)){
- if(tableNames!=null && tableNames.length>0) {
- limitOptions = LimitOptionsBuilder.builder()
- .includeSchemas(new SchemaNameInclusionRule(schemaName))
- .includeTables(new TableNameInclusionRule(tableNames))
- .toOptions();
- }else{
- limitOptions = LimitOptionsBuilder.builder()
- .includeSchemas(new SchemaNameInclusionRule(schemaName))
- .toOptions();
- }
- }else{
- if(tableNames!=null && tableNames.length>0) {
- limitOptions = getDefaultLimitOptionsBuilder(dataSource)
- .includeTables(new TableNameInclusionRule(tableNames))
- .toOptions();
- }else{
- limitOptions = getDefaultLimitOptionsBuilder(dataSource)
- .toOptions();
+ @Override
+ public List getTables(DataSource dataSource, String catalogName, String schemaName) throws MetaDataAccessException {
+ List result =new ArrayList<>();
+ Connection connection =null;
+ ResultSet rs =null;
+ try {
+ connection =dataSource.getConnection();
+ DatabaseMetaData databaseMetaData =connection.getMetaData();
+ rs =databaseMetaData.getTables(catalogName,schemaName,null,new String[]{"TABLE"});
+ while (rs.next()){
+ Table table =new Table();
+ table.setName(rs.getString("TABLE_NAME"));
+ table.setRemarks(rs.getString("REMARKS"));
+ table.setColumns(getColumns(dataSource,catalogName,schemaName,table.getName()));
+ result.add(table);
}
+ } catch (SQLException e) {
+ throw new MetaDataAccessException(e);
+ }finally {
+ try{rs.close();} catch (SQLException e) {}
+ try{connection.close();} catch (SQLException e) {}
}
- return limitOptions;
+ return result;
}
- private LimitOptionsBuilder getDefaultLimitOptionsBuilder(DataSource dataSource) throws MetaDataAccessException {
- LimitOptionsBuilder builder =LimitOptionsBuilder.builder();
+ @Override
+ public List getColumns(DataSource dataSource, String catalogName, String schemaName, String tableName) throws MetaDataAccessException {
+ List result =new ArrayList<>();
+ Connection connection =null;
+ ResultSet rs =null;
try {
- DatabaseType type = DatabaseType.fromMetaData(dataSource);
- switch (type) {
- case DB2:
- builder.includeSchemas(new RegularExpressionExclusionRule("NULLID|SQLJ|SYSCAT|SYSFUN|SYSIBM|SYSIBMADM|SYSIBMINTERNAL|SYSIBMTS|SYSPROC|SYSPUBLIC|SYSSTAT|SYSTOOLS"));
- break;
- case H2:
- break;
- case MYSQL:
- builder.includeSchemas(new RegularExpressionExclusionRule("sys|mysql|performance_schema|information_schema"));
- break;
- case ORACLE:
- builder.includeSchemas(new RegularExpressionExclusionRule("ANONYMOUS|AUDSYS|APPQOSSYS|DBSFWUSER|DGPDB_INT|DIP|DVF|DVSYS|GGSYS|GSMADMIN_INTERNAL|GSMCATUSER|GSMUSER|LBACSYS|OPS\\$ORACLE|PDBADMIN|REMOTE_SCHEDULER_AGENT|SYS\\$UMF|SYSBACKUP|SYSDG|SYSKM|SYSRAC|XS\\$NULL|CTXSYS|DBSNMP|MDDATA|MDSYS|\\\"OPS\\$ORACLE\\\"|ORACLE_OCM|OUTLN|SYS|\\\"SYSTEM\\\"|\\\"SYS\\$UMF\\\"|XDB|\\\"XS\\$NULL\\\""));
- break;
- case POSTGRESQL:
- builder.includeSchemas(new RegularExpressionExclusionRule("pg_catalog|information_schema"));
- break;
+ connection =dataSource.getConnection();
+ DatabaseMetaData databaseMetaData =connection.getMetaData();
+ rs =databaseMetaData.getColumns(catalogName,schemaName,tableName,null);
+ while (rs.next()){
+ result.add(getColumn(rs));
}
- }catch (org.springframework.jdbc.support.MetaDataAccessException e){
+ } catch (SQLException e) {
throw new MetaDataAccessException(e);
+ }finally {
+ try{rs.close();} catch (SQLException e) {}
+ try{connection.close();} catch (SQLException e) {}
}
- return builder;
+ return result;
}
- private LoadOptions getLoadOptions(SchemaInfoLevel schemaInfoLevel){
- return LoadOptionsBuilder.builder()
- .withSchemaInfoLevel(schemaInfoLevel)
- .toOptions();
- }
+ private Column getColumn(ResultSet rs) throws SQLException {
+ String TABLE_CAT =rs.getString("TABLE_CAT"); //table catalog (may be null)
+ String TABLE_SCHEM =rs.getString("TABLE_SCHEM"); //table schema (may be null)
+ String TABLE_NAME =rs.getString("TABLE_NAME"); //table name (表名称)
+ String COLUMN_NAME =rs.getString("COLUMN_NAME"); //column name(列名)
+ int DATA_TYPE =rs.getInt ("DATA_TYPE"); //SQL type from java.sql.Types(列的数据类型)
+ String TYPE_NAME =rs.getString("TYPE_NAME"); //Data source dependent type name, for a UDT the type name is fully qualified
+ int COLUMN_SIZE =rs.getInt ("COLUMN_SIZE"); //column size
+ int BUFFER_LENGTH =rs.getInt ("BUFFER_LENGTH"); //is not used
+ int DECIMAL_DIGITS =rs.getInt ("DECIMAL_DIGITS"); //the number of fractional digits. Null is returned for data types where DECIMAL_DIGITS is not applicable.
+ int NUM_PREC_RADIX =rs.getInt ("NUM_PREC_RADIX"); //Radix (typically either 10 or 2)
+ int NULLABLE =rs.getInt ("NULLABLE"); //is NULL allowed.
+ String REMARKS =rs.getString("REMARKS"); //comment describing column (may be null)
+ String COLUMN_DEF =rs.getString("COLUMN_DEF"); //default value for the column, (may be null)
+ int SQL_DATA_TYPE =rs.getInt ("SQL_DATA_TYPE"); //unused
+ int SQL_DATETIME_SUB =rs.getInt ("SQL_DATETIME_SUB"); //unused
+ int CHAR_OCTET_LENGTH=rs.getInt ("CHAR_OCTET_LENGTH"); //for char types the maximum number of bytes in the column
+ int ORDINAL_POSITION =rs.getInt ("ORDINAL_POSITION"); //index of column in table (starting at 1)
+ String IS_NULLABLE =rs.getString("IS_NULLABLE"); //ISO rules are used to determine the nullability for a column.
+ //String SCOPE_CATLOG =rs.getString("SCOPE_CATLOG"); //catalog of table that is the scope of a reference attribute (null if DATA_TYPE isn't REF)
+ //String SCOPE_SCHEMA =rs.getString("SCOPE_SCHEMA"); //schema of table that is the scope of a reference attribute (null if the DATA_TYPE isn't REF)
+ //String SCOPE_TABLE =rs.getString("SCOPE_TABLE"); //table name that this the scope of a reference attribure (null if the DATA_TYPE isn't REF)
+ String SOURCE_DATA_TYPE =rs.getString("SOURCE_DATA_TYPE"); //source type of a distinct type or user-generated Ref type, SQL type from java.sql.Types
+ String IS_AUTOINCREMENT =rs.getString("IS_AUTOINCREMENT"); //Indicates whether this column is auto incremented
- private Schema from(schemacrawler.schema.Schema schema){
- Schema result =new Schema();
- result.setName(schema.getName()==null?schema.getCatalogName():schema.getName());
- return result;
+ Column column =new Column();
+ column.setName(COLUMN_NAME);
+ column.setRemarks(REMARKS);
+ column.setSqlType(SqlTypeUtil.getSqlTypeName(DATA_TYPE));
+ column.setJavaType(SqlTypeUtil.getJavaType(DATA_TYPE));
+
+ return column;
}
- private Table from(schemacrawler.schema.Table table){
- Table result =new Table();
- result.setName(table.getName());
- result.setRemarks(table.getRemarks());
- // 处理列
- for(schemacrawler.schema.Column column : table.getColumns()) {
- result.getColumns().add(from(column));
- }
- // 处理外键
- Collection foreignKeys =table.getForeignKeys();
- for(schemacrawler.schema.ForeignKey foreignKey : foreignKeys){
- result.getForeignKeys().add(from(foreignKey));
+ public List getTableSummary(DataSource dataSource, String catalogName, String schemaName, boolean isCount) throws MetaDataAccessException {
+ List tables =this.getTables(dataSource,catalogName,schemaName);
+ if(tables==null || tables.isEmpty()){
+ return Collections.emptyList();
}
- // 处理自引用
- for(ForeignKey foreignKey : result.getForeignKeys()){
- if(foreignKey.getForeignKeyTableName().equalsIgnoreCase(foreignKey.getPrimaryKeyTableName())){
- result.setSelfReferenceForeignKeyColumnName(foreignKey.getForeignKeyColumnName());
- result.setSelfReferencePrimaryKeyColumnName(foreignKey.getPrimaryKeyColumnName());
+ List result = new ArrayList<>();
+ for (Table table : tables) {
+ TableSummary tableSummary =new TableSummary();
+ tableSummary.setName(table.getName());
+ tableSummary.setRemarks(table.getRemarks());
+ if(isCount){
+ try(
+ Connection connection =dataSource.getConnection();
+ PreparedStatement ps =connection.prepareStatement("select count(1) from " + table.getName());
+ ResultSet rs =ps.executeQuery();
+ ){
+ rs.next();
+ tableSummary.setCount(rs.getLong(1));
+ }catch (SQLException e){
+ throw new MetaDataAccessException(e);
+ }
}
- }
- // 处理索引
- Collection indexes =table.getIndexes();
- for(schemacrawler.schema.Index index : indexes){
- result.getIndexes().add(from(index));
+ result.add(tableSummary);
}
return result;
}
+ public boolean isSelfReference(schemacrawler.schema.Table table) {
+ Collection parentTables =table.getRelatedTables(TableRelationshipType.parent);
+ if(parentTables!=null && !parentTables.isEmpty()) {
+ for(schemacrawler.schema.Table parentTable : parentTables) {
+ if(parentTable.equals(table)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ private Table from(DatabaseMetaData databaseMetaData,String tableName,String tableRemarks){
+// Table result =new Table();
+// result.setName(tableName);
+// result.setRemarks(tableRemarks);
+// // 处理列
+// for(schemacrawler.schema.Column column : table.getColumns()) {
+// result.getColumns().add(from(column));
+// }
+// // 处理外键
+// Collection foreignKeys =table.getForeignKeys();
+// for(schemacrawler.schema.ForeignKey foreignKey : foreignKeys){
+// result.getForeignKeys().add(from(foreignKey));
+// }
+// // 处理自引用
+// for(ForeignKey foreignKey : result.getForeignKeys()){
+// if(foreignKey.getForeignKeyTableName().equalsIgnoreCase(foreignKey.getPrimaryKeyTableName())){
+// result.setSelfReferenceForeignKeyColumnName(foreignKey.getForeignKeyColumnName());
+// result.setSelfReferencePrimaryKeyColumnName(foreignKey.getPrimaryKeyColumnName());
+// }
+// }
+// // 处理索引
+// Collection indexes =table.getIndexes();
+// for(schemacrawler.schema.Index index : indexes){
+// result.getIndexes().add(from(index));
+// }
+// return result;
+ return null;
+ }
+
private ForeignKey from(schemacrawler.schema.ForeignKey foreignKey){
ForeignKey result =new ForeignKey();
result.setForeignKeyTableName(foreignKey.getForeignKeyTable().getName());
diff --git a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/controller/JdbcMetaDataLoaderWebController.java b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/controller/JdbcMetaDataLoaderWebController.java
index 3f2c8ca8..f42d3bf9 100644
--- a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/controller/JdbcMetaDataLoaderWebController.java
+++ b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/controller/JdbcMetaDataLoaderWebController.java
@@ -1,5 +1,6 @@
package io.sc.platform.jdbc.controller;
+import io.sc.platform.jdbc.meta.support.Catalog;
import io.sc.platform.jdbc.meta.support.Schema;
import io.sc.platform.jdbc.meta.support.Table;
import io.sc.platform.jdbc.service.JdbcMetaDataLoaderService;
@@ -16,13 +17,19 @@ import java.util.List;
public class JdbcMetaDataLoaderWebController {
@Autowired private JdbcMetaDataLoaderService jdbcMetaDataLoaderService;
+ @GetMapping("getCatalogs")
+ public List getCatalogs(@RequestParam(name="datasource",required = false)String datasource) throws Exception {
+ return jdbcMetaDataLoaderService.getCatalogs(datasource);
+ }
+
@GetMapping("getSchemas")
- public List getSchemaNames(@RequestParam(name="datasource",required = false)String datasource) throws Exception {
- return jdbcMetaDataLoaderService.getSchemas(datasource);
+ public List getSchemaNames(@RequestParam(name="datasource",required = false)String datasource,@RequestParam(name="catalog",required = false)String catalog) throws Exception {
+ return jdbcMetaDataLoaderService.getSchemas(datasource,catalog);
}
@GetMapping("getTables")
- public List getTables(@RequestParam(name="datasource",required = false)String datasource, @RequestParam(name="schema")String schema) throws Exception {
- return jdbcMetaDataLoaderService.getTables(datasource,schema);
+ public List getTables(@RequestParam(name="datasource",required = false)String datasource, @RequestParam(name="catalog",required = false)String catalog,@RequestParam(name="schema")String schema) throws Exception {
+ //return jdbcMetaDataLoaderService.getTables(datasource,catalog,schema);
+ return jdbcMetaDataLoaderService.getTables(datasource,"platform",schema);
}
}
diff --git a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/exporter/support/DataExportConfigure.java b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/exporter/support/DataExportConfigure.java
index cf5a4ecb..a6d46b67 100644
--- a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/exporter/support/DataExportConfigure.java
+++ b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/exporter/support/DataExportConfigure.java
@@ -4,6 +4,7 @@ import org.springframework.util.StringUtils;
public class DataExportConfigure {
private String datasource;
+ private String catalog;
private String schema;
private ExportTable[] tables;
private int fetchSize =1000;
@@ -28,6 +29,14 @@ public class DataExportConfigure {
this.datasource = datasource;
}
+ public String getCatalog() {
+ return catalog;
+ }
+
+ public void setCatalog(String catalog) {
+ this.catalog = catalog;
+ }
+
public String getSchema() {
return schema;
}
diff --git a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/exporter/support/SchemaExportConfigure.java b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/exporter/support/SchemaExportConfigure.java
index c9ca4d7a..f5193d5a 100644
--- a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/exporter/support/SchemaExportConfigure.java
+++ b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/exporter/support/SchemaExportConfigure.java
@@ -2,6 +2,7 @@ package io.sc.platform.jdbc.exporter.support;
public class SchemaExportConfigure {
private String datasource;
+ private String catalog;
private String schema;
private String[] tables;
@@ -13,6 +14,14 @@ public class SchemaExportConfigure {
this.datasource = datasource;
}
+ public String getCatalog() {
+ return catalog;
+ }
+
+ public void setCatalog(String catalog) {
+ this.catalog = catalog;
+ }
+
public String getSchema() {
return schema;
}
diff --git a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/meta/MetaDataLoader.java b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/meta/MetaDataLoader.java
index 4d6a0478..5a22896e 100644
--- a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/meta/MetaDataLoader.java
+++ b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/meta/MetaDataLoader.java
@@ -1,9 +1,6 @@
package io.sc.platform.jdbc.meta;
-import io.sc.platform.jdbc.meta.support.MetaDataAccessException;
-import io.sc.platform.jdbc.meta.support.Schema;
-import io.sc.platform.jdbc.meta.support.Table;
-import io.sc.platform.jdbc.meta.support.TableSummary;
+import io.sc.platform.jdbc.meta.support.*;
import javax.sql.DataSource;
import java.util.Iterator;
@@ -14,41 +11,60 @@ import java.util.ServiceLoader;
* 数据库 META DATA 加载器接口
*/
public interface MetaDataLoader {
+ /**
+ * 获取数据库 Catalog 对象列表
+ * @param dataSource 数据源
+ * @return 数据库 Catalog 对象列表
+ */
+ public List getCatalogs(DataSource dataSource) throws MetaDataAccessException;
+
/**
* 获取数据库 Schema 对象列表
* @param dataSource 数据源
+ * @param catalogName 目录名
* @return 数据库 Schema 对象列表
*/
- public List getSchemas(DataSource dataSource) throws MetaDataAccessException;
+ public List getSchemas(DataSource dataSource,String catalogName) throws MetaDataAccessException;
/**
* 获取某个 Schema 下的表对象摘要列表
* @param dataSource 数据源
+ * @param catalogName 目录名
* @param schemaName Schema 名称
* @return 某个 Schema 下的表对象摘要列表
*/
- public default List getTableSummary(DataSource dataSource, String schemaName) throws MetaDataAccessException{
- return getTableSummary(dataSource,schemaName,false);
+ public default List getTableSummary(DataSource dataSource, String catalogName, String schemaName) throws MetaDataAccessException{
+ return getTableSummary(dataSource,catalogName,schemaName,false);
}
/**
* 获取某个 Schema 下的表对象摘要列表
* @param dataSource 数据源
+ * @param catalogName 目录名
* @param schemaName Schema 名称
* @param isCount 是否进行记录数统计
* @return 某个 Schema 下的表对象摘要列表
*/
- public List getTableSummary(DataSource dataSource, String schemaName, boolean isCount) throws MetaDataAccessException;
+ public List getTableSummary(DataSource dataSource, String catalogName, String schemaName, boolean isCount) throws MetaDataAccessException;
/**
* 获取某个 Schema 下的表对象列表
* @param dataSource 数据源
+ * @param catalogName 目录名
* @param schemaName Schema 名称
- * @param tableNames 表名称列表
* @return 某个 Schema 下的表对象列表
*/
+ public List getTables(DataSource dataSource, String catalogName, String schemaName) throws MetaDataAccessException;
- public List getTables(DataSource dataSource, String schemaName, String... tableNames) throws MetaDataAccessException;
+ /**
+ * 获取列对象列表
+ * @param dataSource 数据源
+ * @param catalogName 目录名
+ * @param schemaName Schema 名称
+ * @param tableName 表名称
+ * @return 列对象列表
+ */
+ public List getColumns(DataSource dataSource, String catalogName, String schemaName,String tableName) throws MetaDataAccessException;
public static MetaDataLoader newInstance(){
ServiceLoader serviceLoader =ServiceLoader.load(MetaDataLoader.class);
diff --git a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/meta/support/Catalog.java b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/meta/support/Catalog.java
new file mode 100644
index 00000000..6cebb190
--- /dev/null
+++ b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/meta/support/Catalog.java
@@ -0,0 +1,13 @@
+package io.sc.platform.jdbc.meta.support;
+
+public class Catalog {
+ private String name;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/service/JdbcMetaDataLoaderService.java b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/service/JdbcMetaDataLoaderService.java
index 054e230f..28067bd2 100644
--- a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/service/JdbcMetaDataLoaderService.java
+++ b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/service/JdbcMetaDataLoaderService.java
@@ -1,5 +1,6 @@
package io.sc.platform.jdbc.service;
+import io.sc.platform.jdbc.meta.support.Catalog;
import io.sc.platform.jdbc.meta.support.Schema;
import io.sc.platform.jdbc.meta.support.Table;
import io.sc.platform.jdbc.meta.support.TableSummary;
@@ -7,6 +8,7 @@ import io.sc.platform.jdbc.meta.support.TableSummary;
import java.util.List;
public interface JdbcMetaDataLoaderService {
- public List getSchemas(String datasourceName) throws Exception;
- public List getTables(String datasourceName, String schemaName) throws Exception;
+ public List getCatalogs(String datasourceName) throws Exception;
+ public List getSchemas(String datasourceName,String catalogName) throws Exception;
+ public List getTables(String datasourceName,String catalogName, String schemaName) throws Exception;
}
diff --git a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/service/impl/JdbcMetaDataLoaderServiceImpl.java b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/service/impl/JdbcMetaDataLoaderServiceImpl.java
index e0d20b5d..abcc8df1 100644
--- a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/service/impl/JdbcMetaDataLoaderServiceImpl.java
+++ b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/service/impl/JdbcMetaDataLoaderServiceImpl.java
@@ -1,6 +1,7 @@
package io.sc.platform.jdbc.service.impl;
import io.sc.platform.jdbc.meta.MetaDataLoader;
+import io.sc.platform.jdbc.meta.support.Catalog;
import io.sc.platform.jdbc.meta.support.Schema;
import io.sc.platform.jdbc.meta.support.Table;
import io.sc.platform.jdbc.service.DatasourceService;
@@ -19,7 +20,7 @@ public class JdbcMetaDataLoaderServiceImpl implements JdbcMetaDataLoaderService
@Autowired MetaDataLoader metaDataLoader;
@Override
- public List getSchemas(String datasourceName) throws Exception {
+ public List getCatalogs(String datasourceName) throws Exception {
DataSource dataSource =null;
if(StringUtils.hasText(datasourceName)) {
dataSource =datasourceService.getDatasource(datasourceName);
@@ -27,16 +28,27 @@ public class JdbcMetaDataLoaderServiceImpl implements JdbcMetaDataLoaderService
dataSource =datasourceService.getDefaultDatasource();
}
if(dataSource!=null){
- return metaDataLoader.getSchemas(dataSource);
+ return metaDataLoader.getCatalogs(dataSource);
}
return Collections.emptyList();
}
@Override
- public List getTables(String datasourceName, String schemaName) throws Exception {
- if(!StringUtils.hasText(schemaName)) {
- return Collections.emptyList();
+ public List getSchemas(String datasourceName,String catalogName) throws Exception {
+ DataSource dataSource =null;
+ if(StringUtils.hasText(datasourceName)) {
+ dataSource =datasourceService.getDatasource(datasourceName);
+ }else{
+ dataSource =datasourceService.getDefaultDatasource();
}
+ if(dataSource!=null){
+ return metaDataLoader.getSchemas(dataSource,catalogName);
+ }
+ return Collections.emptyList();
+ }
+
+ @Override
+ public List getTables(String datasourceName, String catalogName, String schemaName) throws Exception {
DataSource dataSource =null;
if(StringUtils.hasText(datasourceName)) {
dataSource =datasourceService.getDatasource(datasourceName);
@@ -44,7 +56,7 @@ public class JdbcMetaDataLoaderServiceImpl implements JdbcMetaDataLoaderService
dataSource =datasourceService.getDefaultDatasource();
}
if(dataSource!=null){
- return metaDataLoader.getTables(dataSource,schemaName);
+ return metaDataLoader.getTables(dataSource,catalogName,schemaName);
}
return Collections.emptyList();
}
diff --git a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/util/SqlTypeUtil.java b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/util/SqlTypeUtil.java
index 042d9f98..0176eced 100644
--- a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/util/SqlTypeUtil.java
+++ b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/util/SqlTypeUtil.java
@@ -21,7 +21,6 @@ public class SqlTypeUtil {
* @throws SQLException 违例
*/
public static String getString(ResultSet rs,String fieldName,int fieldType) throws SQLException {
- System.out.println(">>>>>>>>fieldType:" + fieldType);
switch(fieldType) {
case Types.CHAR:
case Types.VARCHAR:
diff --git a/io.sc.platform.lcdp.frontend/public/flowable/modeler/index.html b/io.sc.platform.lcdp.frontend/public/flowable/modeler/index.html
index 7bcd2ff2..0135a8e4 100644
--- a/io.sc.platform.lcdp.frontend/public/flowable/modeler/index.html
+++ b/io.sc.platform.lcdp.frontend/public/flowable/modeler/index.html
@@ -120,7 +120,7 @@
-
+