diff --git a/README.adoc b/README.adoc index e69de29b..7395026f 100644 --- a/README.adoc +++ b/README.adoc @@ -0,0 +1,3 @@ +. 用户管理功能中,设置用户机构时,机构树直接展示已经选择的机构,新增“选入”、“选出”功能,用于修改机构 +. 用户管理功能中,可修改设置用户所属默认机构,默认角色等 +. \ No newline at end of file diff --git a/cips.frontend/package.json b/cips.frontend/package.json index 0a57ff42..58def452 100644 --- a/cips.frontend/package.json +++ b/cips.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.110", + "platform-core": "8.2.115", "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 5a54be43..e27414c5 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.110", + "platform-core": "8.2.115", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/gradle.properties b/gradle.properties index aacdc76d..72aab60c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,7 +39,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.2.28 platform_plugin_version=8.2.10 -platform_core_frontend_version=8.2.110 +platform_core_frontend_version=8.2.115 ########################################################### # dependencies version @@ -71,9 +71,7 @@ jdbc_mysql_version=5.1.49 jdbc_oracle_version=19.23.0.0 jib_version=3.3.2 jjwt_version=0.9.1 -jxls_jexcel_version=1.0.7 -jxls_poi_version=1.0.15 -jxls_version=2.4.6 +jxls_version=2.14.0 kotlin_stdlib_version=1.9.25 manifold_version=2025.1.24 mybatis_version=3.5.14 diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 59da6296..0a88a032 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.110", + "platform-core": "8.2.115", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.mv.frontend/src/views/config/binomial.vue b/io.sc.engine.mv.frontend/src/views/config/binomial.vue index 41630c98..40128a56 100644 --- a/io.sc.engine.mv.frontend/src/views/config/binomial.vue +++ b/io.sc.engine.mv.frontend/src/views/config/binomial.vue @@ -10,7 +10,7 @@ :pageable="false" :sort-by="['significanceLevel']" :toolbar-configure="{ noIcon: false }" - :toolbar-actions="['refresh', 'separator', 'add', 'edit', 'remove', 'separator', 'resetDefaultValues', 'separator', 'view', 'separator', 'export']" + :toolbar-actions="['refresh', 'separator', 'add', 'edit', 'remove', 'separator', 'resetDefaultValues', 'separator', 'view']" :columns="[ { width: 100, name: 'significanceLevel', label: $t('io.sc.engine.mv.config.binomial.grid.entity.significanceLevel') }, { width: 100, name: 'confidenceLevel', label: $t('io.sc.engine.mv.config.binomial.grid.entity.confidenceLevel') }, diff --git a/io.sc.engine.mv.frontend/src/views/config/chiSquare.vue b/io.sc.engine.mv.frontend/src/views/config/chiSquare.vue index 0f32c998..f355bd0c 100644 --- a/io.sc.engine.mv.frontend/src/views/config/chiSquare.vue +++ b/io.sc.engine.mv.frontend/src/views/config/chiSquare.vue @@ -13,21 +13,7 @@ group-by-field="dof" group-start-open="none" :toolbar-configure="{ noIcon: false }" - :toolbar-actions="[ - 'refresh', - 'separator', - 'expand', - 'separator', - 'add', - 'edit', - 'remove', - 'separator', - 'resetDefaultValues', - 'separator', - 'view', - 'separator', - 'export', - ]" + :toolbar-actions="['refresh', 'separator', 'expand', 'separator', 'add', 'edit', 'remove', 'separator', 'resetDefaultValues', 'separator', 'view']" :columns="[ { width: 100, name: 'dof', label: $t('io.sc.engine.mv.config.chiSquare.grid.entity.dof') }, { width: 100, name: 'significanceLevel', label: $t('io.sc.engine.mv.config.chiSquare.grid.entity.significanceLevel') }, diff --git a/io.sc.engine.mv.frontend/src/views/config/cutOffPoint.vue b/io.sc.engine.mv.frontend/src/views/config/cutOffPoint.vue index 3252c983..1e2a28e5 100644 --- a/io.sc.engine.mv.frontend/src/views/config/cutOffPoint.vue +++ b/io.sc.engine.mv.frontend/src/views/config/cutOffPoint.vue @@ -9,7 +9,7 @@ :data-url="Environment.apiContextPath('/api/mv/configure/cutOffPoint')" :pageable="false" :toolbar-configure="{ noIcon: false }" - :toolbar-actions="['refresh', 'separator', 'add', 'edit', 'remove', 'separator', 'resetDefaultValues', 'separator', 'view', 'separator', 'export']" + :toolbar-actions="['refresh', 'separator', 'add', 'edit', 'remove', 'separator', 'resetDefaultValues', 'separator', 'view']" :columns="[ { width: '100%', name: 'name', label: $t('io.sc.engine.mv.config.cutOffPoint.grid.entity.name') }, { width: 100, name: 'from', label: $t('io.sc.engine.mv.config.cutOffPoint.grid.entity.from') }, diff --git a/io.sc.engine.mv.frontend/src/views/config/dataExtractor.vue b/io.sc.engine.mv.frontend/src/views/config/dataExtractor.vue index afc3fdef..d45c8aee 100644 --- a/io.sc.engine.mv.frontend/src/views/config/dataExtractor.vue +++ b/io.sc.engine.mv.frontend/src/views/config/dataExtractor.vue @@ -33,8 +33,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: 100, name: 'name', label: $t('name') }, diff --git a/io.sc.engine.mv.frontend/src/views/config/distribution.vue b/io.sc.engine.mv.frontend/src/views/config/distribution.vue index c9d3b13a..f254456c 100644 --- a/io.sc.engine.mv.frontend/src/views/config/distribution.vue +++ b/io.sc.engine.mv.frontend/src/views/config/distribution.vue @@ -13,7 +13,7 @@ group-by-field="modelName" group-start-open="none" :toolbar-configure="{ noIcon: false }" - :toolbar-actions="['refresh', 'separator', 'expand', 'separator', 'add', 'edit', 'remove', 'separator', 'view', 'separator', 'export']" + :toolbar-actions="['refresh', 'separator', 'expand', 'separator', 'add', 'edit', 'remove', 'separator', 'view']" :columns="[ { width: 150, name: 'modelId', label: $t('io.sc.engine.mv.config.distribution.grid.entity.modelId') }, { width: '100%', name: 'modelName', label: $t('io.sc.engine.mv.config.distribution.grid.entity.modelName') }, diff --git a/io.sc.engine.mv.frontend/src/views/config/executor.vue b/io.sc.engine.mv.frontend/src/views/config/executor.vue index 2f39c8d0..95ec2275 100644 --- a/io.sc.engine.mv.frontend/src/views/config/executor.vue +++ b/io.sc.engine.mv.frontend/src/views/config/executor.vue @@ -9,7 +9,7 @@ :pageable="false" :sort-by="['order']" :toolbar-configure="{ noIcon: false }" - :toolbar-actions="['refresh', 'separator', 'view', 'separator', 'export']" + :toolbar-actions="['refresh', 'separator', 'view']" :columns="[ { width: 80, name: 'order', label: $t('order'), align: 'right' }, { width: 280, name: 'nameI18nKey', label: $t('name'), sortable: false, format: Formater.i18n() }, diff --git a/io.sc.engine.mv.frontend/src/views/config/model.vue b/io.sc.engine.mv.frontend/src/views/config/model.vue index 61e8fac6..4193a916 100644 --- a/io.sc.engine.mv.frontend/src/views/config/model.vue +++ b/io.sc.engine.mv.frontend/src/views/config/model.vue @@ -24,8 +24,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: 150, name: 'modelId', label: $t('io.sc.engine.mv.config.model.grid.entity.modelId') }, diff --git a/io.sc.engine.mv.frontend/src/views/config/scale.vue b/io.sc.engine.mv.frontend/src/views/config/scale.vue index 1d3588d1..b1ead946 100644 --- a/io.sc.engine.mv.frontend/src/views/config/scale.vue +++ b/io.sc.engine.mv.frontend/src/views/config/scale.vue @@ -11,7 +11,7 @@ :pageable="false" :sort-by="['order']" :toolbar-configure="{ noIcon: false }" - :toolbar-actions="['refresh', 'separator', 'add', 'edit', 'remove', 'separator', 'view', 'separator', 'export']" + :toolbar-actions="['refresh', 'separator', 'add', 'edit', 'remove', 'separator', 'view']" :columns="[ { width: 150, name: 'modelId', label: $t('io.sc.engine.mv.config.scale.grid.entity.modelId') }, { width: '100%', name: 'modelName', label: $t('io.sc.engine.mv.config.scale.grid.entity.modelName') }, diff --git a/io.sc.engine.mv.frontend/src/views/config/threshold.vue b/io.sc.engine.mv.frontend/src/views/config/threshold.vue index 84af8c7b..d81be149 100644 --- a/io.sc.engine.mv.frontend/src/views/config/threshold.vue +++ b/io.sc.engine.mv.frontend/src/views/config/threshold.vue @@ -12,21 +12,7 @@ group-by-field="name" group-start-open="none" :toolbar-configure="{ noIcon: false }" - :toolbar-actions="[ - 'refresh', - 'separator', - 'expand', - 'separator', - 'add', - 'edit', - 'remove', - 'separator', - 'resetDefaultValues', - 'separator', - 'view', - 'separator', - 'export', - ]" + :toolbar-actions="['refresh', 'separator', 'expand', 'separator', 'add', 'edit', 'remove', 'separator', 'resetDefaultValues', 'separator', 'view']" :columns="[ { width: '100%', name: 'name', label: $t('io.sc.engine.mv.config.threshold.grid.entity.name') }, { width: 120, name: 'level', label: $t('io.sc.engine.mv.config.threshold.grid.entity.level'), align: 'right' }, diff --git a/io.sc.engine.mv.frontend/src/views/result/Result.vue b/io.sc.engine.mv.frontend/src/views/result/Result.vue index 6121300a..dadcf8cf 100644 --- a/io.sc.engine.mv.frontend/src/views/result/Result.vue +++ b/io.sc.engine.mv.frontend/src/views/result/Result.vue @@ -61,8 +61,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: 150, name: 'validateDate', label: $t('io.sc.engine.mv.result.grid.entity.validateDate') }, diff --git a/io.sc.engine.mv.frontend/src/views/sample/Sample.vue b/io.sc.engine.mv.frontend/src/views/sample/Sample.vue index e53690b8..73303038 100644 --- a/io.sc.engine.mv.frontend/src/views/sample/Sample.vue +++ b/io.sc.engine.mv.frontend/src/views/sample/Sample.vue @@ -47,8 +47,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: 140, name: 'customId', label: $t('io.sc.engine.mv.sample.scoreRecord.grid.entity.customId') }, diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index b4b0ab71..d39dbbd0 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.110", + "platform-core": "8.2.115", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.rule.frontend/src/views/lib/IndicatorGrid.vue b/io.sc.engine.rule.frontend/src/views/lib/IndicatorGrid.vue index a1b83a1e..08a88836 100644 --- a/io.sc.engine.rule.frontend/src/views/lib/IndicatorGrid.vue +++ b/io.sc.engine.rule.frontend/src/views/lib/IndicatorGrid.vue @@ -99,8 +99,6 @@ }, }, ], - 'separator', - 'export', ]" :query-form-cols-num="6" :query-form-fields="[ diff --git a/io.sc.engine.rule.frontend/src/views/lib/ProcessorGrid.vue b/io.sc.engine.rule.frontend/src/views/lib/ProcessorGrid.vue index b10bb4ea..543abdb5 100644 --- a/io.sc.engine.rule.frontend/src/views/lib/ProcessorGrid.vue +++ b/io.sc.engine.rule.frontend/src/views/lib/ProcessorGrid.vue @@ -63,8 +63,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { diff --git a/io.sc.engine.rule.frontend/src/views/resources/designer/Addition.vue b/io.sc.engine.rule.frontend/src/views/resources/designer/Addition.vue index c95890bd..e744ca7f 100644 --- a/io.sc.engine.rule.frontend/src/views/resources/designer/Addition.vue +++ b/io.sc.engine.rule.frontend/src/views/resources/designer/Addition.vue @@ -44,8 +44,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { diff --git a/io.sc.engine.rule.frontend/src/views/resources/designer/Option.vue b/io.sc.engine.rule.frontend/src/views/resources/designer/Option.vue index 068b8ae4..4131a6fe 100644 --- a/io.sc.engine.rule.frontend/src/views/resources/designer/Option.vue +++ b/io.sc.engine.rule.frontend/src/views/resources/designer/Option.vue @@ -44,8 +44,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: 60, name: 'order', label: $t('order'), align: 'right', showIf: false }, diff --git a/io.sc.engine.rule.frontend/src/views/resources/designer/Parameter.vue b/io.sc.engine.rule.frontend/src/views/resources/designer/Parameter.vue index 909ecb13..00875ecd 100644 --- a/io.sc.engine.rule.frontend/src/views/resources/designer/Parameter.vue +++ b/io.sc.engine.rule.frontend/src/views/resources/designer/Parameter.vue @@ -163,8 +163,6 @@ ...templateImportAndExportManager.getToolbarAction(), 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: 300, name: 'name', label: $t('name') }, diff --git a/io.sc.engine.rule.frontend/src/views/resources/designer/Processor.vue b/io.sc.engine.rule.frontend/src/views/resources/designer/Processor.vue index e789193d..62409e96 100644 --- a/io.sc.engine.rule.frontend/src/views/resources/designer/Processor.vue +++ b/io.sc.engine.rule.frontend/src/views/resources/designer/Processor.vue @@ -89,8 +89,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: 80, name: 'enable', label: $t('isEnable'), align: 'center', sortable: false, format: Formater.enableTag() }, diff --git a/io.sc.engine.rule.frontend/src/views/shared/TestcaseParameterGrid.vue b/io.sc.engine.rule.frontend/src/views/shared/TestcaseParameterGrid.vue index bd3d56be..1870b5e7 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/TestcaseParameterGrid.vue +++ b/io.sc.engine.rule.frontend/src/views/shared/TestcaseParameterGrid.vue @@ -57,8 +57,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: '100%', name: 'name', label: $t('name'), sortable: false }, diff --git a/io.sc.engine.rule.frontend/src/views/shared/Validator.vue b/io.sc.engine.rule.frontend/src/views/shared/Validator.vue index aeccb041..c4bba109 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/Validator.vue +++ b/io.sc.engine.rule.frontend/src/views/shared/Validator.vue @@ -38,8 +38,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: 60, name: 'order', label: $t('order'), sortable: false, align: 'right' }, diff --git a/io.sc.engine.rule.frontend/src/views/workflow/Workflow.vue b/io.sc.engine.rule.frontend/src/views/workflow/Workflow.vue index eee7c0f0..b8bbdab4 100644 --- a/io.sc.engine.rule.frontend/src/views/workflow/Workflow.vue +++ b/io.sc.engine.rule.frontend/src/views/workflow/Workflow.vue @@ -125,8 +125,6 @@ ], 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: 150, name: 'resourceCode', label: $t('code'), showIf: false }, diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index 8ce2bdee..5d7a7f7d 100644 --- a/io.sc.engine.st.frontend/package.json +++ b/io.sc.engine.st.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.110", + "platform-core": "8.2.115", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.st.frontend/src/views/DepFactor/DepFactor.vue b/io.sc.engine.st.frontend/src/views/DepFactor/DepFactor.vue index 2141d9ec..522e961f 100644 --- a/io.sc.engine.st.frontend/src/views/DepFactor/DepFactor.vue +++ b/io.sc.engine.st.frontend/src/views/DepFactor/DepFactor.vue @@ -42,8 +42,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: 60, name: 'year', label: t('year'), align: 'right' }, diff --git a/io.sc.engine.st.frontend/src/views/DepFactor/DepFactorDefine.vue b/io.sc.engine.st.frontend/src/views/DepFactor/DepFactorDefine.vue index 154e9fed..b0da113f 100644 --- a/io.sc.engine.st.frontend/src/views/DepFactor/DepFactorDefine.vue +++ b/io.sc.engine.st.frontend/src/views/DepFactor/DepFactorDefine.vue @@ -75,8 +75,6 @@ 'remove', 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: '100%', name: 'name', label: $t('name') }, diff --git a/io.sc.engine.st.frontend/src/views/IndepFactor/IndepFactor.vue b/io.sc.engine.st.frontend/src/views/IndepFactor/IndepFactor.vue index a78dc658..02a8a628 100644 --- a/io.sc.engine.st.frontend/src/views/IndepFactor/IndepFactor.vue +++ b/io.sc.engine.st.frontend/src/views/IndepFactor/IndepFactor.vue @@ -42,8 +42,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: 60, name: 'year', label: t('year'), align: 'right' }, diff --git a/io.sc.engine.st.frontend/src/views/IndepFactor/IndepFactorDefine.vue b/io.sc.engine.st.frontend/src/views/IndepFactor/IndepFactorDefine.vue index 6925d5cc..69d12bad 100644 --- a/io.sc.engine.st.frontend/src/views/IndepFactor/IndepFactorDefine.vue +++ b/io.sc.engine.st.frontend/src/views/IndepFactor/IndepFactorDefine.vue @@ -75,8 +75,6 @@ 'remove', 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: '100%', name: 'name', label: $t('name') }, diff --git a/io.sc.engine.st.frontend/src/views/Model/ModelDefine.vue b/io.sc.engine.st.frontend/src/views/Model/ModelDefine.vue index a8aa63a6..fa2477f2 100644 --- a/io.sc.engine.st.frontend/src/views/Model/ModelDefine.vue +++ b/io.sc.engine.st.frontend/src/views/Model/ModelDefine.vue @@ -40,8 +40,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: 200, name: 'name', label: $t('name') }, diff --git a/io.sc.engine.st.frontend/src/views/Scenario/ScenarioFactor.vue b/io.sc.engine.st.frontend/src/views/Scenario/ScenarioFactor.vue index d84567a3..74afce34 100644 --- a/io.sc.engine.st.frontend/src/views/Scenario/ScenarioFactor.vue +++ b/io.sc.engine.st.frontend/src/views/Scenario/ScenarioFactor.vue @@ -79,8 +79,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: 60, name: 'year', label: t('year'), align: 'right' }, diff --git a/io.sc.engine.st.frontend/src/views/Scenario/ScenarioFactorDefine.vue b/io.sc.engine.st.frontend/src/views/Scenario/ScenarioFactorDefine.vue index 8b6d9028..3ae286e5 100644 --- a/io.sc.engine.st.frontend/src/views/Scenario/ScenarioFactorDefine.vue +++ b/io.sc.engine.st.frontend/src/views/Scenario/ScenarioFactorDefine.vue @@ -38,8 +38,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: '100%', name: 'name', label: $t('name') }, diff --git a/io.sc.engine.st.frontend/src/views/TestCase/TestCase.vue b/io.sc.engine.st.frontend/src/views/TestCase/TestCase.vue index 19ada044..3be10329 100644 --- a/io.sc.engine.st.frontend/src/views/TestCase/TestCase.vue +++ b/io.sc.engine.st.frontend/src/views/TestCase/TestCase.vue @@ -33,8 +33,6 @@ }, }, 'view', - 'separator', - 'export', ]" :columns="[ { width: 160, name: 'name', label: $t('name') }, diff --git a/io.sc.platform.ai.frontend/package.json b/io.sc.platform.ai.frontend/package.json index 0572fb3f..b9ea0d53 100644 --- a/io.sc.platform.ai.frontend/package.json +++ b/io.sc.platform.ai.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.110", + "platform-core": "8.2.115", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index 9c9d1f90..8b04ba8d 100644 --- a/io.sc.platform.core.frontend/package.json +++ b/io.sc.platform.core.frontend/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.2.110", + "version": "8.2.115", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts index c691c102..4d61ea49 100644 --- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts +++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts @@ -25,6 +25,7 @@ export class Init { addDataUrl: { type: String, default: '' }, // 新增数据url editDataUrl: { type: String, default: '' }, // 修改数据url removeDataUrl: { type: String, default: '' }, // 删除数据url + exportDataUrl: { type: String, default: '' }, // 导出数据url customFetch: { type: Function, default: undefined }, // 自定义获取数据函数,若表格内置的查询参数或方式(GET、POST)等不满足使用场景,可使用该函数自定义进行查询,只需返回的结果结构与内置查询一致即可。 dense: { type: Boolean, default: undefined }, // 表格整体紧凑模式 denseHeader: { type: Boolean, default: undefined }, // 表格列标题紧凑模式 diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/toolbar/buttons/Export.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/toolbar/buttons/Export.ts index 578e3571..20e1d8c3 100644 --- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/toolbar/buttons/Export.ts +++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/toolbar/buttons/Export.ts @@ -1,5 +1,4 @@ -import { $t, axios, NotifyManager, Tools } from '@/platform'; -import { exportFile } from 'quasar'; +import { $t, axios, Downloader } from '@/platform'; import { PropsType, TableType } from '../../index'; import { Button } from '../Button'; @@ -15,37 +14,10 @@ export class Export extends Button { } async click(args) { - this.showLoading(); - let exportData = args.grid.getRows(); - // 判断是否配置了 url, 以不分页形式请求后端获取全部数据一把导出。 - if (!Tools.isEmpty(args.grid.props.fetchDataUrl) || !Tools.isEmpty(args.grid.props.dataUrl)) { - const fetchResult = await this.getExportData(); - if (fetchResult && fetchResult.length > 0) { - exportData = fetchResult; - } - } - const content = [args.grid.props.columns.map((col) => this.wrapCsvValue(col.label))] - .concat( - exportData.map((row) => - args.grid.props.columns - .map((col) => - this.wrapCsvValue(typeof col.field === 'function' ? col.field(row) : row[col.field === void 0 ? col.name : col.field], col.format, row), - ) - .join(','), - ), - ) - .join('\r\n'); - - const status = exportFile('table-export.csv', content, { - encoding: 'utf-8', - mimeType: 'text/csv', - byteOrderMark: '\uFEFF', // 解决乱码问题 - }); - - if (status !== true) { - NotifyManager.error($t('action.export.failed')); - } - this.hideLoading(); + const reqParams: any = { pageable: false }; + const urlSearchParams = this.tools?.criteriaFM.buildURLSearchParams(reqParams); + const url = this.table?.url.exportDataUrl || this.table.url.dataUrl + '/exportExcel'; + Downloader.get(url, { params: urlSearchParams }); } getButtonConfig() { @@ -59,31 +31,10 @@ export class Export extends Button { } private async getExportData() { - let resultData = []; - const reqParams: any = { pageable: false }; - const urlSearchParams = this.tools?.criteriaFM.buildURLSearchParams(reqParams); - const resp = await axios.get(this.table?.url.fetchDataUrl || this.table.url.dataUrl, { params: urlSearchParams }); - if (resp && resp.data) { - const responseData = resp.data; - if (Array.isArray(responseData)) { - resultData = responseData; - } else if (typeof responseData === 'object' && responseData.content) { - resultData = responseData.content; - } - } - return resultData; + return null; } private wrapCsvValue(val, formatFn, row) { - let formatted = formatFn !== void 0 ? formatFn(val, row) : val; - formatted = formatted === void 0 || formatted === null ? '' : String(formatted); - formatted = formatted.split('"').join('""'); - /** - * Excel accepts \n and \r in strings, but some other CSV parsers do not - * Uncomment the next two lines to escape new lines - */ - // .split('\n').join('\\n') - // .split('\r').join('\\r') - return `"${formatted}"`; + return null; } } diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/toolbar/buttons/Export2.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/toolbar/buttons/Export2.ts new file mode 100644 index 00000000..578e3571 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/toolbar/buttons/Export2.ts @@ -0,0 +1,89 @@ +import { $t, axios, NotifyManager, Tools } from '@/platform'; +import { exportFile } from 'quasar'; +import { PropsType, TableType } from '../../index'; +import { Button } from '../Button'; + +export class Export extends Button { + name = 'export'; + + constructor(props: PropsType, table: TableType) { + super(props, table); + this.click = this.click.bind(this); + this.getExportData = this.getExportData.bind(this); + this.wrapCsvValue = this.wrapCsvValue.bind(this); + this.getButtonConfig = this.getButtonConfig.bind(this); + } + + async click(args) { + this.showLoading(); + let exportData = args.grid.getRows(); + // 判断是否配置了 url, 以不分页形式请求后端获取全部数据一把导出。 + if (!Tools.isEmpty(args.grid.props.fetchDataUrl) || !Tools.isEmpty(args.grid.props.dataUrl)) { + const fetchResult = await this.getExportData(); + if (fetchResult && fetchResult.length > 0) { + exportData = fetchResult; + } + } + const content = [args.grid.props.columns.map((col) => this.wrapCsvValue(col.label))] + .concat( + exportData.map((row) => + args.grid.props.columns + .map((col) => + this.wrapCsvValue(typeof col.field === 'function' ? col.field(row) : row[col.field === void 0 ? col.name : col.field], col.format, row), + ) + .join(','), + ), + ) + .join('\r\n'); + + const status = exportFile('table-export.csv', content, { + encoding: 'utf-8', + mimeType: 'text/csv', + byteOrderMark: '\uFEFF', // 解决乱码问题 + }); + + if (status !== true) { + NotifyManager.error($t('action.export.failed')); + } + this.hideLoading(); + } + + getButtonConfig() { + return { + name: this.name, + icon: 'file_download', + labelI18nKey: 'action.export', + label: $t('action.export'), + click: this.click, + }; + } + + private async getExportData() { + let resultData = []; + const reqParams: any = { pageable: false }; + const urlSearchParams = this.tools?.criteriaFM.buildURLSearchParams(reqParams); + const resp = await axios.get(this.table?.url.fetchDataUrl || this.table.url.dataUrl, { params: urlSearchParams }); + if (resp && resp.data) { + const responseData = resp.data; + if (Array.isArray(responseData)) { + resultData = responseData; + } else if (typeof responseData === 'object' && responseData.content) { + resultData = responseData.content; + } + } + return resultData; + } + + private wrapCsvValue(val, formatFn, row) { + let formatted = formatFn !== void 0 ? formatFn(val, row) : val; + formatted = formatted === void 0 || formatted === null ? '' : String(formatted); + formatted = formatted.split('"').join('""'); + /** + * Excel accepts \n and \r in strings, but some other CSV parsers do not + * Uncomment the next two lines to escape new lines + */ + // .split('\n').join('\\n') + // .split('\r').join('\\r') + return `"${formatted}"`; + } +} diff --git a/io.sc.platform.core.frontend/src/platform/layout/sub-layout/Main.vue b/io.sc.platform.core.frontend/src/platform/layout/sub-layout/Main.vue index 76f7d012..d076a257 100644 --- a/io.sc.platform.core.frontend/src/platform/layout/sub-layout/Main.vue +++ b/io.sc.platform.core.frontend/src/platform/layout/sub-layout/Main.vue @@ -22,7 +22,7 @@ > - + @@ -148,10 +148,31 @@ diff --git a/io.sc.platform.core.frontend/src/platform/layout/sub-layout/Topper.vue b/io.sc.platform.core.frontend/src/platform/layout/sub-layout/Topper.vue index b9e5b36b..c67c051b 100644 --- a/io.sc.platform.core.frontend/src/platform/layout/sub-layout/Topper.vue +++ b/io.sc.platform.core.frontend/src/platform/layout/sub-layout/Topper.vue @@ -142,9 +142,40 @@
-
-
{{ SessionManager.getSession().user.userName }}
-
{{ SessionManager.getSession().user.defaultRoleName }}
+
+
+ + + + + + + + + + + + + +
@@ -271,6 +302,13 @@ const unReadedAnnouncementsTotalCountRef = ref(); const router = useRouter(); +const userTooltip = () => { + let tip = t('loginName') + ' : ' + SessionManager.getSession().user.loginName + '
'; + tip += t('userName') + ' : ' + SessionManager.getSession().user.userName + '
'; + tip += t('defaultRoleName') + ' : ' + SessionManager.getSession().user.defaultRoleName; + return tip; +}; + const fullScreen = () => { if (quasar.fullscreen.isActive) { quasar.fullscreen.exit(); @@ -376,7 +414,9 @@ const doLogout = () => { window.location.href = Environment.getWebContextPath(); } else { axios.post(Environment.apiContextPath(Environment.getConfigure().setting.logoutUrl)).then((response) => { - window.location.href = response.data; + // 此处不能用 window.location.href =''; + // 因为在 vue 前端项目中, 不能正常跳转 + window.location.replace(response.data); }); } }; diff --git a/io.sc.platform.core.frontend/src/platform/plugin/manager/RouterManager.ts b/io.sc.platform.core.frontend/src/platform/plugin/manager/RouterManager.ts index 60f32e88..7a6eb2d9 100644 --- a/io.sc.platform.core.frontend/src/platform/plugin/manager/RouterManager.ts +++ b/io.sc.platform.core.frontend/src/platform/plugin/manager/RouterManager.ts @@ -170,6 +170,7 @@ class RouterManager { path: cachedRoute['path'], icon: cachedRoute['icon'], component: cachedRoute['component'], + componentPath: cachedRoute['componentPath'], redirect: cachedRoute['redirect'], children: cachedRoute['children'], }); @@ -180,6 +181,7 @@ class RouterManager { path: cachedRoute['path'], icon: cachedRoute['icon'], component: ComponentManager.getLocalComponent(cachedRoute['component']), + componentPath: cachedRoute['componentPath'], redirect: cachedRoute['redirect'], children: cachedRoute['children'], }); @@ -190,6 +192,7 @@ class RouterManager { path: cachedRoute['path'], icon: cachedRoute['icon'], component: ComponentManager.getRemoteComponent(cachedRoute['module'], cachedRoute['component']), + componentPath: cachedRoute['componentPath'], redirect: cachedRoute['redirect'], children: cachedRoute['children'], }); diff --git a/io.sc.platform.core.frontend/src/platform/plugin/manager/TagViewManager.ts b/io.sc.platform.core.frontend/src/platform/plugin/manager/TagViewManager.ts index a162a67d..74e6709b 100644 --- a/io.sc.platform.core.frontend/src/platform/plugin/manager/TagViewManager.ts +++ b/io.sc.platform.core.frontend/src/platform/plugin/manager/TagViewManager.ts @@ -64,6 +64,7 @@ class TagViewManager { let menuId: string; let menuTitleI18nKey: string; let menuIcon: string; + let componentPath: string; // 是否需要添加 TagView let needToAdd = true; @@ -72,6 +73,10 @@ class TagViewManager { menuId = menu.id; menuTitleI18nKey = menu.titleI18nKey; menuIcon = menu.icon; + const route = RouterManager.getRouteByName(menu.routeName) as FrontEndRouteType; + if (route) { + componentPath = route.componentPath; + } for (const tagView of TagViewManager.#tagViewsAndBreadcrumbs.tagViews) { if (tagView.menuId === menuId) { needToAdd = false; @@ -84,6 +89,7 @@ class TagViewManager { menuId = route.name; menuTitleI18nKey = route.name; menuIcon = route.icon; + componentPath = route.componentPath; for (const tagView of TagViewManager.#tagViewsAndBreadcrumbs.tagViews) { if (tagView.menuId === menuId) { needToAdd = false; @@ -104,6 +110,7 @@ class TagViewManager { routePath: to.path, routeQuery: to.query, params: to.params, + componentPath: componentPath, }); } // 设置选中的 TagView diff --git a/io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts b/io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts index 6a642b90..43996e82 100644 --- a/io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts +++ b/io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts @@ -119,6 +119,8 @@ export type ConfigureType = { titleColor: string; // 标题颜色 actions: Map; // 动作按钮 Map(key:动作名称,value:按钮配置) notifierInterval: number; // 通知器轮询时间间隔(单位:秒) + showLoginName: boolean; // 是否显示用户登录名 + showUserName: boolean; // 是否显示用户名 showDefaultRole: boolean; //是否显示用户默认角色 }; diff --git a/io.sc.platform.core.frontend/src/platform/types/TagViewType.ts b/io.sc.platform.core.frontend/src/platform/types/TagViewType.ts index 7fc424fe..481c0891 100644 --- a/io.sc.platform.core.frontend/src/platform/types/TagViewType.ts +++ b/io.sc.platform.core.frontend/src/platform/types/TagViewType.ts @@ -6,4 +6,5 @@ export type TagViewType = { routePath: string; routeQuery: Map; params: Map; + componentPath: string; }; diff --git a/io.sc.platform.core.frontend/src/platform/views/Home.vue b/io.sc.platform.core.frontend/src/platform/views/Home.vue index 6a82f904..bdcd8938 100644 --- a/io.sc.platform.core.frontend/src/platform/views/Home.vue +++ b/io.sc.platform.core.frontend/src/platform/views/Home.vue @@ -31,6 +31,7 @@ import MyDoneTask from './home/MyDoneTask.vue'; import MyFinishedTask from './home/MyFinishedTask.vue'; import MyMessage from './home/MyMessage.vue'; import MyAnnouncement from './home/MyAnnouncement.vue'; +import { onActivated } from 'vue'; const myShortcutMenuRef = ref(); const myTaskRef = ref(); @@ -39,6 +40,15 @@ const myFinishedTaskRef = ref(); const myMessageRef = ref(); const myAnnouncementRef = ref(); +onActivated(() => { + myShortcutMenuRef?.value.refresh(); + myTaskRef?.value.refresh(); + myDoneTaskRef?.value.refresh(); + myFinishedTaskRef?.value.refresh(); + myMessageRef?.value.refresh(); + myAnnouncementRef?.value.refresh(); +}); + const afterMyTaskRefresh = () => { myDoneTaskRef?.value?.refresh(); myFinishedTaskRef?.value?.refresh(); diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index bf56be80..4c3ea714 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.110", + "version": "8.2.115", "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.110", + "platform-core": "8.2.115", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words.properties b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words.properties index 3d1cb110..466accf6 100644 --- a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words.properties +++ b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words.properties @@ -265,4 +265,5 @@ before=Before send=Send required=Required settings=Settings -reply=Reply \ No newline at end of file +reply=Reply +defaultRoleName=Default Role Name \ No newline at end of file diff --git a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_tw_CN.properties b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_tw_CN.properties index b091da12..13c2c1fb 100644 --- a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_tw_CN.properties +++ b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_tw_CN.properties @@ -265,4 +265,5 @@ before=\u4EE5\u524D send=\u767C\u9001 required=\u5FC5\u9700 settings=\u8A2D\u7F6E -reply=\u56DE\u5FA9 \ No newline at end of file +reply=\u56DE\u5FA9 +defaultRoleName=\u9ED8\u8A8D\u89D2\u8272\u540D\u7A31 \ No newline at end of file diff --git a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_zh_CN.properties b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_zh_CN.properties index 27444eb5..b69c887f 100644 --- a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_zh_CN.properties +++ b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_zh_CN.properties @@ -265,4 +265,5 @@ before=\u4EE5\u524D send=\u53D1\u9001 required=\u5FC5\u9700 settings=\u8BBE\u7F6E -reply=\u56DE\u590D \ No newline at end of file +reply=\u56DE\u590D +defaultRoleName=\u9ED8\u8BA4\u89D2\u8272\u540D\u79F0 \ No newline at end of file diff --git a/io.sc.platform.developer.doc/package.json b/io.sc.platform.developer.doc/package.json index 1757da7e..6f7084f7 100644 --- a/io.sc.platform.developer.doc/package.json +++ b/io.sc.platform.developer.doc/package.json @@ -28,7 +28,7 @@ "vuepress": "2.0.0-rc.15" }, "dependencies": { - "platform-core": "8.2.110", + "platform-core": "8.2.115", "quasar": "2.17.6", "vue": "3.5.13", "vue-i18n": "11.0.1" diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json index 7f31772b..f7294482 100644 --- a/io.sc.platform.developer.frontend/package.json +++ b/io.sc.platform.developer.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.110", + "platform-core": "8.2.115", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.developer.frontend/src/views/plugin/ApplicationProperties.vue b/io.sc.platform.developer.frontend/src/views/plugin/ApplicationProperties.vue index e7b98021..e053a5c7 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/ApplicationProperties.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/ApplicationProperties.vue @@ -1,7 +1,7 @@ - diff --git a/io.sc.platform.lcdp.frontend/src/views/export/UniverTemplate.vue b/io.sc.platform.lcdp.frontend/src/views/export/UniverTemplate.vue deleted file mode 100644 index 63e2ed2f..00000000 --- a/io.sc.platform.lcdp.frontend/src/views/export/UniverTemplate.vue +++ /dev/null @@ -1,154 +0,0 @@ - - diff --git a/io.sc.platform.lcdp.frontend/src/views/jxls/AttachmentDialog.vue b/io.sc.platform.lcdp.frontend/src/views/jxls/AttachmentDialog.vue new file mode 100644 index 00000000..0d555b0e --- /dev/null +++ b/io.sc.platform.lcdp.frontend/src/views/jxls/AttachmentDialog.vue @@ -0,0 +1,74 @@ + + diff --git a/io.sc.platform.lcdp.frontend/src/views/jxls/Template.vue b/io.sc.platform.lcdp.frontend/src/views/jxls/Template.vue new file mode 100644 index 00000000..6b70611b --- /dev/null +++ b/io.sc.platform.lcdp.frontend/src/views/jxls/Template.vue @@ -0,0 +1,126 @@ + + diff --git a/io.sc.platform.lcdp.frontend/src/views/theme/TagViewBar.vue b/io.sc.platform.lcdp.frontend/src/views/theme/TagViewBar.vue index c9ffb47a..3dcaada7 100644 --- a/io.sc.platform.lcdp.frontend/src/views/theme/TagViewBar.vue +++ b/io.sc.platform.lcdp.frontend/src/views/theme/TagViewBar.vue @@ -84,5 +84,15 @@ >
+
+
+ +
+
diff --git a/io.sc.platform.lcdp.frontend/src/views/theme/Topper.vue b/io.sc.platform.lcdp.frontend/src/views/theme/Topper.vue index 1f7951ac..0c7b47d5 100644 --- a/io.sc.platform.lcdp.frontend/src/views/theme/Topper.vue +++ b/io.sc.platform.lcdp.frontend/src/views/theme/Topper.vue @@ -93,6 +93,26 @@ /> +
+
+ +
+
+
+
+ +
+
actions =new HashMap<>(); // 顶部动作按钮 private long notifierInterval=5*60; // 顶部通知器轮询间隔(单位:秒) + private boolean showLoginName =true; // 是否显示用户登录名 + private boolean showUserName =true; // 是否显示用户名 private boolean showDefaultRole =true; // 是否显示用户默认角色 public Topper(){ @@ -102,6 +104,22 @@ public class Topper { this.notifierInterval = notifierInterval; } + public boolean isShowLoginName() { + return showLoginName; + } + + public void setShowLoginName(boolean showLoginName) { + this.showLoginName = showLoginName; + } + + public boolean isShowUserName() { + return showUserName; + } + + public void setShowUserName(boolean showUserName) { + this.showUserName = showUserName; + } + public boolean isShowDefaultRole() { return showDefaultRole; } diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/controller/ExportExcelTemplateColumnController.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/controller/ExportExcelTemplateColumnController.java deleted file mode 100644 index 8b80dc47..00000000 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/controller/ExportExcelTemplateColumnController.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.sc.platform.lcdp.excel.template.controller; - -import io.sc.platform.lcdp.excel.template.entity.ExportExcelTemplateColumnEntity; -import io.sc.platform.lcdp.excel.template.repository.ExportExcelTemplateColumnRepository; -import io.sc.platform.lcdp.excel.template.service.ExportExcelTemplateColumnService; -import io.sc.platform.lcdp.excel.template.vo.ExportExcelTemplateColumnVo; -import io.sc.platform.mvc.controller.support.RestCrudController; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/api/exportexcel/column") -public class ExportExcelTemplateColumnController extends RestCrudController { - -} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/controller/ExportExcelTemplateController.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/controller/ExportExcelTemplateController.java deleted file mode 100644 index a76a7e14..00000000 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/controller/ExportExcelTemplateController.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.sc.platform.lcdp.excel.template.controller; - -import io.sc.platform.core.response.ResponseWrapper; -import io.sc.platform.core.response.SuccessResponseWrapper; -import io.sc.platform.lcdp.excel.template.entity.ExcelTemplate; -import io.sc.platform.lcdp.excel.template.entity.ExportExcelTemplateEntity; -import io.sc.platform.lcdp.excel.template.repository.ExcelTemplateRepository; -import io.sc.platform.lcdp.excel.template.repository.ExportExcelTemplateRepository; -import io.sc.platform.lcdp.excel.template.service.ExcelTemplateService; -import io.sc.platform.lcdp.excel.template.service.ExportExcelTemplateService; -import io.sc.platform.lcdp.excel.template.vo.ExcelTemplateVo; -import io.sc.platform.lcdp.excel.template.vo.ExportExcelTemplateVo; -import io.sc.platform.mvc.controller.support.RestCrudController; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -@RestController -@RequestMapping("/api/exportexcel/template") -public class ExportExcelTemplateController extends RestCrudController { - -} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/entity/ExportExcelTemplateColumnEntity.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/entity/ExportExcelTemplateColumnEntity.java deleted file mode 100644 index d43dc502..00000000 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/entity/ExportExcelTemplateColumnEntity.java +++ /dev/null @@ -1,136 +0,0 @@ -package io.sc.platform.lcdp.excel.template.entity; - -import io.sc.platform.lcdp.excel.template.enums.DataType; -import io.sc.platform.lcdp.excel.template.vo.ExportExcelTemplateColumnVo; -import io.sc.platform.lcdp.excel.template.vo.ExportExcelTemplateVo; -import io.sc.platform.orm.entity.CorporationAuditorEntity; -import org.hibernate.annotations.GenericGenerator; - -import javax.persistence.*; -import javax.validation.constraints.Size; - -/** - * 导出 Excel 模版实体 - */ -@Entity -@Table(name="LCDP_EXPORT_TEMPLATE_COLUMN") -public class ExportExcelTemplateColumnEntity extends CorporationAuditorEntity { - @Id - @GeneratedValue(generator = "system-uuid") - @GenericGenerator(name = "system-uuid", strategy = "uuid2") - @Column(name="ID_", length=36) - @Size(max=36) - private String id; - - //字段代码 - @Column(name="CODE_",nullable=false,length=255) - @Size(min=1,max=255) - private String code; - - //字段名称 - @Column(name="NAME_", length=255) - @Size(min=1,max=255) - private String name; - - //字段描述 - @Column(name="DESCRIPTION_", length=255) - @Size(min=1,max=255) - private String description; - - //排序 - @Column(name="ORDER_") - private Integer order; - - //字段值类型 - @Column(name="VALUE_TYPE_", length=255) - private String valueType; - - //字段值公式 - @Column(name="VALUE_FORMULA") - private String valueFormula; - - //所属模版 - @ManyToOne(fetch=FetchType.LAZY) - @JoinColumn(name="TEMPLATE_ID_") - protected ExportExcelTemplateEntity template; - - @Override - public ExportExcelTemplateColumnVo toVo() { - ExportExcelTemplateColumnVo vo = new ExportExcelTemplateColumnVo(); - super.toVo(vo); - - vo.setId(this.getId()); - vo.setCode(this.getCode()); - vo.setName(this.getName()); - vo.setDescription(this.getDescription()); - vo.setOrder(this.getOrder()); - vo.setValueType(this.getValueType()); - vo.setValueFormula(this.getValueFormula()); - vo.setTemplate(this.getTemplate().getId()); - return vo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Integer getOrder() { - return order; - } - - public void setOrder(Integer order) { - this.order = order; - } - - public String getValueType() { - return valueType; - } - - public void setValueType(String valueType) { - this.valueType = valueType; - } - - public String getValueFormula() { - return valueFormula; - } - - public void setValueFormula(String valueFormula) { - this.valueFormula = valueFormula; - } - - public ExportExcelTemplateEntity getTemplate() { - return template; - } - - public void setTemplate(ExportExcelTemplateEntity template) { - this.template = template; - } -} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/enums/DataType.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/enums/DataType.java deleted file mode 100644 index 6fbad3eb..00000000 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/enums/DataType.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.sc.platform.lcdp.excel.template.enums; - -/** - * 导出数据类型 - */ -public enum DataType { - JPA_ENTITY, // JPA 实体 - SQL_RESULT_SET; // SQL 记录集 -} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/repository/ExportExcelTemplateColumnRepository.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/repository/ExportExcelTemplateColumnRepository.java deleted file mode 100644 index 75f6d134..00000000 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/repository/ExportExcelTemplateColumnRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.sc.platform.lcdp.excel.template.repository; - -import io.sc.platform.lcdp.excel.template.entity.ExportExcelTemplateColumnEntity; -import io.sc.platform.orm.repository.DaoRepository; - -public interface ExportExcelTemplateColumnRepository extends DaoRepository { -} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/repository/ExportExcelTemplateRepository.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/repository/ExportExcelTemplateRepository.java deleted file mode 100644 index 7e754552..00000000 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/repository/ExportExcelTemplateRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.sc.platform.lcdp.excel.template.repository; - -import io.sc.platform.lcdp.excel.template.entity.ExcelTemplate; -import io.sc.platform.lcdp.excel.template.entity.ExportExcelTemplateEntity; -import io.sc.platform.orm.repository.DaoRepository; - -public interface ExportExcelTemplateRepository extends DaoRepository { -} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/service/ExportExcelTemplateColumnService.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/service/ExportExcelTemplateColumnService.java deleted file mode 100644 index 1eb0f94a..00000000 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/service/ExportExcelTemplateColumnService.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.sc.platform.lcdp.excel.template.service; - -import io.sc.platform.lcdp.excel.template.entity.ExportExcelTemplateColumnEntity; -import io.sc.platform.lcdp.excel.template.repository.ExportExcelTemplateColumnRepository; -import io.sc.platform.orm.service.DaoService; - -public interface ExportExcelTemplateColumnService extends DaoService { - -} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/service/ExportExcelTemplateService.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/service/ExportExcelTemplateService.java deleted file mode 100644 index b763d5c8..00000000 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/service/ExportExcelTemplateService.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.sc.platform.lcdp.excel.template.service; - -import io.sc.platform.lcdp.excel.template.entity.ExcelTemplate; -import io.sc.platform.lcdp.excel.template.entity.ExportExcelTemplateEntity; -import io.sc.platform.lcdp.excel.template.repository.ExcelTemplateRepository; -import io.sc.platform.lcdp.excel.template.repository.ExportExcelTemplateRepository; -import io.sc.platform.orm.service.DaoService; - -import java.util.Map; - -public interface ExportExcelTemplateService extends DaoService { - -} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/service/impl/ExportExcelTemplateColumnServiceImpl.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/service/impl/ExportExcelTemplateColumnServiceImpl.java deleted file mode 100644 index 3be005f3..00000000 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/service/impl/ExportExcelTemplateColumnServiceImpl.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.sc.platform.lcdp.excel.template.service.impl; - -import io.sc.platform.lcdp.excel.template.entity.ExportExcelTemplateColumnEntity; -import io.sc.platform.lcdp.excel.template.repository.ExportExcelTemplateColumnRepository; -import io.sc.platform.lcdp.excel.template.service.ExportExcelTemplateColumnService; -import io.sc.platform.orm.service.impl.DaoServiceImpl; -import org.springframework.stereotype.Service; - -@Service("io.sc.platform.lcdp.excel.template.service.impl.ExportExcelTemplateColumnServiceImpl") -public class ExportExcelTemplateColumnServiceImpl extends DaoServiceImpl implements ExportExcelTemplateColumnService { - -} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/service/impl/ExportExcelTemplateServiceImpl.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/service/impl/ExportExcelTemplateServiceImpl.java deleted file mode 100644 index cfa2f0a2..00000000 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/service/impl/ExportExcelTemplateServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.sc.platform.lcdp.excel.template.service.impl; - -import com.fasterxml.jackson.databind.ObjectMapper; -import io.sc.platform.lcdp.excel.template.entity.ExcelParams; -import io.sc.platform.lcdp.excel.template.entity.ExcelTemplate; -import io.sc.platform.lcdp.excel.template.entity.ExportExcelTemplateEntity; -import io.sc.platform.lcdp.excel.template.repository.ExcelParamsRepository; -import io.sc.platform.lcdp.excel.template.repository.ExcelTemplateRepository; -import io.sc.platform.lcdp.excel.template.repository.ExportExcelTemplateRepository; -import io.sc.platform.lcdp.excel.template.service.ExcelTemplateService; -import io.sc.platform.lcdp.excel.template.service.ExportExcelTemplateService; -import io.sc.platform.orm.service.impl.DaoServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -@Service("io.sc.platform.lcdp.excel.template.service.impl.ExportExcelTemplateServiceImpl") -public class ExportExcelTemplateServiceImpl extends DaoServiceImpl implements ExportExcelTemplateService { - -} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/vo/ExportExcelTemplateColumnVo.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/vo/ExportExcelTemplateColumnVo.java deleted file mode 100644 index 5ff07a40..00000000 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/vo/ExportExcelTemplateColumnVo.java +++ /dev/null @@ -1,82 +0,0 @@ -package io.sc.platform.lcdp.excel.template.vo; - -import io.sc.platform.lcdp.excel.template.enums.DataType; -import io.sc.platform.orm.api.vo.CorporationAuditorVo; - -/** - * 导出 Excel 模版 Vo - */ -public class ExportExcelTemplateColumnVo extends CorporationAuditorVo { - private String id; - private String code;//模版代码 - private String name;//模版名称 - private String description;//模版描述 - private Integer order;//排序 - private String valueType;//值类型 - private String valueFormula;//值公式 - private String template;//模版ID - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Integer getOrder() { - return order; - } - - public void setOrder(Integer order) { - this.order = order; - } - - public String getValueType() { - return valueType; - } - - public void setValueType(String valueType) { - this.valueType = valueType; - } - - public String getValueFormula() { - return valueFormula; - } - - public void setValueFormula(String valueFormula) { - this.valueFormula = valueFormula; - } - - public String getTemplate() { - return template; - } - - public void setTemplate(String template) { - this.template = template; - } -} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/vo/ExportExcelTemplateVo.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/vo/ExportExcelTemplateVo.java deleted file mode 100644 index 2b7d0dc1..00000000 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/vo/ExportExcelTemplateVo.java +++ /dev/null @@ -1,77 +0,0 @@ -package io.sc.platform.lcdp.excel.template.vo; - -import io.sc.platform.lcdp.excel.template.enums.DataType; -import io.sc.platform.orm.api.vo.CorporationAuditorVo; -import org.hibernate.annotations.GenericGenerator; - -import javax.persistence.*; -import javax.validation.constraints.Size; - -/** - * 导出 Excel 模版 Vo - */ -public class ExportExcelTemplateVo extends CorporationAuditorVo { - private String id; - private String code;//模版代码 - private String name;//模版名称 - private String description;//模版描述 - private DataType dataType;//数据类型 - private String jpaEntityClass;//JPA 实体类名 - private String univerConfig;//模版配置(univer) - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public DataType getDataType() { - return dataType; - } - - public void setDataType(DataType dataType) { - this.dataType = dataType; - } - - public String getJpaEntityClass() { - return jpaEntityClass; - } - - public void setJpaEntityClass(String jpaEntityClass) { - this.jpaEntityClass = jpaEntityClass; - } - - public String getUniverConfig() { - return univerConfig; - } - - public void setUniverConfig(String univerConfig) { - this.univerConfig = univerConfig; - } -} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/jxls/template/controller/JxlsTemplateController.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/jxls/template/controller/JxlsTemplateController.java new file mode 100644 index 00000000..e9117187 --- /dev/null +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/jxls/template/controller/JxlsTemplateController.java @@ -0,0 +1,36 @@ +package io.sc.platform.lcdp.jxls.template.controller; + +import io.sc.platform.lcdp.jxls.template.entity.JxlsTemplateEntity; +import io.sc.platform.lcdp.jxls.template.repository.JxlsTemplateRepository; +import io.sc.platform.lcdp.jxls.template.service.JxlsTemplateService; +import io.sc.platform.lcdp.jxls.template.vo.JxlsTemplateVo; +import io.sc.platform.mvc.controller.support.RestCrudController; +import io.sc.platform.util.ObjectMapperUtil; +import org.springframework.http.HttpRequest; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Locale; + +@RestController +@RequestMapping("/api/lcdp/jxls/template") +public class JxlsTemplateController extends RestCrudController { + @PostMapping(value="updateAttachment/{id}") + public void updateAttachment(@PathVariable("id") String id, @RequestParam(name="file",required=false) MultipartFile multipartFile, Locale locale) throws Exception{ + if(multipartFile!=null && !multipartFile.isEmpty()) { + service.updateAttachment(id,multipartFile.getInputStream()); + } + } + + @PostMapping(value="downloadAttachment/{id}") + public void downloadAttachment(@PathVariable("id") String id, HttpServletRequest request, HttpServletResponse response,Locale locale) throws Exception{ + service.downloadAttachment(id,request,response,locale); + } + + @PostMapping(value="removeAttachment/{id}") + public void removeAttachment(@PathVariable("id") String id) throws Exception{ + service.removeAttachment(id); + } +} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/entity/ExportExcelTemplateEntity.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/jxls/template/entity/JxlsTemplateEntity.java similarity index 53% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/entity/ExportExcelTemplateEntity.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/jxls/template/entity/JxlsTemplateEntity.java index d8c4acc1..cde22023 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/excel/template/entity/ExportExcelTemplateEntity.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/jxls/template/entity/JxlsTemplateEntity.java @@ -1,21 +1,21 @@ -package io.sc.platform.lcdp.excel.template.entity; +package io.sc.platform.lcdp.jxls.template.entity; -import io.sc.platform.lcdp.excel.template.enums.DataType; -import io.sc.platform.lcdp.excel.template.vo.ExportExcelTemplateVo; +import io.sc.platform.core.Environment; +import io.sc.platform.core.util.PinyinUtil; +import io.sc.platform.lcdp.jxls.template.vo.JxlsTemplateVo; +import io.sc.platform.orm.converter.NumericBooleanConverter; import io.sc.platform.orm.entity.CorporationAuditorEntity; import org.hibernate.annotations.GenericGenerator; import javax.persistence.*; import javax.validation.constraints.Size; -import java.util.ArrayList; -import java.util.List; /** - * 导出 Excel 模版实体 + * JXLS 模版实体 */ @Entity -@Table(name="LCDP_EXPORT_TEMPLATE") -public class ExportExcelTemplateEntity extends CorporationAuditorEntity { +@Table(name="LCDP_JXLS_TEMPLATE") +public class JxlsTemplateEntity extends CorporationAuditorEntity { @Id @GeneratedValue(generator = "system-uuid") @GenericGenerator(name = "system-uuid", strategy = "uuid2") @@ -33,41 +33,44 @@ public class ExportExcelTemplateEntity extends CorporationAuditorEntity columns =new ArrayList(); + @Lob + @Column(name = "BYTES_", columnDefinition = "BLOB") + private byte[] bytes; @Override - public ExportExcelTemplateVo toVo() { - ExportExcelTemplateVo vo = new ExportExcelTemplateVo(); + public JxlsTemplateVo toVo() { + JxlsTemplateVo vo = new JxlsTemplateVo(); super.toVo(vo); vo.setId(this.getId()); vo.setCode(this.getCode()); vo.setName(this.getName()); + vo.setNamec(this.getNamec()); vo.setDescription(this.getDescription()); - vo.setDataType(this.getDataType()); vo.setJpaEntityClass(this.getJpaEntityClass()); - vo.setUniverConfig(this.getUniverConfig()); + vo.setAsync(this.getAsync()); + byte[] bytes =this.getBytes(); + vo.setHasAttachment(bytes!=null && bytes.length>0); return vo; } @@ -93,22 +96,23 @@ public class ExportExcelTemplateEntity extends CorporationAuditorEntity { + public JxlsTemplateEntity findByCode(String code); +} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/jxls/template/service/JxlsTemplateService.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/jxls/template/service/JxlsTemplateService.java new file mode 100644 index 00000000..40aa75b7 --- /dev/null +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/jxls/template/service/JxlsTemplateService.java @@ -0,0 +1,16 @@ +package io.sc.platform.lcdp.jxls.template.service; + +import io.sc.platform.lcdp.jxls.template.entity.JxlsTemplateEntity; +import io.sc.platform.lcdp.jxls.template.repository.JxlsTemplateRepository; +import io.sc.platform.orm.service.DaoService; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; +import java.util.Locale; + +public interface JxlsTemplateService extends DaoService { + public void updateAttachment(String id,InputStream inputStream) throws Exception; + public void downloadAttachment(String id, HttpServletRequest request, HttpServletResponse response, Locale locale) throws Exception; + public void removeAttachment(String id) throws Exception; +} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/jxls/template/service/impl/JxlsTemplateServiceImpl.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/jxls/template/service/impl/JxlsTemplateServiceImpl.java new file mode 100644 index 00000000..fe7b2d42 --- /dev/null +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/jxls/template/service/impl/JxlsTemplateServiceImpl.java @@ -0,0 +1,72 @@ +package io.sc.platform.lcdp.jxls.template.service.impl; + +import io.sc.platform.lcdp.jxls.template.entity.JxlsTemplateEntity; +import io.sc.platform.lcdp.jxls.template.repository.JxlsTemplateRepository; +import io.sc.platform.lcdp.jxls.template.service.JxlsTemplateService; +import io.sc.platform.mvc.support.FileDownloader; +import io.sc.platform.orm.service.impl.DaoServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.transaction.Transactional; +import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.nio.ByteBuffer; +import java.util.Locale; + +@Service("io.sc.platform.lcdp.jxls.template.service.impl.JxlsTemplateServiceImpl") +public class JxlsTemplateServiceImpl extends DaoServiceImpl implements JxlsTemplateService { + @Override + public JxlsTemplateEntity findByUniqueKey(JxlsTemplateEntity entity) { + return repository.findByCode(entity.getCode()); + } + + @Override + @Transactional + public void updateAttachment(String id,InputStream inputStream) throws Exception { + if(!StringUtils.hasText(id) || inputStream==null){ + return; + } + JxlsTemplateEntity entity =findById(id); + if(entity==null){ + return; + } + try(InputStream ins =inputStream;){ + byte[] bytes = new byte[ins.available()]; + inputStream.read(bytes); + + entity.setBytes(bytes); + update(id,entity); + } + } + + @Override + public void downloadAttachment(String id, HttpServletRequest request, HttpServletResponse response, Locale locale) throws Exception { + if(!StringUtils.hasText(id)){ + return; + } + JxlsTemplateEntity entity =findById(id); + if(entity==null){ + return; + } + ByteArrayInputStream bins =new ByteArrayInputStream(entity.getBytes()); + FileDownloader.download(request, response, entity.getName() + "(" + entity.getCode() + ")" + ".xlsx", bins); + } + + @Override + public void removeAttachment(String id) throws Exception { + if(!StringUtils.hasText(id)){ + return; + } + JxlsTemplateEntity entity =findById(id); + if(entity==null){ + return; + } + entity.setBytes(null); + update(id,entity); + } +} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/jxls/template/vo/JxlsTemplateVo.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/jxls/template/vo/JxlsTemplateVo.java new file mode 100644 index 00000000..ac9e9b98 --- /dev/null +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/jxls/template/vo/JxlsTemplateVo.java @@ -0,0 +1,81 @@ +package io.sc.platform.lcdp.jxls.template.vo; + +import io.sc.platform.orm.api.vo.CorporationAuditorVo; + +/** + * JXLS 模版 Vo + */ +public class JxlsTemplateVo extends CorporationAuditorVo { + private String id; + private String code; + private String name; + protected String namec; + private String description; + private String jpaEntityClass; + private Boolean async; + private boolean hasAttachment; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getNamec() { + return namec; + } + + public void setNamec(String namec) { + this.namec = namec; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getJpaEntityClass() { + return jpaEntityClass; + } + + public void setJpaEntityClass(String jpaEntityClass) { + this.jpaEntityClass = jpaEntityClass; + } + + public Boolean getAsync() { + return async; + } + + public void setAsync(Boolean async) { + this.async = async; + } + + public boolean isHasAttachment() { + return hasAttachment; + } + + public void setHasAttachment(boolean hasAttachment) { + this.hasAttachment = hasAttachment; + } +} diff --git a/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/components.json b/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/components.json index b8379972..5bd3617a 100644 --- a/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/components.json +++ b/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/components.json @@ -15,6 +15,10 @@ "io.sc.platform.lcdp.form.service.impl", "io.sc.platform.lcdp.excel.template.controller", "io.sc.platform.lcdp.excel.template.service.impl", + + "io.sc.platform.lcdp.jxls.template.controller", + "io.sc.platform.lcdp.jxls.template.service.impl", + "io.sc.platform.lcdp.frontend.component.controller", "io.sc.platform.lcdp.frontend.component.service.impl" ], diff --git a/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/liquibase.json b/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/liquibase.json index cb00253e..87a0950a 100644 --- a/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/liquibase.json +++ b/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/liquibase.json @@ -7,7 +7,7 @@ "classpath:/liquibase/io.sc.platform.lcdp_8.0.0_20220606__LowCode_Developer_Database_Schema_DDL.xml", "classpath:/liquibase/io.sc.platform.lcdp_Form_DDL.xml", "classpath:/liquibase/io.sc.platform.lcdp_Excel_Template_DDL.xml", - "classpath:/liquibase/io.sc.platform.lcdp_Export_Excel_Template_DDL.xml" + "classpath:/liquibase/io.sc.platform.lcdp_JXLS_Template_DDL.xml" ] } ] \ No newline at end of file diff --git a/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/repositories.json b/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/repositories.json index 3ddf50b0..4cc3c2e8 100644 --- a/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/repositories.json +++ b/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/repositories.json @@ -14,7 +14,10 @@ "io.sc.platform.lcdp.form.entity", "io.sc.platform.lcdp.form.repository", "io.sc.platform.lcdp.excel.template.entity", - "io.sc.platform.lcdp.excel.template.repository" + "io.sc.platform.lcdp.excel.template.repository", + + "io.sc.platform.lcdp.jxls.template.entity", + "io.sc.platform.lcdp.jxls.template.repository" ], "excludes":[] } \ No newline at end of file diff --git a/io.sc.platform.lcdp/src/main/resources/liquibase/io.sc.platform.lcdp_Export_Excel_Template_DDL.xml b/io.sc.platform.lcdp/src/main/resources/liquibase/io.sc.platform.lcdp_Export_Excel_Template_DDL.xml deleted file mode 100644 index 96e50f9d..00000000 --- a/io.sc.platform.lcdp/src/main/resources/liquibase/io.sc.platform.lcdp_Export_Excel_Template_DDL.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/io.sc.platform.lcdp/src/main/resources/liquibase/io.sc.platform.lcdp_JXLS_Template_DDL.xml b/io.sc.platform.lcdp/src/main/resources/liquibase/io.sc.platform.lcdp_JXLS_Template_DDL.xml new file mode 100644 index 00000000..4405033a --- /dev/null +++ b/io.sc.platform.lcdp/src/main/resources/liquibase/io.sc.platform.lcdp_JXLS_Template_DDL.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/io.sc.platform.license.keygen.frontend/package.json b/io.sc.platform.license.keygen.frontend/package.json index 60e56847..79ee605e 100644 --- a/io.sc.platform.license.keygen.frontend/package.json +++ b/io.sc.platform.license.keygen.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.110", + "platform-core": "8.2.115", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.license.keygen/src/main/java/io/sc/platform/license/keygen/controller/LicenseKeyGeneratorWebController.java b/io.sc.platform.license.keygen/src/main/java/io/sc/platform/license/keygen/controller/LicenseKeyGeneratorWebController.java index 04cdda35..2289b46b 100644 --- a/io.sc.platform.license.keygen/src/main/java/io/sc/platform/license/keygen/controller/LicenseKeyGeneratorWebController.java +++ b/io.sc.platform.license.keygen/src/main/java/io/sc/platform/license/keygen/controller/LicenseKeyGeneratorWebController.java @@ -13,7 +13,9 @@ import io.sc.platform.license.keygen.jpa.vo.LicenseVo; import io.sc.platform.license.keygen.service.LicenseKeyGeneratorService; import io.sc.platform.license.keygen.service.LicenseService; import io.sc.platform.mvc.controller.support.RestCrudController; +import io.sc.platform.mvc.support.FileDownloader; import io.sc.platform.orm.entity.BaseEntity; +import io.sc.platform.orm.service.support.DataExportConfigure; import io.sc.platform.orm.service.support.QueryParameter; import io.sc.platform.orm.service.support.QueryResult; import io.sc.platform.orm.service.support.criteria.Criteria; @@ -27,6 +29,9 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -120,4 +125,19 @@ public class LicenseKeyGeneratorWebController { public void generateLicenseFile(@PathVariable(name="id",required=true)String id, HttpServletRequest request, HttpServletResponse response) throws Exception{ licenseKeyGeneratorService.generate(request, response,id); } + + @GetMapping("exportExcel") + public void _exportExcel(HttpServletRequest request,HttpServletResponse response,LicenseEntity entity,QueryParameter queryParameter) throws Exception{ + List criterias =licenseService.buildCriteriaFromEntity(request.getParameterNames(),entity); + if(criterias!=null && !criterias.isEmpty()){ + queryParameter.addCriterias(criterias); + } + ByteArrayOutputStream outputStream =new ByteArrayOutputStream(); + DataExportConfigure cofigure =licenseService.export(queryParameter,outputStream); + if(cofigure==null){ + return; + } + InputStream inputStream =new ByteArrayInputStream(outputStream.toByteArray()); + FileDownloader.download(request, response, cofigure.getDownloadFileName(), inputStream); + } } diff --git a/io.sc.platform.license.keygen/src/main/resources/io/sc/platform/license/keygen/jpa/entity/LicenseEntity.xlsx b/io.sc.platform.license.keygen/src/main/resources/io/sc/platform/license/keygen/jpa/entity/LicenseEntity.xlsx new file mode 100644 index 00000000..121ddf11 Binary files /dev/null and b/io.sc.platform.license.keygen/src/main/resources/io/sc/platform/license/keygen/jpa/entity/LicenseEntity.xlsx differ diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json index a125773f..cda62d58 100644 --- a/io.sc.platform.mvc.frontend/package.json +++ b/io.sc.platform.mvc.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.110", + "platform-core": "8.2.115", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/controller/support/RestCrudController.java b/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/controller/support/RestCrudController.java index e26638a7..75bd4477 100644 --- a/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/controller/support/RestCrudController.java +++ b/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/controller/support/RestCrudController.java @@ -5,10 +5,12 @@ import io.sc.platform.core.annotation.LicenseVerify; import io.sc.platform.core.enums.AuditLogAction; import io.sc.platform.core.response.ValidateException; import io.sc.platform.core.util.ValidatorUtil; +import io.sc.platform.mvc.support.FileDownloader; import io.sc.platform.orm.api.vo.BaseVo; import io.sc.platform.orm.entity.BaseEntity; import io.sc.platform.orm.repository.DaoRepository; import io.sc.platform.orm.service.DaoService; +import io.sc.platform.orm.service.support.DataExportConfigure; import io.sc.platform.orm.service.support.QueryParameter; import io.sc.platform.orm.service.support.QueryResult; import io.sc.platform.orm.service.support.criteria.Criteria; @@ -22,7 +24,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.io.Serializable; +import java.io.*; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -220,4 +222,30 @@ public abstract class RestCrudController criterias =service.buildCriteriaFromEntity(request.getParameterNames(),entity); + if(criterias!=null && !criterias.isEmpty()){ + queryParameter.addCriterias(criterias); + } + exportExcel(request,response,queryParameter); + } + + protected void exportExcel(HttpServletRequest request,HttpServletResponse response,QueryParameter queryParameter) throws Exception{ + ByteArrayOutputStream outputStream =new ByteArrayOutputStream(); + DataExportConfigure cofigure =service.export(queryParameter,outputStream); + InputStream inputStream =new ByteArrayInputStream(outputStream.toByteArray()); + FileDownloader.download(request, response, cofigure.getDownloadFileName(), inputStream); + } } diff --git a/io.sc.platform.orm/build.gradle b/io.sc.platform.orm/build.gradle index c4d095e4..2057a4c1 100644 --- a/io.sc.platform.orm/build.gradle +++ b/io.sc.platform.orm/build.gradle @@ -3,6 +3,7 @@ dependencies { project(":io.sc.platform.jdbc"), project(":io.sc.platform.security"), project(":io.sc.platform.orm.api"), + project(":io.sc.platform.poi"), "org.springframework.boot:spring-boot-starter-data-jpa", ) diff --git a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/repository/DaoRepository.java b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/repository/DaoRepository.java index 88f0bb45..33b2e289 100644 --- a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/repository/DaoRepository.java +++ b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/repository/DaoRepository.java @@ -1,16 +1,23 @@ package io.sc.platform.orm.repository; import io.sc.platform.orm.service.support.ManagedTypeAttributes; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.support.JpaEntityInformation; import org.springframework.data.repository.NoRepositoryBean; +import org.springframework.data.util.Streamable; import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; import javax.persistence.metamodel.ManagedType; import java.io.Serializable; import java.util.List; import java.util.Map; +import java.util.function.Consumer; +import java.util.stream.Stream; @NoRepositoryBean public interface DaoRepository extends JpaRepository,JpaSpecificationExecutor{ @@ -33,4 +40,16 @@ public interface DaoRepository extends JpaRepository< public void deleteAllInBatch(Iterable entities,boolean isSendEvent); public void deleteAllByIdInBatch(Iterable ids,boolean isSendEvent); public void deleteAllInBatch(boolean isSendEvent); + + public void stream(Consumer consumer); + public void stream(Specification spec,Consumer consumer); + public void stream(Sort sort,Consumer consumer); + public void stream(Specification spec, Sort sort,Consumer consumer); + public void stream(TypedQuery query,Consumer consumer); + + public Stream stream(); + public Stream stream(Specification spec); + public Stream stream(Sort sort); + public Stream stream(Specification spec, Sort sort); + public Stream stream(TypedQuery query); } diff --git a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/repository/impl/DaoRepositoryImpl.java b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/repository/impl/DaoRepositoryImpl.java index 1c65ce36..405f7de7 100644 --- a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/repository/impl/DaoRepositoryImpl.java +++ b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/repository/impl/DaoRepositoryImpl.java @@ -5,7 +5,10 @@ import io.sc.platform.orm.entity.support.JpaEntityPersistentEvent; import io.sc.platform.orm.entity.support.JpaEntityPersistentEventType; import io.sc.platform.orm.repository.DaoRepository; import io.sc.platform.orm.service.support.ManagedTypeAttributes; +import org.hibernate.query.criteria.internal.compile.CriteriaQueryTypeQueryAdapter; import org.springframework.context.ApplicationContext; +import org.springframework.data.domain.Sort; +import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.support.JpaEntityInformation; import org.springframework.data.jpa.repository.support.SimpleJpaRepository; import org.springframework.data.util.DirectFieldAccessFallbackBeanWrapper; @@ -15,6 +18,7 @@ import org.springframework.util.StringUtils; import javax.persistence.EntityManager; import javax.persistence.Query; +import javax.persistence.TypedQuery; import javax.persistence.metamodel.ManagedType; import javax.persistence.metamodel.SingularAttribute; import java.io.Serializable; @@ -22,9 +26,13 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Optional; +import java.util.function.Consumer; import java.util.stream.Collectors; +import java.util.stream.Stream; import java.util.stream.StreamSupport; +import static org.hibernate.annotations.QueryHints.READ_ONLY; +import static org.hibernate.jpa.QueryHints.HINT_FETCH_SIZE; import static org.springframework.data.jpa.repository.query.QueryUtils.*; public class DaoRepositoryImpl extends SimpleJpaRepository implements DaoRepository { @@ -238,4 +246,86 @@ public class DaoRepositoryImpl extends SimpleJpaRepos String sql =String.format("delete from %s x", entityName); entityManager.createQuery(sql).executeUpdate(); } + + @Override + public void stream(Consumer consumer) { + if(consumer==null) { return; } + TypedQuery query = super.getQuery(null,Sort.unsorted()); + stream(query,consumer); + } + + @Override + public void stream(Specification spec,Consumer consumer) { + if(consumer==null) { return; } + TypedQuery query = super.getQuery(spec,Sort.unsorted()); + stream(query,consumer); + } + + @Override + public void stream(Sort sort,Consumer consumer) { + if(consumer==null) { return; } + TypedQuery query = super.getQuery(null,sort); + stream(query,consumer); + } + + @Override + public void stream(Specification spec, Sort sort,Consumer consumer) { + if(consumer==null) { return; } + TypedQuery query = super.getQuery(spec,sort); + stream(query,consumer); + } + + @Override + public void stream(TypedQuery query, Consumer consumer) { + if(query==null || consumer==null){ + return; + } + if(query instanceof CriteriaQueryTypeQueryAdapter){ + CriteriaQueryTypeQueryAdapter _query =(CriteriaQueryTypeQueryAdapter)query; + _query.setHint(HINT_FETCH_SIZE,100); + _query.setHint(READ_ONLY,true); + _query.stream().forEach(consumer); + }else{ + query.getResultStream().forEach(consumer); + } + } + + @Override + public Stream stream() { + TypedQuery query = super.getQuery(null,Sort.unsorted()); + return stream(query); + } + + @Override + public Stream stream(Specification spec) { + TypedQuery query = super.getQuery(spec,Sort.unsorted()); + return stream(query); + } + + @Override + public Stream stream(Sort sort) { + TypedQuery query = super.getQuery(null,sort); + return stream(query); + } + + @Override + public Stream stream(Specification spec, Sort sort) { + TypedQuery query = super.getQuery(spec,sort); + return stream(query); + } + + @Override + public Stream stream(TypedQuery query) { + if(query==null){ + return Stream.empty(); + } + if(query instanceof CriteriaQueryTypeQueryAdapter){ + CriteriaQueryTypeQueryAdapter _query =(CriteriaQueryTypeQueryAdapter)query; + _query.setHint(HINT_FETCH_SIZE,100); + _query.setHint(READ_ONLY,true); + return _query.stream(); + }else{ + return query.getResultStream(); + } + } } diff --git a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/DaoService.java b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/DaoService.java index 8ad409cc..ccecbf4c 100644 --- a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/DaoService.java +++ b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/DaoService.java @@ -2,16 +2,23 @@ package io.sc.platform.orm.service; import io.sc.platform.orm.repository.DaoRepository; import io.sc.platform.orm.service.support.DaoExceptionProvider; +import io.sc.platform.orm.service.support.DataExportConfigure; import io.sc.platform.orm.service.support.QueryParameter; import io.sc.platform.orm.service.support.criteria.Criteria; +import io.sc.platform.poi.generator.UniverTemplate; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.OutputStream; import java.io.Serializable; import java.util.Enumeration; import java.util.List; +import java.util.function.Consumer; +import java.util.stream.Stream; public interface DaoService>{ public R getRepository(); @@ -47,4 +54,16 @@ public interface DaoService query(QueryParameter queryParameter, Specification specification) throws Exception; public Page query(Specification specification, Pageable pageable,Sort sort) throws Exception; + public void stream(Consumer consumer) throws Exception; + public void stream(QueryParameter queryParameter,Consumer consumer) throws Exception; + public void stream(QueryParameter queryParameter, Specification specification,Consumer consumer) throws Exception; + public void stream(Specification specification, Sort sort,Consumer consumer) throws Exception; + + public Stream stream() throws Exception; + public Stream stream(QueryParameter queryParameter) throws Exception; + public Stream stream(QueryParameter queryParameter, Specification specification) throws Exception; + public Stream stream(Specification specification, Sort sort) throws Exception; + + public DataExportConfigure getExportConfigure(); + public DataExportConfigure export(QueryParameter queryParameter, OutputStream outputStream) throws Exception; } diff --git a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/JxlsTemplateService.java b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/JxlsTemplateService.java new file mode 100644 index 00000000..42fbd6c2 --- /dev/null +++ b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/JxlsTemplateService.java @@ -0,0 +1,8 @@ +package io.sc.platform.orm.service; + +import io.sc.platform.orm.service.support.JxlsTemplate; + +public interface JxlsTemplateService { + public JxlsTemplate findTemplateByCode(String code); + public JxlsTemplate findTemplateByJpaEntityClass(String jpaEntityClass); +} diff --git a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java index 9c1d826e..7e3e63d5 100644 --- a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java +++ b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java @@ -1,6 +1,6 @@ package io.sc.platform.orm.service.impl; -import com.beust.jcommander.internal.Lists; +import io.sc.platform.core.DirectoryManager; import io.sc.platform.core.Environment; import io.sc.platform.orm.entity.CorporationAuditorEntity; import io.sc.platform.orm.entity.DesensitizedEntity; @@ -9,16 +9,25 @@ import io.sc.platform.orm.entity.support.JpaEntityPersistentEventType; import io.sc.platform.orm.repository.DaoRepository; import io.sc.platform.orm.service.DaoService; import io.sc.platform.orm.service.DesensitizerAuthorizerService; +import io.sc.platform.orm.service.JxlsTemplateService; import io.sc.platform.orm.service.support.*; import io.sc.platform.orm.service.support.criteria.Criteria; import io.sc.platform.orm.service.support.criteria.impl.Equals; import io.sc.platform.orm.service.support.criteria.impl.IContains; import io.sc.platform.orm.service.support.criteria.impl.IsNull; +import io.sc.platform.poi.generator.UniverTemplate; +import io.sc.platform.poi.generator.UniverExcelGenerator; import io.sc.platform.security.util.SecurityUtil; -import io.sc.platform.util.CollectionUtil; +import io.sc.platform.util.ByteUtil; +import io.sc.platform.util.ResourceUtil; +import io.sc.platform.util.StringUtil; +import org.jxls.common.Context; +import org.jxls.util.JxlsHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.core.convert.ConversionService; +import org.springframework.core.io.DefaultResourceLoader; +import org.springframework.core.io.Resource; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -32,9 +41,13 @@ import org.springframework.util.StringUtils; import javax.persistence.criteria.Predicate; import javax.persistence.metamodel.PluralAttribute; import javax.persistence.metamodel.SingularAttribute; -import java.io.Serializable; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; import java.lang.reflect.Modifier; import java.util.*; +import java.util.function.Consumer; +import java.util.stream.Stream; public abstract class DaoServiceImpl> implements DaoService{ @Autowired protected ApplicationContext applicationContext; @@ -43,6 +56,7 @@ public abstract class DaoServiceImpl exceptionProvider =getExceptionProvider(); @Override @@ -498,6 +512,166 @@ public abstract class DaoServiceImpl consumer) throws Exception { + repository.stream(consumer); + } + + @Override + public void stream(QueryParameter queryParameter,Consumer consumer) throws Exception { + if(queryParameter!=null) { + buildDefaultSortBy(queryParameter); + Specification specification =buildSpecification(queryParameter); + specification =andCorporationSpecification(specification); + if(queryParameter.getSort()!=null) { + repository.stream(specification, queryParameter.getSort(),consumer); + }else{ + repository.stream(specification,consumer); + } + }else{ + buildDefaultSortBy(queryParameter); + Specification specification =andCorporationSpecification(null); + repository.stream(specification,consumer); + } + } + + @Override + public void stream(QueryParameter queryParameter, Specification specification,Consumer consumer) throws Exception { + if(queryParameter!=null) { + buildDefaultSortBy(queryParameter); + specification =andCorporationSpecification(specification); + if(queryParameter.getPageable()) { + repository.stream(specification,queryParameter.getSort(),consumer); + }else{ + repository.stream(specification,queryParameter.getSort(),consumer); + } + }else{ + specification =andCorporationSpecification(specification); + repository.stream(specification,consumer); + } + } + + @Override + public void stream(Specification specification, Sort sort,Consumer consumer) throws Exception { + if(sort!=null){ + if(specification!=null) { + repository.stream(specification,sort,consumer); + }else{ + repository.stream(sort,consumer); + } + }else{ + if(specification!=null) { + repository.stream(specification,consumer); + }else{ + repository.stream(consumer); + } + } + } + + @Override + public Stream stream() throws Exception { + return repository.stream(); + } + + @Override + public Stream stream(QueryParameter queryParameter) throws Exception { + if(queryParameter!=null) { + buildDefaultSortBy(queryParameter); + Specification specification =buildSpecification(queryParameter); + specification =andCorporationSpecification(specification); + if(queryParameter.getSort()!=null) { + return repository.stream(specification, queryParameter.getSort()); + }else{ + return repository.stream(specification); + } + }else{ + buildDefaultSortBy(queryParameter); + Specification specification =andCorporationSpecification(null); + return repository.stream(specification); + } + } + + @Override + public Stream stream(QueryParameter queryParameter, Specification specification) throws Exception { + if(queryParameter!=null) { + buildDefaultSortBy(queryParameter); + specification =andCorporationSpecification(specification); + if(queryParameter.getPageable()) { + return repository.stream(specification,queryParameter.getSort()); + }else{ + return repository.stream(specification,queryParameter.getSort()); + } + }else{ + specification =andCorporationSpecification(specification); + return repository.stream(specification); + } + } + + @Override + public Stream stream(Specification specification, Sort sort) throws Exception { + if(sort!=null){ + if(specification!=null) { + return repository.stream(specification,sort); + }else{ + return repository.stream(sort); + } + }else{ + if(specification!=null) { + return repository.stream(specification); + }else{ + return repository.stream(); + } + } + } + + @Override + public DataExportConfigure getExportConfigure() { + String entityClassName =repository.getJpaEntityInformation().getJavaType().getName(); + DataExportConfigure configure =new DataExportConfigure(); + configure.setJxlsTemplateClassPath(entityClassName.replace('.','/') + ".xlsx"); + configure.setJxlsTemplateJpaEntityClass(repository.getJpaEntityInformation().getJavaType().getName()); + configure.setOutputFilePath(DirectoryManager.getInstance().getByName("dir.work.web.export") + "/" + UUID.randomUUID().toString() + ".xlsx"); + configure.setDownloadFileName(repository.getJpaEntityInformation().getJavaType().getSimpleName() + ".xlsx"); + return configure; + } + + @Override + public DataExportConfigure export(QueryParameter queryParameter, OutputStream outputStream) throws Exception { + DataExportConfigure dataExportConfigure =this.getExportConfigure(); + if(dataExportConfigure==null){ + return null; + } + + String templateClassPath =dataExportConfigure.getJxlsTemplateClassPath(); + String templateCode =dataExportConfigure.getJxlsTemplateCode(); + String templateJpaEntityClass =dataExportConfigure.getJxlsTemplateJpaEntityClass(); + JxlsTemplate template =null; + if(StringUtils.hasText(templateCode)) { + template =jxlsTemplateService.findTemplateByCode(templateCode); + }else if(StringUtils.hasText(templateClassPath)) { + Resource resource =new DefaultResourceLoader().getResource("classpath:/" + templateClassPath); + if(resource!=null && resource.exists()){ + try(InputStream inputStream =resource.getInputStream();){ + template =new JxlsTemplate(); + template.setBytes(ByteUtil.read(inputStream)); + } + } + }else if(StringUtils.hasText(templateJpaEntityClass)){ + template =jxlsTemplateService.findTemplateByJpaEntityClass(templateJpaEntityClass); + } + + if(template==null){ + return null; + } + + Context context = new Context(); + context.putVar("list", this.list(queryParameter)); + try(InputStream inputStream =new ByteArrayInputStream(template.getBytes());){ + JxlsHelper.getInstance().processTemplate(inputStream, outputStream,context); + } + return dataExportConfigure; + } + @Override public List buildCriteriaFromEntity(Enumeration parameterNames, E entity) throws Exception { if(entity==null){ diff --git a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/JxlsTemplateServiceImpl.java b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/JxlsTemplateServiceImpl.java new file mode 100644 index 00000000..1f6889fe --- /dev/null +++ b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/JxlsTemplateServiceImpl.java @@ -0,0 +1,74 @@ +package io.sc.platform.orm.service.impl; + +import io.sc.platform.orm.service.JxlsTemplateService; +import io.sc.platform.orm.service.support.JxlsTemplate; +import io.sc.platform.util.StringUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.ResultSetExtractor; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import java.sql.Blob; +import java.sql.ResultSet; +import java.sql.SQLException; + +@Service("io.sc.platform.orm.service.impl.JxlsTemplateServiceImpl") +public class JxlsTemplateServiceImpl implements JxlsTemplateService { + private static final int TEMPLATE_BYTE_MAX_LENGTH =1024*1024*50; + private static final String SQL_BY_CODE ="select * from LCDP_JXLS_TEMPLATE where CODE_='${0}'"; + private static final String SQL_BY_JPA_ENTITY_CLASS ="select * from LCDP_JXLS_TEMPLATE where JPA_ENTITY_CLASS_='${0}'"; + @Autowired private JdbcTemplate jdbcTemplate; + + @Override + public JxlsTemplate findTemplateByCode(String code) { + if(!StringUtils.hasText(code)){ + return null; + } + String sql = StringUtil.format(SQL_BY_CODE,code); + return jdbcTemplate.query(sql, new JxlsTemplateResultSetExtractor()); + } + + @Override + public JxlsTemplate findTemplateByJpaEntityClass(String jpaEntityClass) { + if(!StringUtils.hasText(jpaEntityClass)){ + return null; + } + String sql = StringUtil.format(SQL_BY_JPA_ENTITY_CLASS,jpaEntityClass); + return jdbcTemplate.query(sql, new JxlsTemplateResultSetExtractor()); + } + + private static class JxlsTemplateResultSetExtractor implements ResultSetExtractor { + @Override + public JxlsTemplate extractData(ResultSet rs) throws SQLException, DataAccessException { + if(rs.next()) { + JxlsTemplate template =new JxlsTemplate(); + template.setId(rs.getString("ID_")); + template.setCode(rs.getString("CODE_")); + template.setName(rs.getString("NAME_")); + template.setDescription(rs.getString("DESCRIPTION_")); + Object o =rs.getObject("ASYNC_"); + if(o==null){ + template.setAsync(false); + }else{ + Integer async =(Integer)o; + template.setAsync(async==1?true:false); + } + Blob blob = rs.getBlob("BYTES_"); + if(blob!=null) { + long length = blob.length(); + if(length<=0){ + template.setBytes(null); + } + if(length>TEMPLATE_BYTE_MAX_LENGTH){ + throw new RuntimeException("JXLS Template's blob data too big! it can NOT great than " + TEMPLATE_BYTE_MAX_LENGTH + " byte."); + } + template.setBytes(blob.getBytes(1, (int) length)); + return template; + } + } + return null; + } + } +} diff --git a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/DataExportConfigure.java b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/DataExportConfigure.java new file mode 100644 index 00000000..fd30f0a8 --- /dev/null +++ b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/DataExportConfigure.java @@ -0,0 +1,61 @@ +package io.sc.platform.orm.service.support; + +/** + * 数据导出配置类 + */ +public class DataExportConfigure { + private boolean async; //是否异步执行 + private String jxlsTemplateClassPath; //JXLS模版 classpath + private String jxlsTemplateCode; //JXLS模版代码 + private String jxlsTemplateJpaEntityClass; //JXLS模版JPA实体类 + private String outputFilePath; //导出文件路径 + private String downloadFileName; //用于下载的文件名 + + public boolean isAsync() { + return async; + } + + public void setAsync(boolean async) { + this.async = async; + } + + public String getJxlsTemplateClassPath() { + return jxlsTemplateClassPath; + } + + public void setJxlsTemplateClassPath(String jxlsTemplateClassPath) { + this.jxlsTemplateClassPath = jxlsTemplateClassPath; + } + + public String getJxlsTemplateCode() { + return jxlsTemplateCode; + } + + public void setJxlsTemplateCode(String jxlsTemplateCode) { + this.jxlsTemplateCode = jxlsTemplateCode; + } + + public String getJxlsTemplateJpaEntityClass() { + return jxlsTemplateJpaEntityClass; + } + + public void setJxlsTemplateJpaEntityClass(String jxlsTemplateJpaEntityClass) { + this.jxlsTemplateJpaEntityClass = jxlsTemplateJpaEntityClass; + } + + public String getOutputFilePath() { + return outputFilePath; + } + + public void setOutputFilePath(String outputFilePath) { + this.outputFilePath = outputFilePath; + } + + public String getDownloadFileName() { + return downloadFileName; + } + + public void setDownloadFileName(String downloadFileName) { + this.downloadFileName = downloadFileName; + } +} diff --git a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/JxlsTemplate.java b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/JxlsTemplate.java new file mode 100644 index 00000000..af2ce76f --- /dev/null +++ b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/JxlsTemplate.java @@ -0,0 +1,76 @@ +package io.sc.platform.orm.service.support; + +public class JxlsTemplate { + private String id; + private String code; + private String name; + protected String namec; + private String description; + private String jpaEntityClass; + private Boolean async; + private byte[] bytes; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getNamec() { + return namec; + } + + public void setNamec(String namec) { + this.namec = namec; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getJpaEntityClass() { + return jpaEntityClass; + } + + public void setJpaEntityClass(String jpaEntityClass) { + this.jpaEntityClass = jpaEntityClass; + } + + public Boolean getAsync() { + return async; + } + + public void setAsync(Boolean async) { + this.async = async; + } + + public byte[] getBytes() { + return bytes; + } + + public void setBytes(byte[] bytes) { + this.bytes = bytes; + } +} diff --git a/io.sc.platform.poi/build.gradle b/io.sc.platform.poi/build.gradle index 45a7cd61..0026538c 100644 --- a/io.sc.platform.poi/build.gradle +++ b/io.sc.platform.poi/build.gradle @@ -1,9 +1,11 @@ dependencies { api( - project(":io.sc.platform.mvc"), - project(":io.sc.platform.csv"), + project(":io.sc.platform.core"), "org.apache.poi:poi:${poi_version}", "org.apache.poi:poi-ooxml:${poi_version}", + + "org.jxls:jxls:${jxls_version}", + "org.jxls:jxls-poi:${jxls_version}", ) } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/generator/UniverExcelGenerator.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/generator/UniverExcelGenerator.java index eebe91d4..be6efd91 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/generator/UniverExcelGenerator.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/generator/UniverExcelGenerator.java @@ -1,30 +1,42 @@ package io.sc.platform.poi.generator; -import io.sc.platform.excel.univer.model.*; -import io.sc.platform.util.FileUtil; -import io.sc.platform.util.ObjectMapperUtil; +import io.sc.platform.poi.univer.model.CellValueType; +import io.sc.platform.poi.univer.model.ICellData; +import io.sc.platform.poi.univer.model.IWorksheetData; import io.sc.platform.util.TypeConvertor; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.util.StringUtils; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.nio.file.Path; +import java.util.HashMap; import java.util.Map; public class UniverExcelGenerator { - public void generate(String outputFilePath, IWorkbookData workBookConfig) throws IOException { - if(workBookConfig==null) { + private UniverTemplate template; + private Map parameters =new HashMap<>(); + + public UniverExcelGenerator(){} + public UniverExcelGenerator(UniverTemplate template){ + this.template =template; + } + + public void addParameter(String parameterName,Object parameterValue){ + this.parameters.put(parameterName,parameterValue); + } + + public void generate() throws IOException { + if(template==null || !StringUtils.hasText(template.getOutputFilePath()) || template.getUniverConfigure()==null) { return; } try( - FileOutputStream outputStream =new FileOutputStream(outputFilePath); + FileOutputStream outputStream =new FileOutputStream(template.getOutputFilePath()); XSSFWorkbook workbook = new XSSFWorkbook(); ){ - for(Map.Entry sheetConfigEntry : workBookConfig.getSheets().entrySet()){ + for(Map.Entry sheetConfigEntry : template.getUniverConfigure().getSheets().entrySet()){ String sheetName =sheetConfigEntry.getKey(); IWorksheetData sheetConfig =sheetConfigEntry.getValue(); XSSFSheet sheet = workbook.createSheet(sheetConfig.getName()); @@ -55,14 +67,19 @@ public class UniverExcelGenerator { } } - public static void main(String[] args) throws Exception { - FileInputStream inputStream =new FileInputStream("/Users/wangshaoping/wspsc/workspace/wangshaoping/v8/platform/io.sc.platform.poi/src/main/resources/a.txt"); - String content = FileUtil.readString(inputStream); - content =content.replace("undefined","null"); + public UniverTemplate getTemplate() { + return template; + } + + public void setTemplate(UniverTemplate template) { + this.template = template; + } - IWorkbookData workbookConfig = ObjectMapperUtil.json().readValue(content,IWorkbookData.class); + public Map getParameters() { + return parameters; + } - UniverExcelGenerator generator =new UniverExcelGenerator(); - generator.generate("/Users/wangshaoping/Desktop/test/a.xlsx",workbookConfig); + public void setParameters(Map parameters) { + this.parameters = parameters; } } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/generator/UniverTemplate.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/generator/UniverTemplate.java new file mode 100644 index 00000000..25bf131f --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/generator/UniverTemplate.java @@ -0,0 +1,24 @@ +package io.sc.platform.poi.generator; + +import io.sc.platform.poi.univer.model.IWorkbookData; + +public class UniverTemplate { + private String outputFilePath; + private IWorkbookData univerConfigure; + + public String getOutputFilePath() { + return outputFilePath; + } + + public void setOutputFilePath(String outputFilePath) { + this.outputFilePath = outputFilePath; + } + + public IWorkbookData getUniverConfigure() { + return univerConfigure; + } + + public void setUniverConfigure(IWorkbookData univerConfigure) { + this.univerConfigure = univerConfigure; + } +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/jxls/generator/ExcelGenerator.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/jxls/generator/ExcelGenerator.java new file mode 100644 index 00000000..a362b571 --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/jxls/generator/ExcelGenerator.java @@ -0,0 +1,15 @@ +package io.sc.platform.poi.jxls.generator; + +import java.io.FileNotFoundException; + +public class ExcelGenerator { + public static void main(String[] args) throws FileNotFoundException { +// Map data = new HashMap<>(); +// data.put("employees", employees); +// JxlsHelper.getInstance(). +// JxlsPoiTemplateFillerBuilder.newInstance() +// .withTemplate("/Users/wangshaoping/Desktop/test/template.xlsx") +// .build() +// .fill(data, new File("/Users/wangshaoping/Desktop/test/xxx.xlsx")); + } +} diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/AbsoluteRefType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AbsoluteRefType.java similarity index 80% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/AbsoluteRefType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AbsoluteRefType.java index e025aacc..19550f3c 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/AbsoluteRefType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AbsoluteRefType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum AbsoluteRefType { NONE(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/AlignTypeH.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AlignTypeH.java similarity index 83% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/AlignTypeH.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AlignTypeH.java index 2c74b5a9..a552810c 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/AlignTypeH.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AlignTypeH.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum AlignTypeH { CENTER(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/AlignTypeV.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AlignTypeV.java similarity index 81% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/AlignTypeV.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AlignTypeV.java index 05937212..c497d193 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/AlignTypeV.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AlignTypeV.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum AlignTypeV { BOTTOM(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/BaselineOffset.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BaselineOffset.java similarity index 80% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/BaselineOffset.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BaselineOffset.java index 0bebd77d..3b4e0fe3 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/BaselineOffset.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BaselineOffset.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum BaselineOffset { NORMAL(1), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/BlockType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BlockType.java similarity index 76% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/BlockType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BlockType.java index f101b5c8..a70f9f76 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/BlockType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BlockType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum BlockType { DRAWING(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/BorderStyleTypes.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BorderStyleTypes.java similarity index 89% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/BorderStyleTypes.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BorderStyleTypes.java index b129ceb0..9a03cd6c 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/BorderStyleTypes.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BorderStyleTypes.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum BorderStyleTypes { NONE(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/BulletAlignment.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BulletAlignment.java similarity index 93% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/BulletAlignment.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BulletAlignment.java index 5c8ed8e2..4c67402f 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/BulletAlignment.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BulletAlignment.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum BulletAlignment { BULLET_ALIGNMENT_UNSPECIFIED(0),// The bullet alignment is unspecified. diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/CellValueType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CellValueType.java similarity index 81% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/CellValueType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CellValueType.java index d6d1783c..1072767c 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/CellValueType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CellValueType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum CellValueType { STRING(1), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/CharacterSpacingControlType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CharacterSpacingControlType.java similarity index 84% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/CharacterSpacingControlType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CharacterSpacingControlType.java index 56f338e2..3cf4f56d 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/CharacterSpacingControlType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CharacterSpacingControlType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum CharacterSpacingControlType { compressPunctuation(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ColumnSeparatorType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ColumnSeparatorType.java similarity index 87% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ColumnSeparatorType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ColumnSeparatorType.java index 70e7bf95..0515483d 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ColumnSeparatorType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ColumnSeparatorType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum ColumnSeparatorType { COLUMN_SEPARATOR_STYLE_UNSPECIFIED(0),// An unspecified column separator style. diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/CustomDecorationType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CustomDecorationType.java similarity index 79% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/CustomDecorationType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CustomDecorationType.java index 99e50670..190e07b1 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/CustomDecorationType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CustomDecorationType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum CustomDecorationType { COMMENT(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/CustomRangeType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CustomRangeType.java similarity index 88% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/CustomRangeType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CustomRangeType.java index 8c04d248..516ca8d5 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/CustomRangeType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CustomRangeType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum CustomRangeType { HYPERLINK(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/DashStyleType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DashStyleType.java similarity index 90% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/DashStyleType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DashStyleType.java index d38e9162..edb51b14 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/DashStyleType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DashStyleType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum DashStyleType { DASH_STYLE_UNSPECIFIED(0),// Unspecified dash style. diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/DocumentFlavor.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DocumentFlavor.java similarity index 80% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/DocumentFlavor.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DocumentFlavor.java index e4f4739e..2ce018af 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/DocumentFlavor.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DocumentFlavor.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum DocumentFlavor { UNSPECIFIED(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/DrawingType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DrawingType.java similarity index 95% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/DrawingType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DrawingType.java index 0e20044c..4baca382 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/DrawingType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DrawingType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum DrawingType { /** diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/GridType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/GridType.java similarity index 81% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/GridType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/GridType.java index 82a9eeb0..542fe919 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/GridType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/GridType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum GridType { DEFAULT(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/HorizontalAlign.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/HorizontalAlign.java similarity index 92% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/HorizontalAlign.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/HorizontalAlign.java index 661284f5..e331a9b2 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/HorizontalAlign.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/HorizontalAlign.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum HorizontalAlign { UNSPECIFIED(0), // The horizontal alignment is not specified. Do not use this. diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IBorderData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBorderData.java similarity index 97% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IBorderData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBorderData.java index b6d51c11..39a672d6 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IBorderData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBorderData.java @@ -1,4 +1,5 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; + public class IBorderData { private IBorderStyleData t; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IBorderStyleData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBorderStyleData.java similarity index 89% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IBorderStyleData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBorderStyleData.java index e38c27d7..4cb9b2f3 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IBorderStyleData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBorderStyleData.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IBorderStyleData { private BorderStyleTypes s; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IBullet.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBullet.java similarity index 94% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IBullet.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBullet.java index 0ea049fd..ca5ab572 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IBullet.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBullet.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IBullet { private String listType; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ICellData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICellData.java similarity index 97% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ICellData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICellData.java index 5856258e..ac8418a2 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ICellData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICellData.java @@ -1,4 +1,5 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; + import java.util.Map; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IColorStyle.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColorStyle.java similarity index 88% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IColorStyle.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColorStyle.java index ff7c0116..8c0e47c3 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IColorStyle.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColorStyle.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IColorStyle { private String rgb; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IColumnData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColumnData.java similarity index 95% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IColumnData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColumnData.java index 0ee09195..8fcfab82 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IColumnData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColumnData.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IColumnHeader.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColumnHeader.java similarity index 91% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IColumnHeader.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColumnHeader.java index 1f8b1857..c4c43623 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IColumnHeader.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColumnHeader.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ICustomBlock.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomBlock.java similarity index 93% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ICustomBlock.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomBlock.java index f097b023..206f03fe 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ICustomBlock.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomBlock.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class ICustomBlock { private Integer startIndex; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ICustomDecoration.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomDecoration.java similarity index 94% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ICustomDecoration.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomDecoration.java index 54a02ddc..0af84ed1 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ICustomDecoration.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomDecoration.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class ICustomDecoration { private Integer startIndex; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ICustomRange.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomRange.java similarity index 97% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ICustomRange.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomRange.java index 53e65f07..949035b2 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ICustomRange.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomRange.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import java.util.Map; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ICustomTable.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomTable.java similarity index 93% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ICustomTable.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomTable.java index c8a46a11..49f40d49 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ICustomTable.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomTable.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class ICustomTable { private Integer startIndex; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDistFromText.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDistFromText.java similarity index 94% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDistFromText.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDistFromText.java index b0526e08..78f7d45c 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDistFromText.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDistFromText.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IDistFromText { private Integer distT; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocDrawingBase.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocDrawingBase.java similarity index 98% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocDrawingBase.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocDrawingBase.java index 506d3931..26edd6b0 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocDrawingBase.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocDrawingBase.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocDrawingPosition.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocDrawingPosition.java similarity index 94% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocDrawingPosition.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocDrawingPosition.java index 88d84351..a5fcc664 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocDrawingPosition.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocDrawingPosition.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IDocDrawingPosition { private ISize size; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocsBorder.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocsBorder.java similarity index 93% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocsBorder.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocsBorder.java index 9e3fa17e..e147fbdd 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocsBorder.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocsBorder.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IDocsBorder { private IColorStyle color; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocumentBody.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentBody.java similarity index 98% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocumentBody.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentBody.java index 98ae35f8..fb100430 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocumentBody.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentBody.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import java.util.Map; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocumentData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentData.java similarity index 97% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocumentData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentData.java index a8dda637..98c93470 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocumentData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentData.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IDocumentData extends IReferenceSource { /** unit ID */ diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocumentRenderConfig.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentRenderConfig.java similarity index 98% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocumentRenderConfig.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentRenderConfig.java index 86164949..fa9ba07b 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocumentRenderConfig.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentRenderConfig.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocumentSettings.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentSettings.java similarity index 84% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocumentSettings.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentSettings.java index 568cfa50..37c2e8da 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocumentSettings.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentSettings.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IDocumentSettings { private Integer zoomRatio; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocumentStyle.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentStyle.java similarity index 99% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocumentStyle.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentStyle.java index ab5e61c8..04115d12 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDocumentStyle.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentStyle.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDrawingParam.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingParam.java similarity index 96% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDrawingParam.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingParam.java index e1015741..55181639 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDrawingParam.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingParam.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDrawingSearch.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingSearch.java similarity index 85% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDrawingSearch.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingSearch.java index e4466ba6..92cc0e5d 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDrawingSearch.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingSearch.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IDrawingSearch extends IDrawingSpace { private String drawingId; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDrawingSpace.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingSpace.java similarity index 90% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDrawingSpace.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingSpace.java index 760f2c7b..cd4113f6 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IDrawingSpace.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingSpace.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IDrawingSpace { private String unitId; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IFooterData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IFooterData.java similarity index 90% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IFooterData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IFooterData.java index c57e4c13..2bd90f27 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IFooterData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IFooterData.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IFooterData { private String footerId; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IFreeze.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IFreeze.java similarity index 95% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IFreeze.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IFreeze.java index 41e3ec26..67029974 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IFreeze.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IFreeze.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IFreeze { private Integer xSplit; // count of fixed cols diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IHeaderData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IHeaderData.java similarity index 90% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IHeaderData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IHeaderData.java index 7c04bcc4..03cfaf30 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IHeaderData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IHeaderData.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IHeaderData { private String headerId; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IIndentStart.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IIndentStart.java similarity index 96% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IIndentStart.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IIndentStart.java index 4029a3d1..379f2bbd 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IIndentStart.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IIndentStart.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IIndentStart { private INumberUnit indentFirstLine; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IListData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IListData.java similarity index 91% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IListData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IListData.java index 54dcc4d0..b402ee40 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IListData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IListData.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IListData { private String listType; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/INestingLevel.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/INestingLevel.java similarity index 97% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/INestingLevel.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/INestingLevel.java index b20890b2..e2cc13b7 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/INestingLevel.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/INestingLevel.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class INestingLevel { private IParagraphStyle paragraphProperties; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/INumberUnit.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/INumberUnit.java similarity index 88% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/INumberUnit.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/INumberUnit.java index d77d572b..fb314883 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/INumberUnit.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/INumberUnit.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class INumberUnit { private Integer v; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IObjectPositionH.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IObjectPositionH.java similarity index 95% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IObjectPositionH.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IObjectPositionH.java index dd0f58da..20ff088f 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IObjectPositionH.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IObjectPositionH.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IObjectPositionH { private ObjectRelativeFromH relativeFrom; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IObjectPositionV.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IObjectPositionV.java similarity index 95% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IObjectPositionV.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IObjectPositionV.java index 69dbf149..7a774d41 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IObjectPositionV.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IObjectPositionV.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IObjectPositionV { private ObjectRelativeFromV relativeFrom; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IPaddingData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IPaddingData.java similarity index 93% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IPaddingData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IPaddingData.java index 4288c8f5..0b803549 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IPaddingData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IPaddingData.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IPaddingData { private Integer t; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IParagraph.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraph.java similarity index 93% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IParagraph.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraph.java index d4c3d429..f8aff134 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IParagraph.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraph.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IParagraph { private Integer startIndex; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IParagraphBorder.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphBorder.java similarity index 84% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IParagraphBorder.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphBorder.java index c1f164cf..1255c299 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IParagraphBorder.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphBorder.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IParagraphBorder extends IDocsBorder { private Integer padding; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IParagraphProperties.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphProperties.java similarity index 99% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IParagraphProperties.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphProperties.java index 62cb7def..1d0a5da0 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IParagraphProperties.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphProperties.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IParagraphStyle.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphStyle.java similarity index 86% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IParagraphStyle.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphStyle.java index 23a82eae..b7cebfbe 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IParagraphStyle.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphStyle.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IParagraphStyle extends IParagraphProperties { private ITextStyle textStyle; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IRange.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRange.java similarity index 98% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IRange.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRange.java index b7e9d477..fe2f3425 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IRange.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRange.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IRange { private RangeType rangeType; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IRangeLocation.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRangeLocation.java similarity index 94% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IRangeLocation.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRangeLocation.java index 74303b13..a3cccf5e 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IRangeLocation.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRangeLocation.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IRangeLocation { /** diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IReferenceSource.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IReferenceSource.java similarity index 97% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IReferenceSource.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IReferenceSource.java index 64afed61..7bfcb294 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IReferenceSource.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IReferenceSource.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import java.util.Map; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IResource.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IResource.java similarity index 91% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IResource.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IResource.java index 0b703fa9..397bb838 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IResource.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IResource.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IResource { private String id; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IRowData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRowData.java similarity index 97% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IRowData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRowData.java index 8979d819..aeb5542c 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IRowData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRowData.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IRowHeader.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRowHeader.java similarity index 91% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IRowHeader.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRowHeader.java index c51f997e..c365ca90 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IRowHeader.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRowHeader.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ISectionBreak.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISectionBreak.java similarity index 99% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ISectionBreak.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISectionBreak.java index fc6e6a06..64de3111 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ISectionBreak.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISectionBreak.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ISectionColumnProperties.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISectionColumnProperties.java similarity index 90% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ISectionColumnProperties.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISectionColumnProperties.java index 4a911bbb..28c6a401 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ISectionColumnProperties.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISectionColumnProperties.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class ISectionColumnProperties { private Integer width; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IShading.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IShading.java similarity index 86% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IShading.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IShading.java index 636b12a3..d12b920f 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IShading.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IShading.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IShading { private IColorStyle backgroundColor; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ISize.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISize.java similarity index 89% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ISize.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISize.java index c3a3145f..8b0e208d 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ISize.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISize.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class ISize { private Integer width; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IStyleBase.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IStyleBase.java similarity index 98% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IStyleBase.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IStyleBase.java index 72cd878b..d65386b5 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IStyleBase.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IStyleBase.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IStyleData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IStyleData.java similarity index 96% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IStyleData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IStyleData.java index 0db7cbe4..0cf8d89c 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IStyleData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IStyleData.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IStyleData { private ITextRotation tr; //textRotation diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITabStop.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITabStop.java similarity index 90% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITabStop.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITabStop.java index 515a42e8..f07f52de 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITabStop.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITabStop.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class ITabStop { private Integer offset; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITable.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITable.java similarity index 98% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITable.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITable.java index 76a42cae..9c83f8d6 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITable.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITable.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableAnchor.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableAnchor.java similarity index 91% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableAnchor.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableAnchor.java index 4df43922..aaed58c2 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableAnchor.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableAnchor.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class ITableAnchor { private IObjectPositionH positionH; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableCell.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCell.java similarity index 98% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableCell.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCell.java index 47ab5a1e..fe92555b 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableCell.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCell.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableCellBorder.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCellBorder.java similarity index 93% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableCellBorder.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCellBorder.java index 0511fd87..15b37131 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableCellBorder.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCellBorder.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class ITableCellBorder { private IColorStyle color; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableCellMargin.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCellMargin.java similarity index 94% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableCellMargin.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCellMargin.java index 7fb07116..4b9cf366 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableCellMargin.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCellMargin.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class ITableCellMargin { private INumberUnit start; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableColumn.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableColumn.java similarity index 83% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableColumn.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableColumn.java index 28ebac0a..0d9bd154 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableColumn.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableColumn.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class ITableColumn { private IWidthInTableSize size; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableRow.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableRow.java similarity index 96% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableRow.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableRow.java index fedf3e52..0cc5346e 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableRow.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableRow.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableRowSize.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableRowSize.java similarity index 90% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableRowSize.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableRowSize.java index 203f511f..2f40f262 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITableRowSize.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableRowSize.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class ITableRowSize { private INumberUnit val; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITextDecoration.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextDecoration.java similarity index 95% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITextDecoration.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextDecoration.java index 2e7f81b5..69b89a36 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITextDecoration.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextDecoration.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITextRotation.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextRotation.java similarity index 90% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITextRotation.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextRotation.java index 899d2561..03f44e6d 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITextRotation.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextRotation.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITextRun.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextRun.java similarity index 93% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITextRun.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextRun.java index 9e0ba045..ff7ecf88 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITextRun.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextRun.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class ITextRun { private Integer st; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITextStyle.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextStyle.java similarity index 91% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITextStyle.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextStyle.java index 90a11cb5..776d4fc2 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITextStyle.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextStyle.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class ITextStyle { private Integer sc; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITransformState.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITransformState.java similarity index 97% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITransformState.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITransformState.java index 30172751..eb64d5d0 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ITransformState.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITransformState.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class ITransformState { private Integer width; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IWidthInTableSize.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWidthInTableSize.java similarity index 90% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IWidthInTableSize.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWidthInTableSize.java index 6d01f982..72c5d56b 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IWidthInTableSize.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWidthInTableSize.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public class IWidthInTableSize { private TableSizeType type; diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IWorkbookData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWorkbookData.java similarity index 93% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IWorkbookData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWorkbookData.java index 2d17f9ca..44f3ac3b 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IWorkbookData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWorkbookData.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import java.util.Map; @@ -9,7 +9,7 @@ public class IWorkbookData { private LocaleType locale; //Locale of the document. private Map styles; //Style references for the workbook. private String[] sheetOrder; //Array of sheet IDs representing the order of worksheets. - private Map sheets; //Record containing data for each worksheet. + private Map sheets; //Record containing data for each worksheet. private IResource[] resources; //Store the data of plugins public String getId() { diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IWorksheetData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWorksheetData.java similarity index 97% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IWorksheetData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWorksheetData.java index dfd79d24..1126cc85 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/IWorksheetData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWorksheetData.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; import com.fasterxml.jackson.annotation.JsonFormat; @@ -18,7 +18,7 @@ public class IWorksheetData { private IRange[] mergeData; // Array of merged cell ranges. private Map> cellData; // Matrix of cell contents. More details. private Map rowData; // Array of row data objects. - private Map columnData; // Array of column data objects. + private Map columnData; // Array of column data objects. private IRowHeader rowHeader; // Row header configuration. private IColumnHeader columnHeader; // Column header configuration. @JsonFormat(shape = JsonFormat.Shape.NUMBER) diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ListGlyphType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ListGlyphType.java similarity index 98% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ListGlyphType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ListGlyphType.java index 4496c283..79bb5d96 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ListGlyphType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ListGlyphType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum ListGlyphType { BULLET(0),// The glyph type is unspecified or unsupported. diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/LocaleType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/LocaleType.java similarity index 85% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/LocaleType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/LocaleType.java index 97e7f27e..f5d34345 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/LocaleType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/LocaleType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum LocaleType { EN_US("enUS"), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/NamedStyleType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/NamedStyleType.java similarity index 91% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/NamedStyleType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/NamedStyleType.java index c6a10511..3a363a0d 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/NamedStyleType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/NamedStyleType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum NamedStyleType { NAMED_STYLE_TYPE_UNSPECIFIED(0),// The type of named style is unspecified. diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/NumberUnitType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/NumberUnitType.java similarity index 82% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/NumberUnitType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/NumberUnitType.java index 71dbed36..50a17a4b 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/NumberUnitType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/NumberUnitType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum NumberUnitType { POINT(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ObjectRelativeFromH.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ObjectRelativeFromH.java similarity index 86% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ObjectRelativeFromH.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ObjectRelativeFromH.java index 488aa57b..d2eca17e 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ObjectRelativeFromH.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ObjectRelativeFromH.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum ObjectRelativeFromH { PAGE(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ObjectRelativeFromV.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ObjectRelativeFromV.java similarity index 86% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ObjectRelativeFromV.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ObjectRelativeFromV.java index db8c65ae..ec94bfa3 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ObjectRelativeFromV.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ObjectRelativeFromV.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum ObjectRelativeFromV { PAGE(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/PageOrientType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/PageOrientType.java similarity index 78% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/PageOrientType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/PageOrientType.java index a3b6dad3..91800b07 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/PageOrientType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/PageOrientType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum PageOrientType { PORTRAIT(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/PositionedObjectLayoutType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/PositionedObjectLayoutType.java similarity index 86% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/PositionedObjectLayoutType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/PositionedObjectLayoutType.java index 7a023eb6..b6ba6387 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/PositionedObjectLayoutType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/PositionedObjectLayoutType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum PositionedObjectLayoutType {INLINE(0), WRAP_NONE(1), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/RangeType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/RangeType.java similarity index 79% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/RangeType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/RangeType.java index 86ed995b..a1eadb92 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/RangeType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/RangeType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum RangeType { NORMAL(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/SectionType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/SectionType.java similarity index 90% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/SectionType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/SectionType.java index da968f18..4cb6b30b 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/SectionType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/SectionType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum SectionType { SECTION_TYPE_UNSPECIFIED(0),// The section type is unspecified. diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/SpacingRule.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/SpacingRule.java similarity index 93% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/SpacingRule.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/SpacingRule.java index 097c2d09..36d88339 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/SpacingRule.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/SpacingRule.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum SpacingRule { /** diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TabStopAlignment.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TabStopAlignment.java similarity index 89% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TabStopAlignment.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TabStopAlignment.java index 09cf4d21..19931b17 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TabStopAlignment.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TabStopAlignment.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum TabStopAlignment { TAB_STOP_ALIGNMENT_UNSPECIFIED(0),// The tab stop alignment is unspecified. diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TableAlignmentType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableAlignmentType.java similarity index 79% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TableAlignmentType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableAlignmentType.java index 85928c69..4fa62ffb 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TableAlignmentType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableAlignmentType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum TableAlignmentType { START(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TableLayoutType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableLayoutType.java similarity index 78% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TableLayoutType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableLayoutType.java index de350dde..1726fb5f 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TableLayoutType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableLayoutType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum TableLayoutType { AUTO_FIT(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TableRowHeightRule.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableRowHeightRule.java similarity index 80% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TableRowHeightRule.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableRowHeightRule.java index dbf3f687..8446f7ce 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TableRowHeightRule.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableRowHeightRule.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum TableRowHeightRule { AUTO(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TableSizeType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableSizeType.java similarity index 78% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TableSizeType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableSizeType.java index b419738d..31c1da61 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TableSizeType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableSizeType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum TableSizeType { UNSPECIFIED(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TableTextWrapType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableTextWrapType.java similarity index 78% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TableTextWrapType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableTextWrapType.java index a2609972..69982317 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TableTextWrapType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableTextWrapType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum TableTextWrapType { NONE(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TextDecoration.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDecoration.java similarity index 91% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TextDecoration.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDecoration.java index 3b94c913..db952646 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TextDecoration.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDecoration.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum TextDecoration { DASH(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TextDirection.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDirection.java similarity index 80% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TextDirection.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDirection.java index 3dc80831..a1b1b211 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TextDirection.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDirection.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum TextDirection { UNSPECIFIED(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TextDirectionType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDirectionType.java similarity index 82% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TextDirectionType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDirectionType.java index bbfaf930..f0a31b3e 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/TextDirectionType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDirectionType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum TextDirectionType { NORMAL(0),// Horizontal diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ThemeColorType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ThemeColorType.java similarity index 90% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ThemeColorType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ThemeColorType.java index a644584d..0df86802 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/ThemeColorType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ThemeColorType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum ThemeColorType { /** diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/VerticalAlign.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/VerticalAlign.java similarity index 87% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/VerticalAlign.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/VerticalAlign.java index 205cd68a..22361c0c 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/VerticalAlign.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/VerticalAlign.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum VerticalAlign { UNSPECIFIED(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/VerticalAlignmentType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/VerticalAlignmentType.java similarity index 93% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/VerticalAlignmentType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/VerticalAlignmentType.java index 1ddc5171..befe3bec 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/VerticalAlignmentType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/VerticalAlignmentType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum VerticalAlignmentType { CONTENT_ALIGNMENT_UNSPECIFIED(0),// An unspecified content alignment. The content alignment is inherited from the parent if one exists. diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/WrapStrategy.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/WrapStrategy.java similarity index 96% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/WrapStrategy.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/WrapStrategy.java index b24140a2..c5c6784a 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/WrapStrategy.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/WrapStrategy.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum WrapStrategy { UNSPECIFIED(0), diff --git a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/WrapTextType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/WrapTextType.java similarity index 80% rename from io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/WrapTextType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/WrapTextType.java index 6978f3ec..90c9469c 100644 --- a/io.sc.platform.csv/src/main/java/io/sc/platform/excel/univer/model/WrapTextType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/WrapTextType.java @@ -1,4 +1,4 @@ -package io.sc.platform.excel.univer.model; +package io.sc.platform.poi.univer.model; public enum WrapTextType { BOTH_SIDES(0), diff --git a/io.sc.platform.poi/src/main/resources/META-INF/platform/plugins/components.json b/io.sc.platform.poi/src/main/resources/META-INF/platform/plugins/components.json index 53631ccb..12ce75b0 100644 --- a/io.sc.platform.poi/src/main/resources/META-INF/platform/plugins/components.json +++ b/io.sc.platform.poi/src/main/resources/META-INF/platform/plugins/components.json @@ -9,8 +9,7 @@ { "includes":[ - "io.sc.platform.poi.controller", - "io.sc.platform.poi.service.impl" + ], "excludes":[] } \ No newline at end of file diff --git a/io.sc.platform.poi/src/main/resources/META-INF/platform/plugins/security.json b/io.sc.platform.poi/src/main/resources/META-INF/platform/plugins/security.json index b4b0d196..ed359a60 100644 --- a/io.sc.platform.poi/src/main/resources/META-INF/platform/plugins/security.json +++ b/io.sc.platform.poi/src/main/resources/META-INF/platform/plugins/security.json @@ -1,5 +1,5 @@ { "permitPatterns":[ - "/api/poi/test" + ] } \ No newline at end of file diff --git a/io.sc.platform.scheduler.manager.frontend/package.json b/io.sc.platform.scheduler.manager.frontend/package.json index 412520c2..415beb51 100644 --- a/io.sc.platform.scheduler.manager.frontend/package.json +++ b/io.sc.platform.scheduler.manager.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.110", + "platform-core": "8.2.115", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.scheduler.manager.frontend/src/views/executor/Executor.vue b/io.sc.platform.scheduler.manager.frontend/src/views/executor/Executor.vue index 4d3f74cc..23dd6df5 100644 --- a/io.sc.platform.scheduler.manager.frontend/src/views/executor/Executor.vue +++ b/io.sc.platform.scheduler.manager.frontend/src/views/executor/Executor.vue @@ -27,8 +27,6 @@ 'separator', 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { width: 100, name: 'id', label: $t('id'), showIf: false }, diff --git a/io.sc.platform.scheduler.manager.frontend/src/views/task/Task.vue b/io.sc.platform.scheduler.manager.frontend/src/views/task/Task.vue index 9ef70c52..132baa71 100644 --- a/io.sc.platform.scheduler.manager.frontend/src/views/task/Task.vue +++ b/io.sc.platform.scheduler.manager.frontend/src/views/task/Task.vue @@ -74,8 +74,6 @@ }, 'separator', 'view', - 'separator', - 'export', ]" :columns="[ { diff --git a/io.sc.platform.scheduler.manager.frontend/src/views/tasklog/TaskLog.vue b/io.sc.platform.scheduler.manager.frontend/src/views/tasklog/TaskLog.vue index 88b46a57..d83159e7 100644 --- a/io.sc.platform.scheduler.manager.frontend/src/views/tasklog/TaskLog.vue +++ b/io.sc.platform.scheduler.manager.frontend/src/views/tasklog/TaskLog.vue @@ -65,8 +65,6 @@ }, }, 'view', - 'separator', - 'export', ]" :columns="[ { diff --git a/io.sc.platform.security/src/main/java/io/sc/platform/security/handler/PlatformLogoutSuccessHandler.java b/io.sc.platform.security/src/main/java/io/sc/platform/security/handler/PlatformLogoutSuccessHandler.java index a614141a..892e8d5f 100644 --- a/io.sc.platform.security/src/main/java/io/sc/platform/security/handler/PlatformLogoutSuccessHandler.java +++ b/io.sc.platform.security/src/main/java/io/sc/platform/security/handler/PlatformLogoutSuccessHandler.java @@ -3,11 +3,14 @@ package io.sc.platform.security.handler; import io.sc.platform.core.audit.AuditLog; import io.sc.platform.core.enums.AuditLogAction; import io.sc.platform.core.enums.AuditLogStatus; +import io.sc.platform.core.response.ResponseWrapper; +import io.sc.platform.core.response.ResponseWrapperBuilder; import io.sc.platform.core.service.AuditLogPersistenter; import io.sc.platform.core.service.AuditLogPersistenterManager; import io.sc.platform.core.util.IpUtil; import io.sc.platform.security.support.SecurityUser; import io.sc.platform.security.util.SecurityUtil; +import io.sc.platform.util.ObjectMapperUtil; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.logout.LogoutFilter; @@ -15,9 +18,11 @@ import org.springframework.security.web.authentication.logout.LogoutHandler; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.io.OutputStream; public class PlatformLogoutSuccessHandler implements LogoutSuccessHandler { private AuditLogPersistenterManager auditLogPersistenterManager; @@ -43,6 +48,11 @@ public class PlatformLogoutSuccessHandler implements LogoutSuccessHandler { } auditLog.setIp(IpUtil.getRemoteIp(request)); logger.log(auditLog); + + ResponseWrapper wrapper =ResponseWrapperBuilder.success("https://cn.bing.com/"); + ServletOutputStream outputStream =response.getOutputStream(); + outputStream.print(ObjectMapperUtil.json().writeValueAsString(wrapper)); + outputStream.flush(); } } } diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json index c7143258..608e6a28 100644 --- a/io.sc.platform.system.frontend/package.json +++ b/io.sc.platform.system.frontend/package.json @@ -111,7 +111,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.6", "pinia": "2.3.0", - "platform-core": "8.2.110", + "platform-core": "8.2.115", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.system/src/main/java/io/sc/platform/system/user/controller/UserWebController.java b/io.sc.platform.system/src/main/java/io/sc/platform/system/user/controller/UserWebController.java index f88e9876..8ce8ffba 100644 --- a/io.sc.platform.system/src/main/java/io/sc/platform/system/user/controller/UserWebController.java +++ b/io.sc.platform.system/src/main/java/io/sc/platform/system/user/controller/UserWebController.java @@ -30,6 +30,7 @@ import java.security.Principal; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Stream; @RestController("io.sc.platform.system.user.controller.UserWebController") @RequestMapping("/api/system/user") diff --git a/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/UserService.java b/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/UserService.java index ccba288e..b16ec7e4 100644 --- a/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/UserService.java +++ b/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/UserService.java @@ -221,5 +221,4 @@ public interface UserService extends DaoService listUsersByOrgs(List orgIds) throws Exception; - } diff --git a/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/impl/UserServiceImpl.java b/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/impl/UserServiceImpl.java index c88a3191..1c1bad25 100644 --- a/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/impl/UserServiceImpl.java +++ b/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/impl/UserServiceImpl.java @@ -1,6 +1,5 @@ package io.sc.platform.system.user.service.impl; -import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import io.sc.platform.jdbc.util.SqlBatcher; import io.sc.platform.mvc.plugins.PluginManager; @@ -10,7 +9,6 @@ import io.sc.platform.orm.api.exception.UserRawPasswordNotMatchException; import io.sc.platform.orm.service.impl.DaoServiceImpl; import io.sc.platform.orm.service.support.QueryParameter; import io.sc.platform.orm.service.support.QueryResult; -import io.sc.platform.orm.service.support.criteria.Criteria; import io.sc.platform.orm.util.EntityVoUtil; import io.sc.platform.security.SecurityProperties; import io.sc.platform.security.util.SecurityUtil; @@ -30,7 +28,6 @@ import io.sc.platform.system.user.jpa.entity.UserEntity; import io.sc.platform.system.user.jpa.repository.UserRepository; import io.sc.platform.system.user.service.UserService; import io.sc.platform.system.user.service.support.UserSession; -import io.sc.platform.util.DateUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.data.domain.Page; @@ -42,14 +39,14 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import javax.persistence.criteria.*; +import javax.persistence.criteria.Join; +import javax.persistence.criteria.Subquery; import javax.servlet.http.HttpServletRequest; import javax.transaction.Transactional; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.*; -import java.util.stream.Collectors; @Service("io.sc.platform.system.user.service.impl.UserServiceImpl") public class UserServiceImpl extends DaoServiceImpl implements UserService { diff --git a/io.sc.platform.system/src/main/resources/io/sc/platform/system/announcement/jpa/entity/AnnouncementEntity.xlsx b/io.sc.platform.system/src/main/resources/io/sc/platform/system/announcement/jpa/entity/AnnouncementEntity.xlsx new file mode 100644 index 00000000..847a97fd Binary files /dev/null and b/io.sc.platform.system/src/main/resources/io/sc/platform/system/announcement/jpa/entity/AnnouncementEntity.xlsx differ diff --git a/io.sc.platform.system/src/main/resources/io/sc/platform/system/application/jpa/entity/ApplicationEntity.xlsx b/io.sc.platform.system/src/main/resources/io/sc/platform/system/application/jpa/entity/ApplicationEntity.xlsx new file mode 100644 index 00000000..a9fe547f Binary files /dev/null and b/io.sc.platform.system/src/main/resources/io/sc/platform/system/application/jpa/entity/ApplicationEntity.xlsx differ diff --git a/io.sc.platform.system/src/main/resources/io/sc/platform/system/auditlog/jpa/entity/AuditLogEntity.xlsx b/io.sc.platform.system/src/main/resources/io/sc/platform/system/auditlog/jpa/entity/AuditLogEntity.xlsx new file mode 100644 index 00000000..17390cb8 Binary files /dev/null and b/io.sc.platform.system/src/main/resources/io/sc/platform/system/auditlog/jpa/entity/AuditLogEntity.xlsx differ diff --git a/io.sc.platform.system/src/main/resources/io/sc/platform/system/corporation/jpa/entity/CorporationEntity.xlsx b/io.sc.platform.system/src/main/resources/io/sc/platform/system/corporation/jpa/entity/CorporationEntity.xlsx new file mode 100644 index 00000000..b217bfc3 Binary files /dev/null and b/io.sc.platform.system/src/main/resources/io/sc/platform/system/corporation/jpa/entity/CorporationEntity.xlsx differ diff --git a/io.sc.platform.system/src/main/resources/io/sc/platform/system/department/jpa/entity/DepartmentEntity.xlsx b/io.sc.platform.system/src/main/resources/io/sc/platform/system/department/jpa/entity/DepartmentEntity.xlsx new file mode 100644 index 00000000..9812d93d Binary files /dev/null and b/io.sc.platform.system/src/main/resources/io/sc/platform/system/department/jpa/entity/DepartmentEntity.xlsx differ diff --git a/io.sc.platform.system/src/main/resources/io/sc/platform/system/desensitizer/jpa/entity/DesensitizeFieldEntity.xlsx b/io.sc.platform.system/src/main/resources/io/sc/platform/system/desensitizer/jpa/entity/DesensitizeFieldEntity.xlsx new file mode 100644 index 00000000..67b52a99 Binary files /dev/null and b/io.sc.platform.system/src/main/resources/io/sc/platform/system/desensitizer/jpa/entity/DesensitizeFieldEntity.xlsx differ diff --git a/io.sc.platform.system/src/main/resources/io/sc/platform/system/dictionary/jpa/entity/DictionaryEntity.xlsx b/io.sc.platform.system/src/main/resources/io/sc/platform/system/dictionary/jpa/entity/DictionaryEntity.xlsx new file mode 100644 index 00000000..b6f70d16 Binary files /dev/null and b/io.sc.platform.system/src/main/resources/io/sc/platform/system/dictionary/jpa/entity/DictionaryEntity.xlsx differ diff --git a/io.sc.platform.system/src/main/resources/io/sc/platform/system/ds/jpa/entity/DsEntity.xlsx b/io.sc.platform.system/src/main/resources/io/sc/platform/system/ds/jpa/entity/DsEntity.xlsx new file mode 100644 index 00000000..0048cdb1 Binary files /dev/null and b/io.sc.platform.system/src/main/resources/io/sc/platform/system/ds/jpa/entity/DsEntity.xlsx differ diff --git a/io.sc.platform.system/src/main/resources/io/sc/platform/system/i18n/jpa/entity/I18nEntity.xlsx b/io.sc.platform.system/src/main/resources/io/sc/platform/system/i18n/jpa/entity/I18nEntity.xlsx new file mode 100644 index 00000000..657b8f9e Binary files /dev/null and b/io.sc.platform.system/src/main/resources/io/sc/platform/system/i18n/jpa/entity/I18nEntity.xlsx differ diff --git a/io.sc.platform.system/src/main/resources/io/sc/platform/system/menu/jpa/entity/MenuEntity.xlsx b/io.sc.platform.system/src/main/resources/io/sc/platform/system/menu/jpa/entity/MenuEntity.xlsx new file mode 100644 index 00000000..ee30cc4f Binary files /dev/null and b/io.sc.platform.system/src/main/resources/io/sc/platform/system/menu/jpa/entity/MenuEntity.xlsx differ diff --git a/io.sc.platform.system/src/main/resources/io/sc/platform/system/notification/jap/entity/NotificationEntity.xlsx b/io.sc.platform.system/src/main/resources/io/sc/platform/system/notification/jap/entity/NotificationEntity.xlsx new file mode 100644 index 00000000..1e506bcb Binary files /dev/null and b/io.sc.platform.system/src/main/resources/io/sc/platform/system/notification/jap/entity/NotificationEntity.xlsx differ diff --git a/io.sc.platform.system/src/main/resources/io/sc/platform/system/org/jpa/entity/OrgEntity.xlsx b/io.sc.platform.system/src/main/resources/io/sc/platform/system/org/jpa/entity/OrgEntity.xlsx new file mode 100644 index 00000000..1a257a39 Binary files /dev/null and b/io.sc.platform.system/src/main/resources/io/sc/platform/system/org/jpa/entity/OrgEntity.xlsx differ diff --git a/io.sc.platform.system/src/main/resources/io/sc/platform/system/parameter/jpa/entity/ParameterEntity.xlsx b/io.sc.platform.system/src/main/resources/io/sc/platform/system/parameter/jpa/entity/ParameterEntity.xlsx new file mode 100644 index 00000000..d0b6556f Binary files /dev/null and b/io.sc.platform.system/src/main/resources/io/sc/platform/system/parameter/jpa/entity/ParameterEntity.xlsx differ diff --git a/io.sc.platform.system/src/main/resources/io/sc/platform/system/role/jpa/entity/RoleEntity.xlsx b/io.sc.platform.system/src/main/resources/io/sc/platform/system/role/jpa/entity/RoleEntity.xlsx new file mode 100644 index 00000000..b5b1f8dd Binary files /dev/null and b/io.sc.platform.system/src/main/resources/io/sc/platform/system/role/jpa/entity/RoleEntity.xlsx differ diff --git a/io.sc.platform.system/src/main/resources/io/sc/platform/system/user/jpa/entity/UserEntity.xlsx b/io.sc.platform.system/src/main/resources/io/sc/platform/system/user/jpa/entity/UserEntity.xlsx new file mode 100644 index 00000000..967a8972 Binary files /dev/null and b/io.sc.platform.system/src/main/resources/io/sc/platform/system/user/jpa/entity/UserEntity.xlsx differ diff --git a/io.sc.platform.util/src/main/java/io/sc/platform/util/ByteUtil.java b/io.sc.platform.util/src/main/java/io/sc/platform/util/ByteUtil.java index c4e279cc..48c2b5cb 100644 --- a/io.sc.platform.util/src/main/java/io/sc/platform/util/ByteUtil.java +++ b/io.sc.platform.util/src/main/java/io/sc/platform/util/ByteUtil.java @@ -1,5 +1,8 @@ package io.sc.platform.util; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.nio.ByteBuffer; /** @@ -99,4 +102,20 @@ public class ByteUtil { public static Long bytes2Long(byte[] bs){ return ByteBuffer.wrap(bs).getLong(); } + + /** + * 从输入流中读取字节数组 + * @param inputStream 输入流 + * @return 字节数组 + * @throws IOException 违例 + */ + public static byte[] read(InputStream inputStream) throws IOException { + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + byte[] buffer = new byte[1024]; + int length; + while ((length = inputStream.read(buffer)) != -1) { + byteArrayOutputStream.write(buffer, 0, length); + } + return byteArrayOutputStream.toByteArray(); + } } diff --git a/io.sc.standard.frontend/package.json b/io.sc.standard.frontend/package.json index f60c23ef..8712bd68 100644 --- a/io.sc.standard.frontend/package.json +++ b/io.sc.standard.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.110", + "platform-core": "8.2.115", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.website/package.json b/io.sc.website/package.json index dae48b74..010cf05b 100644 --- a/io.sc.website/package.json +++ b/io.sc.website/package.json @@ -28,6 +28,6 @@ }, "dependencies": { "vue": "3.5.13", - "platform-core": "8.2.110" + "platform-core": "8.2.115" } } \ No newline at end of file diff --git a/wra.report.frontend/package.json b/wra.report.frontend/package.json index cfcfb398..e5d7328d 100644 --- a/wra.report.frontend/package.json +++ b/wra.report.frontend/package.json @@ -111,7 +111,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.6", "pinia": "2.3.0", - "platform-core": "8.2.110", + "platform-core": "8.2.115", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7",