From 9484d9722476837002b4d01d60fbd794941c8f15 Mon Sep 17 00:00:00 2001 From: root <13910913995@163.com> Date: Fri, 28 Feb 2025 17:56:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86=EF=BC=88?= =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=9D=83=E9=99=90=E9=AA=8C=E8=AF=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 22 +- core/core-backend/pom.xml | 128 +- .../io/dataease/ai/service/AiBaseService.java | 34 - .../chart/charts/impl/map/MapHandler.java | 15 - .../charts/impl/others/WordCloudHandler.java | 15 - .../io/dataease/copilot/api/CopilotAPI.java | 102 - .../dao/auto/entity/CoreCopilotConfig.java | 71 - .../dao/auto/entity/CoreCopilotMsg.java | 276 -- .../dao/auto/entity/CoreCopilotToken.java | 74 - .../auto/mapper/CoreCopilotConfigMapper.java | 18 - .../dao/auto/mapper/CoreCopilotMsgMapper.java | 18 - .../auto/mapper/CoreCopilotTokenMapper.java | 18 - .../copilot/manage/CopilotManage.java | 487 -- .../io/dataease/copilot/manage/MsgManage.java | 100 - .../dataease/copilot/manage/TokenManage.java | 36 - .../copilot/service/CopilotService.java | 40 - .../dao/ext/mapper/TaskLogExtMapper.java | 1 - .../auth/InteractiveAuthFeignService.java | 8 - .../auth/PermissionFeignService.java | 10 - .../permissions/user/UserFeignService.java | 8 - .../io/dataease/resource/ResourceService.java | 29 - .../system/manage/CorePermissionManage.java | 14 - .../{dataease => gisbi}/CoreApplication.java | 4 +- .../MybatisPlusGenerator.java | 2 +- .../chart/charts/ChartHandlerManager.java | 6 +- .../charts/impl/DefaultChartHandler.java | 73 +- .../charts/impl/ExtQuotaChartHandler.java | 10 +- .../chart/charts/impl/GroupChartHandler.java | 10 +- .../chart/charts/impl/YoyChartHandler.java | 22 +- .../chart/charts/impl/bar/BarHandler.java | 16 +- .../impl/bar/BidirectionalBarHandler.java | 2 +- .../charts/impl/bar/GroupBarHandler.java | 6 +- .../charts/impl/bar/ProgressBarHandler.java | 6 +- .../charts/impl/bar/RangeBarHandler.java | 12 +- .../charts/impl/bar/StackBarHandler.java | 6 +- .../charts/impl/bar/StackGroupBarHandler.java | 10 +- .../chart/charts/impl/line/AreaHandler.java | 6 +- .../chart/charts/impl/line/LineHandler.java | 16 +- .../charts/impl/line/StackAreaHandler.java | 18 +- .../charts/impl/map/BubbleMapHandler.java | 8 +- .../chart/charts/impl/map/FlowMapHandler.java | 10 +- .../chart/charts/impl/map/HeatMapHandler.java | 8 +- .../chart/charts/impl/map/MapHandler.java | 15 + .../charts/impl/map/SymbolicMapHandler.java | 38 +- .../charts/impl/mix/DualLineMixHandler.java | 12 +- .../charts/impl/mix/GroupMixHandler.java | 4 +- .../chart/charts/impl/mix/MixHandler.java | 18 +- .../charts/impl/mix/StackMixHandler.java | 6 +- .../charts/impl/numeric/GaugeHandler.java | 12 +- .../charts/impl/numeric/IndicatorHandler.java | 12 +- .../charts/impl/numeric/LiquidHandler.java | 10 +- .../impl/numeric/NumericalChartHandler.java | 32 +- .../charts/impl/others/FunnelHandler.java | 4 +- .../charts/impl/others/RadarHandler.java | 12 +- .../charts/impl/others/RichTextHandler.java | 4 +- .../charts/impl/others/SankeyHandler.java | 4 +- .../charts/impl/others/TreemapHandler.java | 4 +- .../charts/impl/others/WaterfallHandler.java | 4 +- .../charts/impl/others/WordCloudHandler.java | 15 + .../chart/charts/impl/pie/PieHandler.java | 10 +- .../charts/impl/scatter/QuadrantHandler.java | 8 +- .../charts/impl/scatter/ScatterHandler.java | 8 +- .../impl/table/TableHeatmapHandler.java | 28 +- .../charts/impl/table/TableInfoHandler.java | 28 +- .../charts/impl/table/TableNormalHandler.java | 14 +- .../charts/impl/table/TablePivotHandler.java | 34 +- .../chart/constant/ChartConstants.java | 4 +- .../chart/dao/auto/entity/CoreChartView.java | 4 +- .../dao/auto/mapper/CoreChartViewMapper.java | 6 +- .../chart/dao/ext/entity/ChartBasePO.java | 2 +- .../dao/ext/mapper/ExtChartViewMapper.java | 6 +- .../chart/manage/ChartDataManage.java | 86 +- .../chart/manage/ChartFilterTreeService.java | 24 +- .../chart/manage/ChartViewManege.java | 69 +- .../manage/ChartViewOldDataMergeService.java | 18 +- .../manage/ChartViewThresholdManage.java | 28 +- .../chart/server/ChartDataServer.java | 51 +- .../chart/server/ChartViewServer.java | 20 +- .../chart/utils/ChartDataBuild.java | 18 +- .../commons/UUIDUtils.java | 2 +- .../constants/DataVisualizationConstants.java | 2 +- .../commons/constants/OptConstants.java | 4 +- .../commons/constants/TaskStatus.java | 2 +- .../commons/utils/CodingUtil.java | 4 +- .../commons/utils/CoreTreeUtils.java | 8 +- .../commons/utils/CronUtils.java | 4 +- .../commons/utils/EncryptUtils.java | 4 +- .../commons/utils/ExcelWatermarkUtils.java | 49 +- .../utils/MybatisInterceptorConfig.java | 2 +- .../commons/utils/SqlparserUtils.java | 130 +- .../commons/utils/UrlTestUtils.java | 2 +- .../config/CommonConfig.java | 4 +- .../config/DeMvcConfig.java | 12 +- .../config/MybatisConfig.java | 10 +- .../dataset/constant/DatasetTableType.java | 4 +- .../dao/auto/entity/CoreDatasetGroup.java | 4 +- .../dao/auto/entity/CoreDatasetTable.java | 4 +- .../auto/entity/CoreDatasetTableField.java | 4 +- .../auto/entity/CoreDatasetTableSqlLog.java | 4 +- .../auto/mapper/CoreDatasetGroupMapper.java | 6 +- .../mapper/CoreDatasetTableFieldMapper.java | 6 +- .../auto/mapper/CoreDatasetTableMapper.java | 6 +- .../mapper/CoreDatasetTableSqlLogMapper.java | 6 +- .../dao/ext/mapper/CoreDataSetExtMapper.java | 8 +- .../dataset/dao/ext/po/DataSetNodePO.java | 2 +- .../dataset/dto/DataSetNodeBO.java | 4 +- .../dataset/manage/DatasetDataManage.java | 223 +- .../dataset/manage/DatasetGroupManage.java | 139 +- .../dataset/manage/DatasetSQLManage.java | 101 +- .../manage/DatasetTableFieldManage.java | 115 +- .../dataset/manage/DatasetTableManage.java | 18 +- .../manage/DatasetTableSqlLogManage.java | 12 +- .../dataset/manage/PermissionManage.java | 32 +- .../dataset/server/DatasetDataServer.java | 26 +- .../dataset/server/DatasetFieldServer.java | 18 +- .../server/DatasetTableSqlLogServer.java | 10 +- .../dataset/server/DatasetTreeServer.java | 31 +- .../utils/DatasetTableTypeConstants.java | 4 +- .../dataset/utils/DatasetUtils.java | 8 +- .../dataset/utils/FieldUtils.java | 5 +- .../dataset/utils/SqlUtils.java | 6 +- .../dataset/utils/TableUtils.java | 10 +- .../dao/auto/entity/CoreDatasource.java | 4 +- .../dao/auto/entity/CoreDatasourceTask.java | 4 +- .../auto/entity/CoreDatasourceTaskLog.java | 4 +- .../dao/auto/entity/CoreDeEngine.java | 4 +- .../dao/auto/entity/CoreDriver.java | 4 +- .../dao/auto/entity/CoreDriverJar.java | 4 +- .../dao/auto/entity/CoreDsFinishPage.java | 4 +- .../dao/auto/entity/QrtzSchedulerState.java | 4 +- .../dao/auto/mapper/CoreDatasourceMapper.java | 6 +- .../mapper/CoreDatasourceTaskLogMapper.java | 6 +- .../auto/mapper/CoreDatasourceTaskMapper.java | 6 +- .../dao/auto/mapper/CoreDeEngineMapper.java | 6 +- .../dao/auto/mapper/CoreDriverJarMapper.java | 6 +- .../dao/auto/mapper/CoreDriverMapper.java | 6 +- .../auto/mapper/CoreDsFinishPageMapper.java | 6 +- .../auto/mapper/QrtzSchedulerStateMapper.java | 6 +- .../ext/mapper/CoreDatasourceExtMapper.java | 6 +- .../dao/ext/mapper/DataSourceExtMapper.java | 6 +- .../ext/mapper/ExtDatasourceTaskMapper.java | 6 +- .../dao/ext/mapper/TaskLogExtMapper.java | 1 + .../datasource/dao/ext/po/Ctimestamp.java | 2 +- .../dao/ext/po/DataSourceNodePO.java | 2 +- .../datasource/dao/ext/po/DsItem.java | 2 +- .../datasource/dto/CoreDatasourceTaskDTO.java | 6 +- .../datasource/dto/DatasourceNodeBO.java | 4 +- .../datasource/dto/DatasourceNodePO.java | 2 +- .../datasource/dto/es/EsResponse.java | 2 +- .../datasource/dto/es/Request.java | 2 +- .../datasource/dto/es/RequestWithCursor.java | 2 +- .../datasource/manage/DataSourceManage.java | 39 +- .../manage/DatasourceSyncManage.java | 48 +- .../datasource/manage/EngineManage.java | 30 +- .../datasource/provider/ApiUtils.java | 16 +- .../datasource/provider/CalciteProvider.java | 34 +- .../datasource/provider/EngineProvider.java | 11 +- .../datasource/provider/EsProvider.java | 24 +- .../datasource/provider/ExcelUtils.java | 22 +- .../datasource/provider/H2EngineProvider.java | 10 +- .../provider/MysqlEngineProvider.java | 14 +- .../datasource/provider/ProviderUtil.java | 4 +- .../datasource/request/EngineRequest.java | 4 +- .../server/DatasourceDriverServer.java | 24 +- .../datasource/server/DatasourceServer.java | 96 +- .../server/DatasourceTaskServer.java | 24 +- .../datasource/server/EngineServer.java | 24 +- .../datasource/type/CK.java | 4 +- .../datasource/type/Db2.java | 4 +- .../datasource/type/Es.java | 3 +- .../datasource/type/H2.java | 4 +- .../datasource/type/Impala.java | 4 +- .../datasource/type/Mongo.java | 4 +- .../datasource/type/Mysql.java | 6 +- .../datasource/type/Oracle.java | 4 +- .../datasource/type/Pg.java | 4 +- .../datasource/type/Redshift.java | 4 +- .../datasource/type/Sqlserver.java | 4 +- .../datasource/utils/DatasourceUtils.java | 10 +- .../engine/constant/ExtFieldConstant.java | 4 +- .../engine/func/FunctionConstant.java | 4 +- .../engine/sql/SQLProvider.java | 14 +- .../engine/sql/SqlTemplate.java | 4 +- .../engine/trans/CustomWhere2Str.java | 28 +- .../engine/trans/Dimension2SQLObj.java | 28 +- .../engine/trans/ExtWhere2Str.java | 24 +- .../engine/trans/Field2SQLObj.java | 28 +- .../engine/trans/Order2SQLObj.java | 28 +- .../engine/trans/Quota2SQLObj.java | 28 +- .../engine/trans/Table2SQLObj.java | 12 +- .../engine/trans/WhereTree2Str.java | 30 +- .../engine/utils/DateUtils.java | 4 +- .../engine/utils/SQLUtils.java | 4 +- .../engine/utils/Utils.java | 24 +- .../dao/auto/entity/CoreExportTask.java | 4 +- .../dao/auto/mapper/CoreExportTaskMapper.java | 6 +- .../manage/ExportCenterLimitManage.java | 2 +- .../manage/ExportCenterManage.java | 158 +- .../server/ExportCenterServer.java | 10 +- .../exportCenter/util/ExportCenterUtils.java | 4 +- .../font/dao/auto/entity/CoreFont.java | 4 +- .../font/dao/auto/mapper/CoreFontMapper.java | 6 +- .../font/manage/FontManage.java | 16 +- .../font/server/FontServer.java | 10 +- .../home/IndexController.java | 2 +- .../home/RestIndexController.java | 8 +- .../home/manage/DeIndexManage.java | 2 +- .../interceptor/MybatisInterceptor.java | 6 +- .../job/schedule/CheckDsStatusJob.java | 8 +- .../job/schedule/CleanScheduler.java | 8 +- .../schedule/DeDataFillingTaskExecutor.java | 4 +- .../job/schedule/DeScheduleJob.java | 4 +- .../job/schedule/DeTaskExecutor.java | 4 +- .../DeXpackDataFillingScheduleJob.java | 6 +- .../job/schedule/DeXpackScheduleJob.java | 7 +- .../job/schedule/ExtractDataJob.java | 6 +- .../job/schedule/Schedular.java | 4 +- .../job/schedule/ScheduleManager.java | 8 +- .../license/manage/CoreLicManage.java | 4 +- .../license/server/LicenseServer.java | 8 +- .../listener/ChartFilterDynamicListener.java | 10 +- .../listener/ChartFilterMergeListener.java | 10 +- .../listener/DataSourceInitStartListener.java | 20 +- .../listener/EhCacheStartListener.java | 4 +- .../listener/TemplateInitListener.java | 4 +- .../listener/XpackTaskStarter.java | 8 +- .../io/{dataease => gisbi}/map/bo/AreaBO.java | 4 +- .../map/dao/auto/entity/Area.java | 4 +- .../dao/auto/entity/CoreCustomGeoArea.java | 4 +- .../dao/auto/entity/CoreCustomGeoSubArea.java | 4 +- .../map/dao/auto/mapper/AreaMapper.java | 6 +- .../auto/mapper/CoreCustomGeoAreaMapper.java | 6 +- .../mapper/CoreCustomGeoSubAreaMapper.java | 6 +- .../map/dao/ext/entity/CoreAreaCustom.java | 2 +- .../dao/ext/mapper/CoreAreaCustomMapper.java | 4 +- .../map/manage/MapManage.java | 40 +- .../map/server/CustomGeoServer.java | 12 +- .../map/server/GeoServer.java | 8 +- .../map/server/MapServer.java | 8 +- .../menu/bo/MenuTreeNode.java | 4 +- .../menu/dao/auto/entity/CoreMenu.java | 4 +- .../menu/dao/auto/mapper/CoreMenuMapper.java | 6 +- .../menu/manage/MenuManage.java | 14 +- .../menu/server/MenuServer.java | 12 +- .../msgCenter/MsgCenterServer.java | 4 +- .../dao/auto/entity/CoreOptRecent.java | 4 +- .../dao/auto/mapper/CoreOptRecentMapper.java | 6 +- .../operation/manage/CoreOptRecentManage.java | 12 +- .../resource/ResourceApi.java | 4 +- .../io/gisbi/resource/ResourceService.java | 20 + .../dao/auto/entity/CoreShareTicket.java | 4 +- .../share/dao/auto/entity/XpackShare.java | 4 +- .../auto/mapper/CoreShareTicketMapper.java | 6 +- .../dao/auto/mapper/XpackShareMapper.java | 6 +- .../dao/ext/mapper/XpackShareExtMapper.java | 8 +- .../share/dao/ext/po/XpackSharePO.java | 2 +- .../share/interceptor/DeLinkAop.java | 16 +- .../share/interceptor/LinkInterceptor.java | 12 +- .../share/manage/ShareTicketManage.java | 34 +- .../share/manage/XpackShareManage.java | 42 +- .../share/server/ShareTicketServer.java | 16 +- .../share/server/XpackShareServer.java | 21 +- .../share/util/LinkTokenUtil.java | 2 +- .../dao/auto/entity/CoreSysStartupJob.java | 4 +- .../auto/mapper/CoreSysStartupJobMapper.java | 6 +- .../auth/SubstituleAuthServer.java | 2 +- .../login/SubstituleLoginServer.java | 20 +- .../permissions/org/SubstituleOrgServer.java | 6 +- .../user/SubstituteUserServer.java | 18 +- .../system/bo/SysParameterBO.java | 2 +- .../dao/auto/entity/CoreSysSetting.java | 4 +- .../system/dao/auto/entity/CoreTypeface.java | 4 +- .../dao/auto/mapper/CoreSysSettingMapper.java | 6 +- .../dao/auto/mapper/CoreTypefaceMapper.java | 6 +- .../ext/mapper/ExtCoreSysSettingMapper.java | 6 +- .../system/manage/CoreUserManage.java | 2 +- .../system/manage/SysParameterManage.java | 24 +- .../system/server/SysParameterServer.java | 18 +- .../dao/auto/entity/DeTemplateVersion.java | 4 +- .../auto/entity/VisualizationTemplate.java | 4 +- .../entity/VisualizationTemplateCategory.java | 4 +- .../VisualizationTemplateCategoryMap.java | 4 +- .../VisualizationTemplateExtendData.java | 4 +- .../auto/mapper/DeTemplateVersionMapper.java | 6 +- ...isualizationTemplateCategoryMapMapper.java | 6 +- .../VisualizationTemplateCategoryMapper.java | 6 +- ...VisualizationTemplateExtendDataMapper.java | 6 +- .../mapper/VisualizationTemplateMapper.java | 6 +- .../ext/ExtVisualizationTemplateMapper.java | 8 +- .../template/manage/TemplateCenterManage.java | 42 +- .../manage/TemplateLocalParseManage.java | 14 +- .../service/TemplateManageService.java | 40 +- .../service/TemplateMarketService.java | 14 +- .../visualization/bo/ExcelSheetModel.java | 2 +- .../dao/auto/entity/CoreStore.java | 4 +- .../auto/entity/DataVisualizationInfo.java | 4 +- .../auto/entity/VisualizationBackground.java | 4 +- .../auto/entity/VisualizationLinkJump.java | 4 +- .../entity/VisualizationLinkJumpInfo.java | 4 +- .../VisualizationLinkJumpTargetViewInfo.java | 4 +- .../dao/auto/entity/VisualizationLinkage.java | 4 +- .../entity/VisualizationLinkageField.java | 4 +- .../auto/entity/VisualizationOuterParams.java | 4 +- .../entity/VisualizationOuterParamsInfo.java | 4 +- ...isualizationOuterParamsTargetViewInfo.java | 4 +- .../dao/auto/entity/VisualizationSubject.java | 4 +- .../auto/entity/VisualizationWatermark.java | 4 +- .../dao/auto/mapper/CoreStoreMapper.java | 6 +- .../mapper/DataVisualizationInfoMapper.java | 6 +- .../mapper/VisualizationBackgroundMapper.java | 6 +- .../VisualizationLinkJumpInfoMapper.java | 6 +- .../mapper/VisualizationLinkJumpMapper.java | 6 +- ...alizationLinkJumpTargetViewInfoMapper.java | 6 +- .../VisualizationLinkageFieldMapper.java | 6 +- .../mapper/VisualizationLinkageMapper.java | 6 +- .../VisualizationOuterParamsInfoMapper.java | 6 +- .../VisualizationOuterParamsMapper.java | 6 +- ...zationOuterParamsTargetViewInfoMapper.java | 6 +- .../mapper/VisualizationSubjectMapper.java | 6 +- .../mapper/VisualizationWatermarkMapper.java | 6 +- .../dao/ext/mapper/CoreStoreExtMapper.java | 4 +- .../ext/mapper/CoreVisualiationExtMapper.java | 4 +- .../mapper/ExtDataVisualizationMapper.java | 19 +- .../ExtVisualizationLinkJumpMapper.java | 14 +- .../mapper/ExtVisualizationLinkageMapper.java | 12 +- .../ExtVisualizationOuterParamsMapper.java | 10 +- .../visualization/dao/ext/po/StorePO.java | 2 +- .../dao/ext/po/VisualizationNodePO.java | 2 +- .../dao/ext/po/VisualizationResourcePO.java | 2 +- .../dto/VisualizationNodeBO.java | 4 +- .../dto/WatermarkContentDTO.java | 2 +- .../visualization/manage/CoreBusiManage.java | 10 +- .../manage/CoreVisualizationExportManage.java | 40 +- .../manage/CoreVisualizationManage.java | 38 +- .../manage/VisualizationStoreManage.java | 28 +- ...VisualizationTemplateExtendDataManage.java | 16 +- .../server/DataVisualizationServer.java | 112 +- .../visualization/server/FileType.java | 2 +- .../server/StaticResourceServer.java | 16 +- .../VisualizationBackgroundService.java | 16 +- .../server/VisualizationLinkJumpService.java | 56 +- .../server/VisualizationLinkageService.java | 38 +- .../VisualizationOuterParamsService.java | 44 +- .../server/VisualizationStoreServer.java | 15 +- .../server/VisualizationSubjectService.java | 21 +- .../server/VisualizationWatermarkService.java | 17 +- .../template/FilterBuildTemplate.java | 4 +- .../utils/VisualizationExcelUtils.java | 14 +- .../utils/VisualizationUtils.java | 6 +- .../websocket/aop/WSTrigger.java | 6 +- .../websocket/config/WsConfig.java | 6 +- .../websocket/entity/DePrincipal.java | 2 +- .../factory/DeWebSocketHandlerDecorator.java | 4 +- .../websocket/factory/DeWsHandlerFactory.java | 2 +- .../handler/PrincipalHandshakeHandler.java | 4 +- .../service/impl/StandaloneWsService.java | 6 +- .../websocket/util/WsUtil.java | 6 +- .../main/resources/application-desktop.yml | 25 - .../resources/application-distributed.yml | 28 - .../main/resources/application-standalone.yml | 3 - .../src/main/resources/application.yml | 4 +- .../resources/db/desktop/V2.0__core_ddl.sql | 4250 ----------------- .../resources/db/desktop/V2.10.1__ddl.sql | 9 - .../resources/db/desktop/V2.10.2__ddl.sql | 11 - .../resources/db/desktop/V2.10.3__ddl.sql | 50 - .../resources/db/desktop/V2.10.4__ddl.sql | 21 - .../resources/db/desktop/V2.10.5__ddl.sql | 4 - .../resources/db/desktop/V2.10.6__ddl.sql | 11 - .../main/resources/db/desktop/V2.10__ddl.sql | 41 - .../main/resources/db/desktop/V2.1__ddl.sql | 96 - .../desktop/V2.2__update_table_desc_ddl.sql | 211 - .../main/resources/db/desktop/V2.3__ddl.sql | 25 - .../main/resources/db/desktop/V2.4__ddl.sql | 0 .../main/resources/db/desktop/V2.5__ddl.sql | 40 - .../main/resources/db/desktop/V2.6__ddl.sql | 7 - .../main/resources/db/desktop/V2.7__ddl.sql | 36 - .../main/resources/db/desktop/V2.8__ddl.sql | 48 - .../main/resources/db/desktop/V2.9__ddl.sql | 68 - .../src/main/resources/ehcache/ehcache.xml | 12 +- .../src/main/resources/logback-spring.xml | 2 +- .../mybatis/ExtDataVisualizationMapper.xml | 16 +- .../ExtVisualizationLinkJumpMapper.xml | 26 +- .../mybatis/ExtVisualizationLinkageMapper.xml | 16 +- .../ExtVisualizationOuterParamsMapper.xml | 28 +- .../ExtVisualizationTemplateMapper.xml | 30 +- core/core-frontend/flushbonading/index.js | 8 +- core/core-frontend/package.json | 4 +- core/core-frontend/pom.xml | 4 +- core/pom.xml | 6 +- pom.xml | 7 +- sdk/api/api-base/pom.xml | 22 +- .../io/dataease/api/dataset/dto/EnumObj.java | 14 - .../io/dataease/api/license/LicenseApi.java | 20 - .../request/TemplateMarketSearchRequest.java | 7 - ...alizationOuterParamsTargetViewInfoDTO.java | 9 - .../api/ai/AiComponentApi.java | 2 +- .../api/chart/ChartDataApi.java | 12 +- .../api/chart/ChartViewApi.java | 10 +- .../api/chart/dto/DeSortField.java | 4 +- .../api/chart/dto/PageInfo.java | 2 +- .../api/chart/dto/PermissionProxy.java | 2 +- .../api/chart/dto/ScatterChartDataDTO.java | 6 +- .../api/chart/dto/Series.java | 2 +- .../api/chart/dto/ViewDetailField.java | 2 +- .../api/chart/request/ChartExcelRequest.java | 4 +- .../chart/request/ChartExcelRequestInner.java | 4 +- .../chart/request/ThresholdCheckRequest.java | 2 +- .../api/chart/vo/ChartBaseVO.java | 4 +- .../api/chart/vo/ThresholdCheckVO.java | 2 +- .../api/chart/vo/ViewSelectorVO.java | 2 +- .../api/commons/BaseRspModel.java | 2 +- .../api/communicate/api/CommunicateApi.java | 4 +- .../api/communicate/dto/MessageDTO.java | 4 +- .../api/communicate/dto/MessageFile.java | 2 +- .../api/copilot/CopilotApi.java | 4 +- .../api/copilot/dto/AxisDTO.java | 2 +- .../api/copilot/dto/AxisFieldDTO.java | 2 +- .../api/copilot/dto/ChartDTO.java | 2 +- .../api/copilot/dto/DEReceiveDTO.java | 2 +- .../api/copilot/dto/DESendDTO.java | 2 +- .../api/copilot/dto/HistoryDTO.java | 2 +- .../api/copilot/dto/MsgDTO.java | 2 +- .../api/copilot/dto/ReceiveDTO.java | 2 +- .../api/copilot/dto/SendDTO.java | 2 +- .../api/copilot/dto/TokenDTO.java | 2 +- .../api/dataset/DatasetDataApi.java | 10 +- .../api/dataset/DatasetTableApi.java | 8 +- .../api/dataset/DatasetTableSqlLogApi.java | 4 +- .../api/dataset/DatasetTreeApi.java | 24 +- .../api/dataset/dto/BaseTreeNodeDTO.java | 2 +- .../api/dataset/dto/DataSetExportRequest.java | 2 +- .../api/dataset/dto/DatasetNodeDTO.java | 2 +- .../api/dataset/dto/DeSortDTO.java | 2 +- .../io/gisbi/api/dataset/dto/EnumObj.java | 14 + .../api/dataset/dto/EnumValueRequest.java | 4 +- .../dataset/dto/MultFieldValuesRequest.java | 2 +- .../api/dataset/dto/PreviewSqlDTO.java | 2 +- .../api/dataset/dto/Sorted.java | 2 +- .../api/dataset/dto/SqlLogDTO.java | 2 +- .../api/dataset/engine/SQLFunctionDTO.java | 2 +- .../api/dataset/engine/SQLFunctionsEnum.java | 2 +- .../dataset/union/DatasetGroupInfoDTO.java | 8 +- .../dataset/union/DatasetTableInfoDTO.java | 2 +- .../api/dataset/union/UnionDTO.java | 6 +- .../api/dataset/union/UnionItemDTO.java | 4 +- .../api/dataset/union/UnionParamDTO.java | 6 +- .../api/dataset/vo/CoreDatasetGroupVO.java | 4 +- .../dataset/vo/CoreDatasetTableFieldVO.java | 2 +- .../api/dataset/vo/DataSetBarVO.java | 4 +- .../api/dataset/vo/DatasetTreeNodeVO.java | 6 +- .../api/dingtalk/api/DingtalkApi.java | 10 +- .../dingtalk/dto/DingtalkEnableEditor.java | 2 +- .../dingtalk/dto/DingtalkSettingCreator.java | 2 +- .../dingtalk/dto/DingtalkTokenRequest.java | 2 +- .../api/dingtalk/vo/DingtalkInfoVO.java | 2 +- .../api/ds/DatasourceApi.java | 26 +- .../api/ds/DatasourceDriverApi.java | 8 +- .../{dataease => gisbi}/api/ds/EngineApi.java | 8 +- .../api/ds/vo/BusiCreateFolderRequest.java | 4 +- .../api/ds/vo/BusiDsRequest.java | 4 +- .../api/ds/vo/BusiRenameRequest.java | 2 +- .../api/ds/vo/CoreDatasourceTaskLogDTO.java | 2 +- .../api/ds/vo/DriveDTO.java | 2 +- .../api/ds/vo/DriveJarDTO.java | 2 +- .../api/ds/vo/DsSimpleVO.java | 2 +- .../api/ds/vo/ExcelFileData.java | 2 +- .../api/ds/vo/ExcelSheetData.java | 4 +- .../api/ds/vo/TreeNodeVO.java | 2 +- .../api/email/EmailApi.java | 4 +- .../api/export/BaseExportApi.java | 2 +- .../api/exportCenter/ExportCenterApi.java | 8 +- .../api/font/api/FontApi.java | 7 +- .../api/font/dto/FontDto.java | 2 +- .../{dataease => gisbi}/api/free/FreeApi.java | 8 +- .../api/free/dto/FreeBatchDelRequest.java | 2 +- .../api/free/dto/FreeBatchSyncRequest.java | 2 +- .../api/free/dto/FreeQueryRequest.java | 2 +- .../api/free/dto/FreeRelationCategory.java | 2 +- .../api/free/dto/FreeRelationLink.java | 2 +- .../api/free/dto/FreeRelationNode.java | 2 +- .../api/free/dto/FreeRelationRequest.java | 2 +- .../api/free/dto/FreeSyncRequest.java | 2 +- .../api/free/vo/FreeRelationVO.java | 8 +- .../api/free/vo/FreeVO.java | 4 +- .../api/lark/api/LarkApi.java | 12 +- .../api/lark/api/LarksuiteApi.java | 12 +- .../api/lark/dto/LarkEnableEditor.java | 2 +- .../api/lark/dto/LarkGroupItem.java | 2 +- .../api/lark/dto/LarkSettingCreator.java | 2 +- .../api/lark/dto/LarkTokenRequest.java | 2 +- .../api/lark/vo/LarkGroupVO.java | 4 +- .../api/lark/vo/LarkInfoVO.java | 2 +- .../java/io/gisbi/api/license/LicenseApi.java | 20 + .../api/license/dto/LicenseRequest.java | 2 +- .../{dataease => gisbi}/api/log/LogApi.java | 8 +- .../api/log/dto/LogGridRequest.java | 4 +- .../api/log/vo/LogGridVO.java | 2 +- .../api/log/vo/LogOpVO.java | 2 +- .../api/map/CustomGeoApi.java | 8 +- .../{dataease => gisbi}/api/map/GeoApi.java | 4 +- .../{dataease => gisbi}/api/map/MapApi.java | 6 +- .../api/map/dto/GeometryNodeCreator.java | 2 +- .../api/map/vo/AreaNode.java | 2 +- .../api/map/vo/CustomGeoArea.java | 2 +- .../api/map/vo/CustomGeoSubArea.java | 2 +- .../{dataease => gisbi}/api/menu/MenuApi.java | 4 +- .../api/menu/vo/MenuMeta.java | 2 +- .../api/menu/vo/MenuVO.java | 2 +- .../api/msgCenter/MsgCenterApi.java | 2 +- .../api/panel/PanelTreeAPi.java | 4 +- .../api/panel/vo/PanelTreeNodeVO.java | 2 +- .../api/report/ReportApi.java | 10 +- .../api/report/dto/ReportCreator.java | 4 +- .../api/report/dto/ReportEditor.java | 2 +- .../api/report/dto/ReportExportRequest.java | 2 +- .../api/report/dto/ReportGridRequest.java | 2 +- .../report/dto/ReportInstanceDelRequest.java | 2 +- .../report/dto/ReportInstanceMsgRequest.java | 2 +- .../api/report/dto/ReportInstanceRequest.java | 2 +- .../api/report/vo/ReportGridVO.java | 2 +- .../api/report/vo/ReportInfoVO.java | 2 +- .../api/report/vo/ReportInstanceVO.java | 2 +- .../api/system/SysParameterApi.java | 8 +- .../api/system/SystemInfoApi.java | 2 +- .../api/system/request/OnlineMapEditor.java | 2 +- .../api/system/vo/SettingItemVO.java | 2 +- .../api/system/vo/ShareBaseVO.java | 2 +- .../api/template/TemplateManageApi.java | 10 +- .../api/template/TemplateMarketApi.java | 8 +- .../api/template/dto/TemplateManageDTO.java | 4 +- .../template/dto/TemplateManageFileDTO.java | 6 +- .../api/template/dto/TemplateMarketDTO.java | 8 +- .../dto/TemplateMarketPreviewInfoDTO.java | 4 +- .../VisualizationTemplateExtendDataDTO.java | 6 +- .../request/TemplateManageBatchRequest.java | 3 +- .../request/TemplateManageRequest.java | 4 +- .../request/TemplateMarketSearchRequest.java | 7 + .../template/response/MarketBaseResponse.java | 6 +- .../response/MarketCategoryBaseResponse.java | 4 +- .../response/MarketLatestRelease.java | 2 +- .../response/MarketMetaDataBaseResponse.java | 4 +- .../response/MarketPreviewBaseResponse.java | 6 +- .../response/MarketTemplateBaseResponse.java | 5 +- .../response/MarketTemplateInnerResult.java | 4 +- .../MarketTemplateV2BaseResponse.java | 2 +- .../response/MarketTemplateV2ItemResult.java | 6 +- .../vo/MarketApplicationMetaDataVO.java | 2 +- .../vo/MarketApplicationSpecLinkVO.java | 2 +- ...MarketApplicationSpecScreenshotBaseVO.java | 2 +- .../template/vo/MarketApplicationSpecVO.java | 2 +- .../api/template/vo/MarketApplicationVO.java | 2 +- .../api/template/vo/MarketCategoryVO.java | 2 +- .../template/vo/MarketLatestReleaseVO.java | 2 +- .../api/template/vo/MarketMetaDataVO.java | 4 +- .../api/template/vo/MarketMetasVO.java | 2 +- .../api/template/vo/MarketReleaseAssetVO.java | 2 +- .../template/vo/MarketReleaseMetaDataVO.java | 2 +- .../api/template/vo/MarketReleaseVO.java | 2 +- .../api/template/vo/TemplateCategoryVO.java | 2 +- .../vo/VisualizationTemplateCategoryVO.java | 2 +- .../vo/VisualizationTemplateExtendDataVO.java | 2 +- .../template/vo/VisualizationTemplateVO.java | 2 +- .../api/threshold/ThresholdApi.java | 8 +- .../api/threshold/dto/BaseReciDTO.java | 2 +- .../dto/ThresholdBatchReciRequest.java | 2 +- .../api/threshold/dto/ThresholdCreator.java | 2 +- .../threshold/dto/ThresholdGridRequest.java | 2 +- .../dto/ThresholdInstanceRequest.java | 4 +- .../dto/ThresholdPreviewRequest.java | 2 +- .../threshold/dto/ThresholdSwitchRequest.java | 2 +- .../api/threshold/vo/ThresholdGridVO.java | 2 +- .../api/threshold/vo/ThresholdInstanceVO.java | 2 +- .../visualization/DataVisualizationApi.java | 26 +- .../api/visualization/StaticResourceApi.java | 4 +- .../VisualizationBackgroundApi.java | 7 +- .../VisualizationLinkJumpApi.java | 12 +- .../VisualizationLinkageApi.java | 6 +- .../VisualizationOuterParamsApi.java | 8 +- .../visualization/VisualizationStoreApi.java | 8 +- .../VisualizationSubjectApi.java | 6 +- .../VisualizationWatermarkApi.java | 10 +- .../api/visualization/dto/LinkageInfoDTO.java | 2 +- .../dto/VisualizationComponentDTO.java | 6 +- .../dto/VisualizationLinkJumpDTO.java | 4 +- .../dto/VisualizationLinkJumpInfoDTO.java | 6 +- .../dto/VisualizationLinkageDTO.java | 8 +- .../dto/VisualizationOuterParamsDTO.java | 4 +- .../dto/VisualizationOuterParamsInfoDTO.java | 10 +- ...alizationOuterParamsTargetViewInfoDTO.java | 9 + .../dto/VisualizationViewTableDTO.java | 6 +- .../request/DataVisualizationBaseRequest.java | 5 +- .../request/StaticResourceRequest.java | 2 +- .../VisualizationAppExportRequest.java | 2 +- .../VisualizationBackgroundRequest.java | 4 +- .../VisualizationLinkJumpBaseRequest.java | 2 +- .../request/VisualizationLinkageRequest.java | 8 +- .../request/VisualizationStoreRequest.java | 2 +- .../request/VisualizationSubjectRequest.java | 4 +- .../VisualizationWatermarkRequest.java | 4 +- .../VisualizationWorkbranchQueryRequest.java | 2 +- .../VisualizationLinkJumpBaseResponse.java | 4 +- .../VisualizationOuterParamsBaseResponse.java | 4 +- .../visualization/vo/AppCoreChartViewVO.java | 2 +- .../vo/AppCoreDatasetGroupVO.java | 2 +- .../vo/AppCoreDatasetTableFieldVO.java | 2 +- .../vo/AppCoreDatasetTableVO.java | 2 +- .../vo/AppCoreDatasourceTaskVO.java | 2 +- .../visualization/vo/AppCoreDatasourceVO.java | 2 +- .../vo/DataVisualizationBaseVO.java | 4 +- .../visualization/vo/DataVisualizationVO.java | 8 +- .../vo/VisualizationBackgroundVO.java | 2 +- .../vo/VisualizationBaseInfoVO.java | 2 +- .../vo/VisualizationExport2AppVO.java | 3 +- .../vo/VisualizationLinkJumpInfoVO.java | 2 +- ...VisualizationLinkJumpTargetViewInfoVO.java | 2 +- .../vo/VisualizationLinkJumpVO.java | 2 +- .../vo/VisualizationLinkageFieldVO.java | 2 +- .../vo/VisualizationLinkageVO.java | 2 +- .../vo/VisualizationOutParamsJumpVO.java | 2 +- .../vo/VisualizationOuterParamsDsInfoVO.java | 2 +- .../VisualizationOuterParamsFilterInfoVO.java | 5 +- .../vo/VisualizationOuterParamsInfoVO.java | 2 +- ...ualizationOuterParamsTargetViewInfoVO.java | 2 +- .../vo/VisualizationOuterParamsVO.java | 2 +- .../vo/VisualizationReportFilterVO.java | 2 +- .../vo/VisualizationResourceVO.java | 2 +- .../vo/VisualizationStoreVO.java | 2 +- .../vo/VisualizationSubjectVO.java | 2 +- .../vo/VisualizationViewTableVO.java | 4 +- .../vo/VisualizationWatermarkVO.java | 2 +- .../api/webhook/WebhookApi.java | 10 +- .../webhook/request/WebhookSwitchRequest.java | 2 +- .../api/webhook/vo/WebhookGridVO.java | 2 +- .../api/webhook/vo/WebhookOption.java | 2 +- .../api/wecom/api/WecomApi.java | 10 +- .../api/wecom/dto/WecomCreator.java | 2 +- .../api/wecom/dto/WecomEnableEditor.java | 2 +- .../api/wecom/dto/WecomTokenRequest.java | 2 +- .../api/wecom/vo/WecomInfoVO.java | 2 +- .../appearance/api/XpackAppearanceApi.java | 4 +- .../xpack/appearance/vo/AppearanceItemVO.java | 2 +- .../xpack/component/XpackComponentApi.java | 10 +- .../api/xpack/component/vo/XpackMenuVO.java | 2 +- .../api/xpack/dataFilling/DataFillingApi.java | 22 +- .../xpack/dataFilling/dto/ColumnOption.java | 2 +- .../dto/DataFillFormTableDataRequest.java | 2 +- .../dto/DataFillFormTableDataResponse.java | 2 +- .../dto/DataFillFormTableDataSearchParam.java | 2 +- .../xpack/dataFilling/dto/DataFillingDTO.java | 2 +- .../dto/DatasourceOptionsRequest.java | 2 +- .../xpack/dataFilling/dto/DfCommitLog.java | 2 +- .../dataFilling/dto/DfCommitLogRequest.java | 2 +- .../xpack/dataFilling/dto/DfExcelData.java | 4 +- .../dataFilling/dto/DfSubTaskInfoRequest.java | 2 +- .../xpack/dataFilling/dto/DfSubTaskVo.java | 2 +- .../dataFilling/dto/DfTaskInfoRequest.java | 2 +- .../xpack/dataFilling/dto/DfUserTaskData.java | 4 +- .../dataFilling/dto/DfUserTaskRequest.java | 2 +- .../xpack/dataFilling/dto/DfUserTaskVo.java | 5 +- .../xpack/dataFilling/dto/ExtraDetails.java | 2 +- .../dataFilling/dto/ExtraDetailsRequest.java | 4 +- .../xpack/dataFilling/dto/FilterSetting.java | 2 +- .../xpack/dataFilling/dto/RowDataDatum.java | 2 +- .../xpack/dataFilling/dto/TaskInfoGridVO.java | 5 +- .../api/xpack/dataFilling/dto/TaskInfoVO.java | 4 +- .../api/xpack/plugin/PluginApi.java | 6 +- .../api/xpack/plugin/dto/PluginEditor.java | 2 +- .../api/xpack/plugin/vo/PluginVO.java | 2 +- .../settings/XpackAuthenticationApi.java | 6 +- .../api/xpack/settings/XpackOauth2Api.java | 8 +- .../request/XpackAuthenticationEditor.java | 2 +- .../request/XpackOauth2TokenRequest.java | 2 +- .../vo/XpackAuthenticationStatusVO.java | 2 +- .../settings/vo/XpackAuthenticationVO.java | 2 +- .../api/xpack/settings/vo/XpackCasVO.java | 2 +- .../api/xpack/settings/vo/XpackLdapVO.java | 2 +- .../api/xpack/settings/vo/XpackOauth2VO.java | 2 +- .../xpack/settings/vo/XpackOauthAuthVO.java | 2 +- .../xpack/settings/vo/XpackOauthTokenVO.java | 2 +- .../api/xpack/settings/vo/XpackOidcVO.java | 2 +- .../api/xpack/share/ShareTicketApi.java | 10 +- .../api/xpack/share/XpackShareApi.java | 12 +- .../xpack/share/request/TicketCreator.java | 2 +- .../xpack/share/request/TicketDelRequest.java | 2 +- .../share/request/TicketSwitchRequest.java | 2 +- .../share/request/XpackShareExpRequest.java | 2 +- .../share/request/XpackShareProxyRequest.java | 2 +- .../share/request/XpackSharePwdRequest.java | 2 +- .../share/request/XpackSharePwdValidator.java | 2 +- .../share/request/XpackShareUuidEditor.java | 2 +- .../api/xpack/share/vo/TicketVO.java | 2 +- .../api/xpack/share/vo/TicketValidVO.java | 2 +- .../api/xpack/share/vo/XpackShareGridVO.java | 2 +- .../api/xpack/share/vo/XpackShareProxyVO.java | 2 +- .../api/xpack/share/vo/XpackShareVO.java | 2 +- sdk/api/api-permissions/pom.xml | 15 +- .../api/permissions/apikey/api/ApiKeyApi.java | 6 +- .../apikey/dto/ApikeyEnableEditor.java | 2 +- .../api/permissions/apikey/vo/ApiKeyVO.java | 2 +- .../api/permissions/auth/api/AuthApi.java | 8 +- .../auth/api/InteractiveAuthApi.java | 14 +- .../auth/dto/BusiBatchAuthorizeNode.java | 2 +- .../auth/dto/BusiBatchAuthorizeRequest.java | 2 +- .../permissions/auth/dto/BusiPerCheckDTO.java | 4 +- .../permissions/auth/dto/BusiPerEditor.java | 4 +- .../auth/dto/BusiPermissionRequest.java | 2 +- .../auth/dto/BusiResourceCreator.java | 2 +- .../auth/dto/BusiResourceEditor.java | 2 +- .../auth/dto/BusiResourceMover.java | 2 +- .../auth/dto/BusiTargetPerCreator.java | 2 +- .../permissions/auth/dto/MenuPerEditor.java | 4 +- .../auth/dto/MenuPermissionRequest.java | 2 +- .../auth/dto/MenuTargetPerCreator.java | 4 +- .../permissions/auth/dto/PermissionBO.java | 4 +- .../auth/dto/TargetPerCreator.java | 2 +- .../permissions/auth/vo/PermissionItem.java | 6 +- .../permissions/auth/vo/PermissionOrigin.java | 2 +- .../api/permissions/auth/vo/PermissionVO.java | 2 +- .../permissions/auth/vo/PermissionValVO.java | 2 +- .../permissions/auth/vo/ResourceNodeVO.java | 2 +- .../api/permissions/auth/vo/ResourceVO.java | 4 +- .../dataset/api/ColumnPermissionsApi.java | 8 +- .../dataset/api/RowPermissionsApi.java | 10 +- .../permissions/dataset/dto/BaseTreeNode.java | 4 +- .../dto/DataSetColumnPermissionsDTO.java | 4 +- .../dto/DataSetRowPermissionsTreeDTO.java | 10 +- .../dto/DatasetRowPermissionsTreeRequest.java | 2 +- .../api/permissions/dataset/dto/Item.java | 2 +- .../dataset/dto/LangSwitchRequest.java | 2 +- .../dataset/dto/WhiteListUsersRequest.java | 2 +- .../permissions/embedded/api/EmbeddedApi.java | 18 +- .../embedded/dto/EmbeddedCreator.java | 2 +- .../embedded/dto/EmbeddedEditor.java | 2 +- .../embedded/dto/EmbeddedOrigin.java | 2 +- .../embedded/dto/EmbeddedResetRequest.java | 2 +- .../embedded/vo/EmbeddedGridVO.java | 2 +- .../api/permissions/login/api/LoginApi.java | 12 +- .../login/dto/AccountLockStatus.java | 2 +- .../permissions/login/dto/MfaLoginDTO.java | 2 +- .../permissions/login/dto/PwdLoginDTO.java | 2 +- .../api/permissions/login/vo/MfaQrVO.java | 2 +- .../api/permissions/org/api/OrgApi.java | 24 +- .../api/permissions/org/dto/OrgCreator.java | 2 +- .../api/permissions/org/dto/OrgEditor.java | 2 +- .../api/permissions/org/dto/OrgRequest.java | 4 +- .../api/permissions/org/vo/MountedVO.java | 2 +- .../api/permissions/org/vo/OrgDetailVO.java | 2 +- .../api/permissions/org/vo/OrgPageVO.java | 2 +- .../permissions/relation/api/RelationApi.java | 4 +- .../permissions/relation/dto/RelationDTO.java | 2 +- .../relation/dto/RelationListDTO.java | 2 +- .../api/permissions/role/api/RoleApi.java | 18 +- .../role/dto/MountExternalUserRequest.java | 2 +- .../role/dto/MountUserRequest.java | 2 +- .../permissions/role/dto/RoleCopyRequest.java | 2 +- .../api/permissions/role/dto/RoleCreator.java | 2 +- .../api/permissions/role/dto/RoleEditor.java | 2 +- .../api/permissions/role/dto/RoleRequest.java | 4 +- .../role/dto/UnmountUserRequest.java | 2 +- .../api/permissions/role/dto/UserRequest.java | 4 +- .../permissions/role/vo/ExternalUserVO.java | 2 +- .../api/permissions/role/vo/RoleDetailVO.java | 4 +- .../api/permissions/role/vo/RoleVO.java | 2 +- .../setting/api/PerSettingApi.java | 6 +- .../setting/vo/PerSettingItemVO.java | 2 +- .../api/permissions/user/api/UserApi.java | 22 +- .../api/permissions/user/bo/PlatformUser.java | 2 +- .../user/dto/EnableSwitchRequest.java | 2 +- .../user/dto/LangSwitchRequest.java | 2 +- .../user/dto/ModifyPwdRequest.java | 2 +- .../permissions/user/dto/UserBindRequest.java | 2 +- .../api/permissions/user/dto/UserCreator.java | 4 +- .../api/permissions/user/dto/UserEditor.java | 2 +- .../permissions/user/dto/UserGridRequest.java | 4 +- .../permissions/user/dto/UserReciRequest.java | 2 +- .../api/permissions/user/vo/CurIpVO.java | 2 +- .../api/permissions/user/vo/CurUserVO.java | 2 +- .../api/permissions/user/vo/UserFormVO.java | 4 +- .../permissions/user/vo/UserGridRoleItem.java | 2 +- .../api/permissions/user/vo/UserGridVO.java | 2 +- .../api/permissions/user/vo/UserImportVO.java | 2 +- .../api/permissions/user/vo/UserItem.java | 2 +- .../api/permissions/user/vo/UserItemVO.java | 2 +- .../variable/api/SysVariablesApi.java | 10 +- .../variable/dto/SysVariableDto.java | 2 +- .../variable/dto/SysVariableValueDto.java | 2 +- .../variable/dto/SysVariableValueItem.java | 2 +- sdk/api/api-sync/pom.xml | 12 +- .../datasource/api/SyncDatasourceApi.java | 18 +- .../api/sync/datasource/dto/DBTableDTO.java | 2 +- .../datasource/dto/DatasourceGridRequest.java | 4 +- .../datasource/dto/GetDatasourceRequest.java | 2 +- .../datasource/dto/SyncDatasourceDTO.java | 2 +- .../sync/datasource/vo/SyncDatasourceVO.java | 2 +- .../api/sync/summary/api/SummaryApi.java | 6 +- .../api/sync/task/api/TaskApi.java | 14 +- .../api/sync/task/api/TaskLogApi.java | 12 +- .../api/sync/task/dto/Source.java | 4 +- .../api/sync/task/dto/TableField.java | 2 +- .../api/sync/task/dto/Target.java | 4 +- .../api/sync/task/dto/TaskGridRequest.java | 4 +- .../api/sync/task/dto/TaskInfoDTO.java | 2 +- .../api/sync/task/dto/TaskLogGridRequest.java | 4 +- .../api/sync/task/vo/LogResultVO.java | 2 +- .../api/sync/task/vo/TaskInfoVO.java | 6 +- .../api/sync/task/vo/TaskLogVO.java | 2 +- sdk/api/pom.xml | 14 +- sdk/common/pom.xml | 16 +- .../{dataease => gisbi}/auth/DeApiPath.java | 4 +- .../auth/DeLinkPermit.java | 2 +- .../io/{dataease => gisbi}/auth/DePermit.java | 2 +- .../auth/bo/LinkTokenUserBO.java | 2 +- .../auth/bo/TokenUserBO.java | 2 +- .../auth/config/SubstituleLoginConfig.java | 6 +- .../auth/filter/CommunityTokenFilter.java | 11 +- .../auth/filter/FilterConfig.java | 2 +- .../auth/filter/TokenFilter.java | 26 +- .../auth/interceptor/CorsConfig.java | 4 +- .../auth/vo/InvalidPwdVO.java | 2 +- .../{dataease => gisbi}/auth/vo/MfaItem.java | 2 +- .../{dataease => gisbi}/auth/vo/TokenVO.java | 2 +- .../cache/DECacheService.java | 2 +- .../cache/annotation/CacheClear.java | 2 +- .../cache/impl/DefaultCacheImpl.java | 6 +- .../cache/impl/RedisCacheImpl.java | 6 +- .../constant/AuthConstant.java | 2 +- .../constant/AuthEnum.java | 2 +- .../constant/AuthResourceEnum.java | 2 +- .../constant/BusiResourceEnum.java | 2 +- .../constant/CacheConstant.java | 2 +- .../constant/ColumnPermissionConstants.java | 2 +- .../constant/CommonConstants.java | 2 +- .../constant/DataFillingFinishTaskEnum.java | 2 +- .../constant/DataSourceType.java | 2 +- .../constant/DeTypeConstants.java | 2 +- .../{dataease => gisbi}/constant/LogOT.java | 2 +- .../{dataease => gisbi}/constant/LogST.java | 2 +- .../constant/MessageEnum.java | 2 +- .../constant/ReportLastStatusEnum.java | 2 +- .../constant/ReportTaskEnum.java | 2 +- .../constant/SQLConstants.java | 2 +- .../constant/SortConstants.java | 2 +- .../constant/StaticResourceConstants.java | 8 +- .../constant/XpackSettingConstants.java | 2 +- .../doc/SwaggerConfig.java | 4 +- .../exception/DEException.java | 4 +- .../exception/GlobalExceptionHandler.java | 10 +- .../io/{dataease => gisbi}/feign/DeFeign.java | 2 +- .../filter/HtmlResourceFilter.java | 6 +- .../i18n/DeI18nMessageConfig.java | 2 +- .../i18n/DeI18nStarter.java | 2 +- ...ReloadableResourceBundleMessageSource.java | 2 +- .../i18n/DynamicI18nUtils.java | 2 +- .../io/{dataease => gisbi}/i18n/I18n.java | 2 +- .../io/{dataease => gisbi}/i18n/Lang.java | 2 +- .../{dataease => gisbi}/i18n/Translator.java | 10 +- .../jackson/JacksonConfig.java | 2 +- .../listener/MyCacheListener.java | 2 +- .../listener/RedisCacheListener.java | 4 +- .../io/{dataease => gisbi}/log/DeLog.java | 6 +- .../model/BusiNodeRequest.java | 2 +- .../{dataease => gisbi}/model/BusiNodeVO.java | 2 +- .../io/{dataease => gisbi}/model/DeModel.java | 2 +- .../model/ExportTaskDTO.java | 2 +- .../{dataease => gisbi}/model/ITreeBase.java | 2 +- .../model/KeywordRequest.java | 2 +- .../model/LogItemModel.java | 4 +- .../{dataease => gisbi}/model/RSAModel.java | 2 +- .../model/TreeBaseModel.java | 2 +- .../{dataease => gisbi}/model/TreeModel.java | 2 +- .../model/TreeResultModel.java | 2 +- .../excel/AutoAdaptWidthStyleStrategy.java | 4 +- .../model/excel/ErrWriteHandler.java | 2 +- .../MyBatisPlusPaginationInnerConfig.java | 2 +- .../result/ResultCode.java | 2 +- .../result/ResultMessage.java | 2 +- .../result/ResultResponseBodyAdvice.java | 8 +- .../rsa/dao/entity/CoreRsa.java | 2 +- .../rsa/dao/mapper/CoreRsaMapper.java | 4 +- .../rsa/manage/RsaManage.java | 14 +- .../rsa/starter/RsaStarter.java | 6 +- .../traffic/DeTraffic.java | 2 +- .../traffic/DeTrafficAop.java | 12 +- .../traffic/dao/entity/CoreApiTraffic.java | 2 +- .../dao/mapper/CoreApiTrafficMapper.java | 4 +- .../traffic/starter/DeTrafficStarter.java | 6 +- .../{dataease => gisbi}/utils/AesUtils.java | 2 +- .../{dataease => gisbi}/utils/AuthUtils.java | 4 +- .../{dataease => gisbi}/utils/BeanUtils.java | 2 +- .../{dataease => gisbi}/utils/CacheUtils.java | 4 +- .../utils/CalendarUtils.java | 2 +- .../utils/CommonBeanFactory.java | 2 +- .../utils/CommonExcelUtils.java | 6 +- .../utils/CommonThreadPool.java | 2 +- .../utils/CommunityUtils.java | 2 +- .../utils/ConfigUtils.java | 2 +- .../{dataease => gisbi}/utils/DateUtils.java | 2 +- .../utils/DeClassUtils.java | 2 +- .../utils/DeReflectUtil.java | 2 +- .../utils/DelayQueueUtils.java | 2 +- .../{dataease => gisbi}/utils/FileUtils.java | 4 +- .../utils/HttpClientConfig.java | 2 +- .../utils/HttpClientUtil.java | 6 +- .../io/{dataease => gisbi}/utils/IDUtils.java | 2 +- .../io/{dataease => gisbi}/utils/IPUtils.java | 2 +- .../{dataease => gisbi}/utils/JsonUtil.java | 2 +- .../io/{dataease => gisbi}/utils/LogUtil.java | 2 +- .../utils/LongArray2StringSerialize.java | 2 +- .../{dataease => gisbi}/utils/Md5Utils.java | 2 +- .../{dataease => gisbi}/utils/ModelUtils.java | 4 +- .../io/{dataease => gisbi}/utils/Pager.java | 2 +- .../{dataease => gisbi}/utils/RsaUtils.java | 10 +- .../utils/ServletUtils.java | 4 +- .../{dataease => gisbi}/utils/SnowFlake.java | 2 +- .../utils/StaticResourceUtils.java | 4 +- .../utils/SystemSettingUtils.java | 4 +- .../{dataease => gisbi}/utils/TokenUtils.java | 6 +- .../{dataease => gisbi}/utils/TreeUtils.java | 6 +- .../{dataease => gisbi}/utils/UserUtils.java | 4 +- .../utils/VersionUtil.java | 4 +- .../utils/WhitelistUtils.java | 8 +- .../websocket/WsMessage.java | 2 +- .../websocket/WsService.java | 2 +- sdk/distributed/pom.xml | 70 - .../io/dataease/DeFeignConfiguration.java | 12 - .../io/dataease/dds/DynamicContextHolder.java | 34 - .../io/dataease/dds/DynamicDataSource.java | 15 - .../config/DynamicDataSourceProperties.java | 23 - .../dataease/dds/config/DynamicDsConfig.java | 95 - .../dds/constant/DataSourceConstant.java | 20 - .../dds/interceptor/DSInterceptor.java | 31 - .../provider/TenantDatasourceProvider.java | 141 - .../io/dataease/flyway/TenantFlywayUtil.java | 42 - .../java/io/dataease/rpc/DeFeignRegister.java | 410 -- .../distributed/manage/V1.1__manage_ddl.sql | 31 - sdk/extensions/extensions-datafilling/pom.xml | 21 +- .../datafilling/api/DfPluginManageApi.java | 9 - .../factory/ExtDDLProviderFactory.java | 60 - .../datafilling/plugin/DataFillingPlugin.java | 37 - .../datafilling/api/DfPluginManageApi.java | 9 + .../datafilling/dto/ExtFormSettings.java | 2 +- .../datafilling/dto/ExtIndexField.java | 2 +- .../datafilling/dto/ExtTableField.java | 2 +- .../datafilling/dto/ExtraColumnItem.java | 2 +- .../factory/ExtDDLProviderFactory.java | 58 + .../datafilling/plugin/DataFillingPlugin.java | 34 + .../datafilling/provider/ExtDDLProvider.java | 10 +- .../datafilling/utils/BeanUtils.java | 7 +- .../datafilling/vo/XpackPluginsDfVO.java | 2 +- sdk/extensions/extensions-datasource/pom.xml | 10 +- .../plugin/DataEaseDatasourcePlugin.java | 111 - .../datasource/api/PluginManageApi.java | 4 +- .../constant/SqlPlaceholderConstants.java | 2 +- .../datasource/dto/ApiDefinition.java | 2 +- .../datasource/dto/ApiDefinitionRequest.java | 2 +- .../extensions/datasource/dto/CalParam.java | 2 +- .../datasource/dto/ConnectionObj.java | 6 +- .../datasource/dto/DatasetTableDTO.java | 2 +- .../datasource/dto/DatasetTableFieldDTO.java | 2 +- .../datasource/dto/DatasourceDTO.java | 2 +- .../datasource/dto/DatasourceRequest.java | 2 +- .../datasource/dto/DatasourceSchemaDTO.java | 2 +- .../extensions/datasource/dto/DsTypeDTO.java | 2 +- .../datasource/dto/FieldGroupDTO.java | 2 +- .../datasource/dto/SimpleDatasourceDTO.java | 2 +- .../extensions/datasource/dto/TableField.java | 2 +- .../datasource/dto/TableFieldWithValue.java | 2 +- .../extensions/datasource/dto/TaskDTO.java | 2 +- .../datasource/factory/ProviderFactory.java | 47 +- .../extensions/datasource/model/SQLMeta.java | 2 +- .../extensions/datasource/model/SQLObj.java | 2 +- .../plugin/DataEaseDatasourcePlugin.java | 108 + .../datasource/provider/DriverShim.java | 2 +- .../provider/ExtendedJdbcClassLoader.java | 2 +- .../datasource/provider/Provider.java | 12 +- .../datasource/utils/SpringContextUtil.java | 2 +- .../datasource/vo/Configuration.java | 2 +- .../vo/DatasourceConfiguration.java | 2 +- .../vo/XpackPluginsDatasourceVO.java | 2 +- sdk/extensions/extensions-view/pom.xml | 8 +- .../extensions/view/dto/FieldSource.java | 5 - .../view/factory/PluginsChartFactory.java | 44 - .../view/plugin/DataEaseChartPlugin.java | 30 - .../view/dto/AxisChartDataAntVDTO.java | 2 +- .../extensions/view/dto/AxisChartDataDTO.java | 2 +- .../extensions/view/dto/AxisFormatResult.java | 2 +- .../extensions/view/dto/ChartAxis.java | 2 +- .../view/dto/ChartCalcDataResult.java | 2 +- .../view/dto/ChartCustomFilterItemDTO.java | 2 +- .../view/dto/ChartDimensionDTO.java | 2 +- .../view/dto/ChartDrillRequest.java | 2 +- .../view/dto/ChartExtFilterDTO.java | 5 +- .../extensions/view/dto/ChartExtRequest.java | 2 +- .../view/dto/ChartFieldCompareCustomDTO.java | 2 +- .../view/dto/ChartFieldCompareDTO.java | 2 +- .../view/dto/ChartFieldCustomFilterDTO.java | 4 +- .../extensions/view/dto/ChartQuotaDTO.java | 2 +- .../view/dto/ChartSeniorAssistCfgDTO.java | 2 +- .../view/dto/ChartSeniorAssistDTO.java | 2 +- .../view/dto/ChartSeniorFunctionCfgDTO.java | 2 +- .../view/dto/ChartSeniorThresholdCfgDTO.java | 2 +- .../view/dto/ChartSeniorThresholdDTO.java | 2 +- .../extensions/view/dto/ChartViewBaseDTO.java | 6 +- .../extensions/view/dto/ChartViewDTO.java | 2 +- .../view/dto/ChartViewFieldBaseDTO.java | 4 +- .../view/dto/ChartViewFieldDTO.java | 2 +- .../view/dto/ChartViewFieldFilterDTO.java | 2 +- .../view/dto/ColumnPermissionItem.java | 2 +- .../view/dto/ColumnPermissions.java | 2 +- .../view/dto/CustomFilterResult.java | 2 +- .../dto/DatasetRowPermissionsTreeItem.java | 4 +- .../dto/DatasetRowPermissionsTreeObj.java | 2 +- .../extensions/view/dto/DynamicValueDTO.java | 2 +- .../extensions/view/dto/FieldSource.java | 5 + .../extensions/view/dto/FormatterCfgDTO.java | 2 +- .../extensions/view/dto/SortAxis.java | 2 +- .../view/dto/SqlVariableDetails.java | 2 +- .../extensions/view/dto/TableCalcTotal.java | 2 +- .../view/dto/TableCalcTotalCfg.java | 2 +- .../view/dto/TableThresholdDTO.java | 2 +- .../extensions/view/dto/TableTotal.java | 2 +- .../extensions/view/dto/TableTotalCfg.java | 2 +- .../view/dto/ThresholdDynamicFieldDTO.java | 2 +- .../view/factory/PluginsChartFactory.java | 41 + .../view/filter/DynamicTimeSetting.java | 2 +- .../view/filter/FilterTreeItem.java | 4 +- .../extensions/view/filter/FilterTreeObj.java | 2 +- .../view/plugin/AbstractChartPlugin.java | 8 +- .../view/plugin/DataEaseChartPlugin.java | 27 + .../extensions/view/util/ChartDataUtil.java | 6 +- .../extensions/view/util/FieldUtil.java | 6 +- .../extensions/view/util/Utils.java | 4 +- .../view/vo/XpackPluginsViewVO.java | 2 +- sdk/extensions/pom.xml | 10 +- sdk/pom.xml | 7 +- 1035 files changed, 3902 insertions(+), 11363 deletions(-) delete mode 100644 core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java delete mode 100644 core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/MapHandler.java delete mode 100644 core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/WordCloudHandler.java delete mode 100644 core/core-backend/src/main/java/io/dataease/copilot/api/CopilotAPI.java delete mode 100644 core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotConfig.java delete mode 100644 core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotMsg.java delete mode 100644 core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotToken.java delete mode 100644 core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotConfigMapper.java delete mode 100644 core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotMsgMapper.java delete mode 100644 core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotTokenMapper.java delete mode 100644 core/core-backend/src/main/java/io/dataease/copilot/manage/CopilotManage.java delete mode 100644 core/core-backend/src/main/java/io/dataease/copilot/manage/MsgManage.java delete mode 100644 core/core-backend/src/main/java/io/dataease/copilot/manage/TokenManage.java delete mode 100644 core/core-backend/src/main/java/io/dataease/copilot/service/CopilotService.java delete mode 100644 core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/TaskLogExtMapper.java delete mode 100644 core/core-backend/src/main/java/io/dataease/defeign/permissions/auth/InteractiveAuthFeignService.java delete mode 100644 core/core-backend/src/main/java/io/dataease/defeign/permissions/auth/PermissionFeignService.java delete mode 100644 core/core-backend/src/main/java/io/dataease/defeign/permissions/user/UserFeignService.java delete mode 100644 core/core-backend/src/main/java/io/dataease/resource/ResourceService.java delete mode 100644 core/core-backend/src/main/java/io/dataease/system/manage/CorePermissionManage.java rename core/core-backend/src/main/java/io/{dataease => gisbi}/CoreApplication.java (90%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/MybatisPlusGenerator.java (99%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/ChartHandlerManager.java (84%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/DefaultChartHandler.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/ExtQuotaChartHandler.java (67%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/GroupChartHandler.java (61%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/YoyChartHandler.java (94%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/bar/BarHandler.java (86%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/bar/BidirectionalBarHandler.java (83%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/bar/GroupBarHandler.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/bar/ProgressBarHandler.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/bar/RangeBarHandler.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/bar/StackBarHandler.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/bar/StackGroupBarHandler.java (93%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/line/AreaHandler.java (87%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/line/LineHandler.java (88%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/line/StackAreaHandler.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/map/BubbleMapHandler.java (60%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/map/FlowMapHandler.java (73%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/map/HeatMapHandler.java (81%) create mode 100644 core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/MapHandler.java rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/map/SymbolicMapHandler.java (88%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/mix/DualLineMixHandler.java (76%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/mix/GroupMixHandler.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/mix/MixHandler.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/mix/StackMixHandler.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/numeric/GaugeHandler.java (81%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/numeric/IndicatorHandler.java (90%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/numeric/LiquidHandler.java (80%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/numeric/NumericalChartHandler.java (82%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/others/FunnelHandler.java (64%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/others/RadarHandler.java (66%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/others/RichTextHandler.java (70%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/others/SankeyHandler.java (64%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/others/TreemapHandler.java (64%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/others/WaterfallHandler.java (65%) create mode 100644 core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/WordCloudHandler.java rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/pie/PieHandler.java (78%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/scatter/QuadrantHandler.java (88%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/scatter/ScatterHandler.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/table/TableHeatmapHandler.java (82%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/table/TableInfoHandler.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/table/TableNormalHandler.java (81%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/charts/impl/table/TablePivotHandler.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/constant/ChartConstants.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/dao/auto/entity/CoreChartView.java (99%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/dao/auto/mapper/CoreChartViewMapper.java (68%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/dao/ext/entity/ChartBasePO.java (94%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/dao/ext/mapper/ExtChartViewMapper.java (90%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/manage/ChartDataManage.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/manage/ChartFilterTreeService.java (85%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/manage/ChartViewManege.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/manage/ChartViewOldDataMergeService.java (94%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/manage/ChartViewThresholdManage.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/server/ChartDataServer.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/server/ChartViewServer.java (81%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/chart/utils/ChartDataBuild.java (99%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/commons/UUIDUtils.java (83%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/commons/constants/DataVisualizationConstants.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/commons/constants/OptConstants.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/commons/constants/TaskStatus.java (87%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/commons/utils/CodingUtil.java (99%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/commons/utils/CoreTreeUtils.java (88%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/commons/utils/CronUtils.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/commons/utils/EncryptUtils.java (94%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/commons/utils/ExcelWatermarkUtils.java (74%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/commons/utils/MybatisInterceptorConfig.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/commons/utils/SqlparserUtils.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/commons/utils/UrlTestUtils.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/config/CommonConfig.java (90%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/config/DeMvcConfig.java (85%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/config/MybatisConfig.java (77%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/constant/DatasetTableType.java (73%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/dao/auto/entity/CoreDatasetGroup.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/dao/auto/entity/CoreDatasetTable.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/dao/auto/entity/CoreDatasetTableField.java (99%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/dao/auto/entity/CoreDatasetTableSqlLog.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/dao/auto/mapper/CoreDatasetGroupMapper.java (67%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/dao/auto/mapper/CoreDatasetTableFieldMapper.java (68%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/dao/auto/mapper/CoreDatasetTableMapper.java (67%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/dao/auto/mapper/CoreDatasetTableSqlLogMapper.java (66%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/dao/ext/mapper/CoreDataSetExtMapper.java (78%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/dao/ext/po/DataSetNodePO.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/dto/DataSetNodeBO.java (86%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/manage/DatasetDataManage.java (88%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/manage/DatasetGroupManage.java (88%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/manage/DatasetSQLManage.java (89%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/manage/DatasetTableFieldManage.java (79%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/manage/DatasetTableManage.java (86%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/manage/DatasetTableSqlLogManage.java (87%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/manage/PermissionManage.java (94%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/server/DatasetDataServer.java (81%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/server/DatasetFieldServer.java (85%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/server/DatasetTableSqlLogServer.java (79%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/server/DatasetTreeServer.java (78%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/utils/DatasetTableTypeConstants.java (74%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/utils/DatasetUtils.java (93%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/utils/FieldUtils.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/utils/SqlUtils.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/dataset/utils/TableUtils.java (87%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/entity/CoreDatasource.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/entity/CoreDatasourceTask.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/entity/CoreDatasourceTaskLog.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/entity/CoreDeEngine.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/entity/CoreDriver.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/entity/CoreDriverJar.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/entity/CoreDsFinishPage.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/entity/QrtzSchedulerState.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/mapper/CoreDatasourceMapper.java (67%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/mapper/CoreDatasourceTaskLogMapper.java (66%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/mapper/CoreDatasourceTaskMapper.java (65%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/mapper/CoreDeEngineMapper.java (65%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/mapper/CoreDriverJarMapper.java (67%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/mapper/CoreDriverMapper.java (66%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/mapper/CoreDsFinishPageMapper.java (65%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/auto/mapper/QrtzSchedulerStateMapper.java (65%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/ext/mapper/CoreDatasourceExtMapper.java (80%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/ext/mapper/DataSourceExtMapper.java (75%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/ext/mapper/ExtDatasourceTaskMapper.java (88%) create mode 100644 core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/mapper/TaskLogExtMapper.java rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/ext/po/Ctimestamp.java (67%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/ext/po/DataSourceNodePO.java (90%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dao/ext/po/DsItem.java (85%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dto/CoreDatasourceTaskDTO.java (73%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dto/DatasourceNodeBO.java (90%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dto/DatasourceNodePO.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dto/es/EsResponse.java (93%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dto/es/Request.java (81%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/dto/es/RequestWithCursor.java (73%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/manage/DataSourceManage.java (89%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/manage/DatasourceSyncManage.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/manage/EngineManage.java (90%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/provider/ApiUtils.java (99%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/provider/CalciteProvider.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/provider/EngineProvider.java (69%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/provider/EsProvider.java (94%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/provider/ExcelUtils.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/provider/H2EngineProvider.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/provider/MysqlEngineProvider.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/provider/ProviderUtil.java (82%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/request/EngineRequest.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/server/DatasourceDriverServer.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/server/DatasourceServer.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/server/DatasourceTaskServer.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/server/EngineServer.java (85%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/type/CK.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/type/Db2.java (93%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/type/Es.java (68%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/type/H2.java (64%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/type/Impala.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/type/Mongo.java (94%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/type/Mysql.java (94%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/type/Oracle.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/type/Pg.java (93%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/type/Redshift.java (87%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/type/Sqlserver.java (93%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/datasource/utils/DatasourceUtils.java (77%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/engine/constant/ExtFieldConstant.java (80%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/engine/func/FunctionConstant.java (82%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/engine/sql/SQLProvider.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/engine/sql/SqlTemplate.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/engine/trans/CustomWhere2Str.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/engine/trans/Dimension2SQLObj.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/engine/trans/ExtWhere2Str.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/engine/trans/Field2SQLObj.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/engine/trans/Order2SQLObj.java (90%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/engine/trans/Quota2SQLObj.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/engine/trans/Table2SQLObj.java (73%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/engine/trans/WhereTree2Str.java (94%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/engine/utils/DateUtils.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/engine/utils/SQLUtils.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/engine/utils/Utils.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/exportCenter/dao/auto/entity/CoreExportTask.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/exportCenter/dao/auto/mapper/CoreExportTaskMapper.java (66%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/exportCenter/manage/ExportCenterLimitManage.java (93%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/exportCenter/manage/ExportCenterManage.java (88%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/exportCenter/server/ExportCenterServer.java (84%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/exportCenter/util/ExportCenterUtils.java (84%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/font/dao/auto/entity/CoreFont.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/font/dao/auto/mapper/CoreFontMapper.java (68%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/font/manage/FontManage.java (94%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/font/server/FontServer.java (87%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/home/IndexController.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/home/RestIndexController.java (86%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/home/manage/DeIndexManage.java (88%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/interceptor/MybatisInterceptor.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/job/schedule/CheckDsStatusJob.java (79%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/job/schedule/CleanScheduler.java (81%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/job/schedule/DeDataFillingTaskExecutor.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/job/schedule/DeScheduleJob.java (93%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/job/schedule/DeTaskExecutor.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/job/schedule/DeXpackDataFillingScheduleJob.java (90%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/job/schedule/DeXpackScheduleJob.java (87%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/job/schedule/ExtractDataJob.java (78%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/job/schedule/Schedular.java (80%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/job/schedule/ScheduleManager.java (99%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/license/manage/CoreLicManage.java (77%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/license/server/LicenseServer.java (85%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/listener/ChartFilterDynamicListener.java (86%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/listener/ChartFilterMergeListener.java (86%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/listener/DataSourceInitStartListener.java (81%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/listener/EhCacheStartListener.java (94%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/listener/TemplateInitListener.java (90%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/listener/XpackTaskStarter.java (84%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/map/bo/AreaBO.java (75%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/map/dao/auto/entity/Area.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/map/dao/auto/entity/CoreCustomGeoArea.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/map/dao/auto/entity/CoreCustomGeoSubArea.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/map/dao/auto/mapper/AreaMapper.java (68%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/map/dao/auto/mapper/CoreCustomGeoAreaMapper.java (70%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/map/dao/auto/mapper/CoreCustomGeoSubAreaMapper.java (70%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/map/dao/ext/entity/CoreAreaCustom.java (82%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/map/dao/ext/mapper/CoreAreaCustomMapper.java (66%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/map/manage/MapManage.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/map/server/CustomGeoServer.java (83%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/map/server/GeoServer.java (78%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/map/server/MapServer.java (72%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/menu/bo/MenuTreeNode.java (70%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/menu/dao/auto/entity/CoreMenu.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/menu/dao/auto/mapper/CoreMenuMapper.java (68%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/menu/manage/MenuManage.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/menu/server/MenuServer.java (69%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/msgCenter/MsgCenterServer.java (83%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/operation/dao/auto/entity/CoreOptRecent.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/operation/dao/auto/mapper/CoreOptRecentMapper.java (66%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/operation/manage/CoreOptRecentManage.java (90%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/resource/ResourceApi.java (92%) create mode 100644 core/core-backend/src/main/java/io/gisbi/resource/ResourceService.java rename core/core-backend/src/main/java/io/{dataease => gisbi}/share/dao/auto/entity/CoreShareTicket.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/share/dao/auto/entity/XpackShare.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/share/dao/auto/mapper/CoreShareTicketMapper.java (67%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/share/dao/auto/mapper/XpackShareMapper.java (68%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/share/dao/ext/mapper/XpackShareExtMapper.java (87%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/share/dao/ext/po/XpackSharePO.java (93%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/share/interceptor/DeLinkAop.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/share/interceptor/LinkInterceptor.java (89%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/share/manage/ShareTicketManage.java (88%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/share/manage/XpackShareManage.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/share/server/ShareTicketServer.java (75%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/share/server/XpackShareServer.java (78%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/share/util/LinkTokenUtil.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/startup/dao/auto/entity/CoreSysStartupJob.java (94%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/startup/dao/auto/mapper/CoreSysStartupJobMapper.java (68%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/substitute/permissions/auth/SubstituleAuthServer.java (93%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/substitute/permissions/login/SubstituleLoginServer.java (81%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/substitute/permissions/org/SubstituleOrgServer.java (85%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/substitute/permissions/user/SubstituteUserServer.java (82%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/system/bo/SysParameterBO.java (87%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/system/dao/auto/entity/CoreSysSetting.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/system/dao/auto/entity/CoreTypeface.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/system/dao/auto/mapper/CoreSysSettingMapper.java (67%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/system/dao/auto/mapper/CoreTypefaceMapper.java (67%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/system/dao/ext/mapper/ExtCoreSysSettingMapper.java (60%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/system/manage/CoreUserManage.java (88%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/system/manage/SysParameterManage.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/system/server/SysParameterServer.java (89%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/template/dao/auto/entity/DeTemplateVersion.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/template/dao/auto/entity/VisualizationTemplate.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/template/dao/auto/entity/VisualizationTemplateCategory.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/template/dao/auto/entity/VisualizationTemplateCategoryMap.java (94%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/template/dao/auto/entity/VisualizationTemplateExtendData.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/template/dao/auto/mapper/DeTemplateVersionMapper.java (66%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/template/dao/auto/mapper/VisualizationTemplateCategoryMapMapper.java (67%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/template/dao/auto/mapper/VisualizationTemplateCategoryMapper.java (67%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/template/dao/auto/mapper/VisualizationTemplateExtendDataMapper.java (66%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/template/dao/auto/mapper/VisualizationTemplateMapper.java (67%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/template/dao/ext/ExtVisualizationTemplateMapper.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/template/manage/TemplateCenterManage.java (93%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/template/manage/TemplateLocalParseManage.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/template/service/TemplateManageService.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/template/service/TemplateMarketService.java (75%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/bo/ExcelSheetModel.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/entity/CoreStore.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/entity/DataVisualizationInfo.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/entity/VisualizationBackground.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/entity/VisualizationLinkJump.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/entity/VisualizationLinkJumpInfo.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/entity/VisualizationLinkJumpTargetViewInfo.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/entity/VisualizationLinkage.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/entity/VisualizationLinkageField.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/entity/VisualizationOuterParams.java (96%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java (97%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/entity/VisualizationSubject.java (98%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/entity/VisualizationWatermark.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/mapper/CoreStoreMapper.java (64%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/mapper/DataVisualizationInfoMapper.java (66%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/mapper/VisualizationBackgroundMapper.java (65%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/mapper/VisualizationLinkJumpInfoMapper.java (66%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/mapper/VisualizationLinkJumpMapper.java (65%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/mapper/VisualizationLinkJumpTargetViewInfoMapper.java (68%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/mapper/VisualizationLinkageFieldMapper.java (65%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/mapper/VisualizationLinkageMapper.java (65%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/mapper/VisualizationOuterParamsInfoMapper.java (66%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/mapper/VisualizationOuterParamsMapper.java (67%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java (67%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/mapper/VisualizationSubjectMapper.java (65%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/auto/mapper/VisualizationWatermarkMapper.java (66%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/ext/mapper/CoreStoreExtMapper.java (89%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/ext/mapper/CoreVisualiationExtMapper.java (91%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java (78%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/ext/mapper/ExtVisualizationLinkJumpMapper.java (77%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/ext/mapper/ExtVisualizationLinkageMapper.java (73%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/ext/mapper/ExtVisualizationOuterParamsMapper.java (74%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/ext/po/StorePO.java (90%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/ext/po/VisualizationNodePO.java (88%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dao/ext/po/VisualizationResourcePO.java (94%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dto/VisualizationNodeBO.java (85%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/dto/WatermarkContentDTO.java (90%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/manage/CoreBusiManage.java (85%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/manage/CoreVisualizationExportManage.java (89%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/manage/CoreVisualizationManage.java (88%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/manage/VisualizationStoreManage.java (86%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/manage/VisualizationTemplateExtendDataManage.java (76%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/server/DataVisualizationServer.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/server/FileType.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/server/StaticResourceServer.java (95%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/server/VisualizationBackgroundService.java (71%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/server/VisualizationLinkJumpService.java (80%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/server/VisualizationLinkageService.java (81%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/server/VisualizationOuterParamsService.java (83%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/server/VisualizationStoreServer.java (75%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/server/VisualizationSubjectService.java (86%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/server/VisualizationWatermarkService.java (68%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/template/FilterBuildTemplate.java (86%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/utils/VisualizationExcelUtils.java (93%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/visualization/utils/VisualizationUtils.java (84%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/websocket/aop/WSTrigger.java (89%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/websocket/config/WsConfig.java (90%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/websocket/entity/DePrincipal.java (86%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/websocket/factory/DeWebSocketHandlerDecorator.java (94%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/websocket/factory/DeWsHandlerFactory.java (90%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/websocket/handler/PrincipalHandshakeHandler.java (92%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/websocket/service/impl/StandaloneWsService.java (84%) rename core/core-backend/src/main/java/io/{dataease => gisbi}/websocket/util/WsUtil.java (90%) delete mode 100644 core/core-backend/src/main/resources/application-desktop.yml delete mode 100644 core/core-backend/src/main/resources/application-distributed.yml delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.0__core_ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.10.1__ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.10.2__ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.10.3__ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.10.4__ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.10.5__ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.10__ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.1__ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.2__update_table_desc_ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.3__ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.4__ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.5__ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.6__ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.7__ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.8__ddl.sql delete mode 100644 core/core-backend/src/main/resources/db/desktop/V2.9__ddl.sql delete mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumObj.java delete mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/license/LicenseApi.java delete mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/template/request/TemplateMarketSearchRequest.java delete mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsTargetViewInfoDTO.java rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/ai/AiComponentApi.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/chart/ChartDataApi.java (86%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/chart/ChartViewApi.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/chart/dto/DeSortField.java (54%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/chart/dto/PageInfo.java (79%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/chart/dto/PermissionProxy.java (80%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/chart/dto/ScatterChartDataDTO.java (61%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/chart/dto/Series.java (88%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/chart/dto/ViewDetailField.java (85%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/chart/request/ChartExcelRequest.java (86%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/chart/request/ChartExcelRequestInner.java (83%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/chart/request/ThresholdCheckRequest.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/chart/vo/ChartBaseVO.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/chart/vo/ThresholdCheckVO.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/chart/vo/ViewSelectorVO.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/commons/BaseRspModel.java (86%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/communicate/api/CommunicateApi.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/communicate/dto/MessageDTO.java (86%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/communicate/dto/MessageFile.java (86%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/copilot/CopilotApi.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/copilot/dto/AxisDTO.java (78%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/copilot/dto/AxisFieldDTO.java (78%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/copilot/dto/ChartDTO.java (87%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/copilot/dto/DEReceiveDTO.java (82%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/copilot/dto/DESendDTO.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/copilot/dto/HistoryDTO.java (78%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/copilot/dto/MsgDTO.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/copilot/dto/ReceiveDTO.java (88%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/copilot/dto/SendDTO.java (85%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/copilot/dto/TokenDTO.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/DatasetDataApi.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/DatasetTableApi.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/DatasetTableSqlLogApi.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/DatasetTreeApi.java (84%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/dto/BaseTreeNodeDTO.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/dto/DataSetExportRequest.java (82%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/dto/DatasetNodeDTO.java (98%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/dto/DeSortDTO.java (86%) create mode 100644 sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/EnumObj.java rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/dto/EnumValueRequest.java (85%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/dto/MultFieldValuesRequest.java (87%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/dto/PreviewSqlDTO.java (84%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/dto/Sorted.java (72%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/dto/SqlLogDTO.java (93%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/engine/SQLFunctionDTO.java (84%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/engine/SQLFunctionsEnum.java (98%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/union/DatasetGroupInfoDTO.java (71%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/union/DatasetTableInfoDTO.java (83%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/union/UnionDTO.java (70%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/union/UnionItemDTO.java (68%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/union/UnionParamDTO.java (70%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/vo/CoreDatasetGroupVO.java (95%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/vo/CoreDatasetTableFieldVO.java (98%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/vo/DataSetBarVO.java (88%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dataset/vo/DatasetTreeNodeVO.java (68%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dingtalk/api/DingtalkApi.java (83%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dingtalk/dto/DingtalkEnableEditor.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dingtalk/dto/DingtalkSettingCreator.java (95%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dingtalk/dto/DingtalkTokenRequest.java (81%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/dingtalk/vo/DingtalkInfoVO.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/ds/DatasourceApi.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/ds/DatasourceDriverApi.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/ds/EngineApi.java (79%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/ds/vo/BusiCreateFolderRequest.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/ds/vo/BusiDsRequest.java (95%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/ds/vo/BusiRenameRequest.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/ds/vo/CoreDatasourceTaskLogDTO.java (97%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/ds/vo/DriveDTO.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/ds/vo/DriveJarDTO.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/ds/vo/DsSimpleVO.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/ds/vo/ExcelFileData.java (88%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/ds/vo/ExcelSheetData.java (86%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/ds/vo/TreeNodeVO.java (93%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/email/EmailApi.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/export/BaseExportApi.java (88%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/exportCenter/ExportCenterApi.java (87%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/font/api/FontApi.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/font/dto/FontDto.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/free/FreeApi.java (82%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/free/dto/FreeBatchDelRequest.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/free/dto/FreeBatchSyncRequest.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/free/dto/FreeQueryRequest.java (87%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/free/dto/FreeRelationCategory.java (88%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/free/dto/FreeRelationLink.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/free/dto/FreeRelationNode.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/free/dto/FreeRelationRequest.java (87%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/free/dto/FreeSyncRequest.java (87%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/free/vo/FreeRelationVO.java (73%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/free/vo/FreeVO.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/lark/api/LarkApi.java (83%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/lark/api/LarksuiteApi.java (84%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/lark/dto/LarkEnableEditor.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/lark/dto/LarkGroupItem.java (88%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/lark/dto/LarkSettingCreator.java (95%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/lark/dto/LarkTokenRequest.java (83%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/lark/vo/LarkGroupVO.java (79%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/lark/vo/LarkInfoVO.java (94%) create mode 100644 sdk/api/api-base/src/main/java/io/gisbi/api/license/LicenseApi.java rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/license/dto/LicenseRequest.java (87%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/log/LogApi.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/log/dto/LogGridRequest.java (85%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/log/vo/LogGridVO.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/log/vo/LogOpVO.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/map/CustomGeoApi.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/map/GeoApi.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/map/MapApi.java (83%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/map/dto/GeometryNodeCreator.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/map/vo/AreaNode.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/map/vo/CustomGeoArea.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/map/vo/CustomGeoSubArea.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/menu/MenuApi.java (82%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/menu/vo/MenuMeta.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/menu/vo/MenuVO.java (95%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/msgCenter/MsgCenterApi.java (86%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/panel/PanelTreeAPi.java (78%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/panel/vo/PanelTreeNodeVO.java (84%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/report/ReportApi.java (93%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/report/dto/ReportCreator.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/report/dto/ReportEditor.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/report/dto/ReportExportRequest.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/report/dto/ReportGridRequest.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/report/dto/ReportInstanceDelRequest.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/report/dto/ReportInstanceMsgRequest.java (88%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/report/dto/ReportInstanceRequest.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/report/vo/ReportGridVO.java (95%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/report/vo/ReportInfoVO.java (97%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/report/vo/ReportInstanceVO.java (93%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/system/SysParameterApi.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/system/SystemInfoApi.java (73%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/system/request/OnlineMapEditor.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/system/vo/SettingItemVO.java (95%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/system/vo/ShareBaseVO.java (93%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/TemplateManageApi.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/TemplateMarketApi.java (80%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/dto/TemplateManageDTO.java (80%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/dto/TemplateManageFileDTO.java (69%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/dto/TemplateMarketDTO.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/dto/TemplateMarketPreviewInfoDTO.java (84%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/dto/VisualizationTemplateExtendDataDTO.java (81%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/request/TemplateManageBatchRequest.java (70%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/request/TemplateManageRequest.java (87%) create mode 100644 sdk/api/api-base/src/main/java/io/gisbi/api/template/request/TemplateMarketSearchRequest.java rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/response/MarketBaseResponse.java (77%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/response/MarketCategoryBaseResponse.java (67%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/response/MarketLatestRelease.java (60%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/response/MarketMetaDataBaseResponse.java (75%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/response/MarketPreviewBaseResponse.java (72%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/response/MarketTemplateBaseResponse.java (59%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/response/MarketTemplateInnerResult.java (67%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/response/MarketTemplateV2BaseResponse.java (83%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/response/MarketTemplateV2ItemResult.java (59%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/MarketApplicationMetaDataVO.java (72%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/MarketApplicationSpecLinkVO.java (83%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/MarketApplicationSpecScreenshotBaseVO.java (82%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/MarketApplicationSpecVO.java (93%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/MarketApplicationVO.java (85%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/MarketCategoryVO.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/MarketLatestReleaseVO.java (82%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/MarketMetaDataVO.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/MarketMetasVO.java (88%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/MarketReleaseAssetVO.java (75%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/MarketReleaseMetaDataVO.java (71%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/MarketReleaseVO.java (74%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/TemplateCategoryVO.java (86%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/VisualizationTemplateCategoryVO.java (95%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/VisualizationTemplateExtendDataVO.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/template/vo/VisualizationTemplateVO.java (97%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/threshold/ThresholdApi.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/threshold/dto/BaseReciDTO.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/threshold/dto/ThresholdBatchReciRequest.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/threshold/dto/ThresholdCreator.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/threshold/dto/ThresholdGridRequest.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/threshold/dto/ThresholdInstanceRequest.java (81%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/threshold/dto/ThresholdPreviewRequest.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/threshold/dto/ThresholdSwitchRequest.java (87%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/threshold/vo/ThresholdGridVO.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/threshold/vo/ThresholdInstanceVO.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/DataVisualizationApi.java (87%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/StaticResourceApi.java (88%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/VisualizationBackgroundApi.java (73%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/VisualizationLinkJumpApi.java (84%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/VisualizationLinkageApi.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/VisualizationOuterParamsApi.java (77%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/VisualizationStoreApi.java (79%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/VisualizationSubjectApi.java (85%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/VisualizationWatermarkApi.java (61%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/dto/LinkageInfoDTO.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/dto/VisualizationComponentDTO.java (70%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/dto/VisualizationLinkJumpDTO.java (83%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/dto/VisualizationLinkJumpInfoDTO.java (73%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/dto/VisualizationLinkageDTO.java (77%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/dto/VisualizationOuterParamsDTO.java (80%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/dto/VisualizationOuterParamsInfoDTO.java (64%) create mode 100644 sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationOuterParamsTargetViewInfoDTO.java rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/dto/VisualizationViewTableDTO.java (65%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/request/DataVisualizationBaseRequest.java (88%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/request/StaticResourceRequest.java (74%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/request/VisualizationAppExportRequest.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/request/VisualizationBackgroundRequest.java (55%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/request/VisualizationLinkJumpBaseRequest.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/request/VisualizationLinkageRequest.java (75%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/request/VisualizationStoreRequest.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/request/VisualizationSubjectRequest.java (55%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/request/VisualizationWatermarkRequest.java (55%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/request/VisualizationWorkbranchQueryRequest.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/response/VisualizationLinkJumpBaseResponse.java (86%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/response/VisualizationOuterParamsBaseResponse.java (85%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/AppCoreChartViewVO.java (98%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/AppCoreDatasetGroupVO.java (97%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/AppCoreDatasetTableFieldVO.java (98%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/AppCoreDatasetTableVO.java (95%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/AppCoreDatasourceTaskVO.java (97%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/AppCoreDatasourceVO.java (97%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/DataVisualizationBaseVO.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/DataVisualizationVO.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationBackgroundVO.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationBaseInfoVO.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationExport2AppVO.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationLinkJumpInfoVO.java (97%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationLinkJumpTargetViewInfoVO.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationLinkJumpVO.java (95%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationLinkageFieldVO.java (95%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationLinkageVO.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationOutParamsJumpVO.java (80%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationOuterParamsDsInfoVO.java (86%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationOuterParamsFilterInfoVO.java (63%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationOuterParamsInfoVO.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java (95%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationOuterParamsVO.java (98%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationReportFilterVO.java (98%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationResourceVO.java (95%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationStoreVO.java (95%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationSubjectVO.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationViewTableVO.java (87%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/visualization/vo/VisualizationWatermarkVO.java (97%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/webhook/WebhookApi.java (88%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/webhook/request/WebhookSwitchRequest.java (87%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/webhook/vo/WebhookGridVO.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/webhook/vo/WebhookOption.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/wecom/api/WecomApi.java (84%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/wecom/dto/WecomCreator.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/wecom/dto/WecomEnableEditor.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/wecom/dto/WecomTokenRequest.java (82%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/wecom/vo/WecomInfoVO.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/appearance/api/XpackAppearanceApi.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/appearance/vo/AppearanceItemVO.java (93%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/component/XpackComponentApi.java (73%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/component/vo/XpackMenuVO.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/DataFillingApi.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/ColumnOption.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/DataFillFormTableDataRequest.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/DataFillFormTableDataResponse.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/DataFillFormTableDataSearchParam.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/DataFillingDTO.java (97%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/DatasourceOptionsRequest.java (83%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/DfCommitLog.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/DfCommitLogRequest.java (85%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/DfExcelData.java (82%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/DfSubTaskInfoRequest.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/DfSubTaskVo.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/DfTaskInfoRequest.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/DfUserTaskData.java (93%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/DfUserTaskRequest.java (87%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/DfUserTaskVo.java (88%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/ExtraDetails.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/ExtraDetailsRequest.java (82%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/FilterSetting.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/RowDataDatum.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/TaskInfoGridVO.java (85%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/dataFilling/dto/TaskInfoVO.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/plugin/PluginApi.java (87%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/plugin/dto/PluginEditor.java (85%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/plugin/vo/PluginVO.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/settings/XpackAuthenticationApi.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/settings/XpackOauth2Api.java (70%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/settings/request/XpackAuthenticationEditor.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/settings/request/XpackOauth2TokenRequest.java (85%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/settings/vo/XpackAuthenticationStatusVO.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/settings/vo/XpackAuthenticationVO.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/settings/vo/XpackCasVO.java (86%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/settings/vo/XpackLdapVO.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/settings/vo/XpackOauth2VO.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/settings/vo/XpackOauthAuthVO.java (89%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/settings/vo/XpackOauthTokenVO.java (86%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/settings/vo/XpackOidcVO.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/share/ShareTicketApi.java (85%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/share/XpackShareApi.java (87%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/share/request/TicketCreator.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/share/request/TicketDelRequest.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/share/request/TicketSwitchRequest.java (92%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/share/request/XpackShareExpRequest.java (93%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/share/request/XpackShareProxyRequest.java (94%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/share/request/XpackSharePwdRequest.java (93%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/share/request/XpackSharePwdValidator.java (91%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/share/request/XpackShareUuidEditor.java (90%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/share/vo/TicketVO.java (93%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/share/vo/TicketValidVO.java (88%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/share/vo/XpackShareGridVO.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/share/vo/XpackShareProxyVO.java (96%) rename sdk/api/api-base/src/main/java/io/{dataease => gisbi}/api/xpack/share/vo/XpackShareVO.java (96%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/apikey/api/ApiKeyApi.java (88%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/apikey/dto/ApikeyEnableEditor.java (88%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/apikey/vo/ApiKeyVO.java (93%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/api/AuthApi.java (92%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/api/InteractiveAuthApi.java (89%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/dto/BusiBatchAuthorizeNode.java (86%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/dto/BusiBatchAuthorizeRequest.java (87%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/dto/BusiPerCheckDTO.java (81%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/dto/BusiPerEditor.java (83%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/dto/BusiPermissionRequest.java (93%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/dto/BusiResourceCreator.java (93%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/dto/BusiResourceEditor.java (87%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/dto/BusiResourceMover.java (77%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/dto/BusiTargetPerCreator.java (89%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/dto/MenuPerEditor.java (83%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/dto/MenuPermissionRequest.java (89%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/dto/MenuTargetPerCreator.java (77%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/dto/PermissionBO.java (63%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/dto/TargetPerCreator.java (92%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/vo/PermissionItem.java (81%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/vo/PermissionOrigin.java (94%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/vo/PermissionVO.java (93%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/vo/PermissionValVO.java (89%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/vo/ResourceNodeVO.java (78%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/auth/vo/ResourceVO.java (91%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/dataset/api/ColumnPermissionsApi.java (83%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/dataset/api/RowPermissionsApi.java (85%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/dataset/dto/BaseTreeNode.java (84%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/dataset/dto/DataSetColumnPermissionsDTO.java (90%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/dataset/dto/DataSetRowPermissionsTreeDTO.java (85%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/dataset/dto/DatasetRowPermissionsTreeRequest.java (84%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/dataset/dto/Item.java (85%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/dataset/dto/LangSwitchRequest.java (83%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/dataset/dto/WhiteListUsersRequest.java (76%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/embedded/api/EmbeddedApi.java (83%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/embedded/dto/EmbeddedCreator.java (89%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/embedded/dto/EmbeddedEditor.java (90%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/embedded/dto/EmbeddedOrigin.java (77%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/embedded/dto/EmbeddedResetRequest.java (87%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/embedded/vo/EmbeddedGridVO.java (94%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/login/api/LoginApi.java (85%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/login/dto/AccountLockStatus.java (89%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/login/dto/MfaLoginDTO.java (86%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/login/dto/PwdLoginDTO.java (92%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/login/vo/MfaQrVO.java (85%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/org/api/OrgApi.java (75%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/org/dto/OrgCreator.java (91%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/org/dto/OrgEditor.java (90%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/org/dto/OrgRequest.java (86%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/org/vo/MountedVO.java (94%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/org/vo/OrgDetailVO.java (85%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/org/vo/OrgPageVO.java (95%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/relation/api/RelationApi.java (65%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/relation/dto/RelationDTO.java (90%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/relation/dto/RelationListDTO.java (92%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/role/api/RoleApi.java (88%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/role/dto/MountExternalUserRequest.java (90%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/role/dto/MountUserRequest.java (90%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/role/dto/RoleCopyRequest.java (86%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/role/dto/RoleCreator.java (94%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/role/dto/RoleEditor.java (92%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/role/dto/RoleRequest.java (82%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/role/dto/UnmountUserRequest.java (91%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/role/dto/UserRequest.java (85%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/role/vo/ExternalUserVO.java (94%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/role/vo/RoleDetailVO.java (82%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/role/vo/RoleVO.java (94%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/setting/api/PerSettingApi.java (87%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/setting/vo/PerSettingItemVO.java (91%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/api/UserApi.java (93%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/bo/PlatformUser.java (91%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/dto/EnableSwitchRequest.java (92%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/dto/LangSwitchRequest.java (90%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/dto/ModifyPwdRequest.java (92%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/dto/UserBindRequest.java (78%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/dto/UserCreator.java (91%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/dto/UserEditor.java (90%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/dto/UserGridRequest.java (81%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/dto/UserReciRequest.java (87%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/vo/CurIpVO.java (86%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/vo/CurUserVO.java (94%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/vo/UserFormVO.java (91%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/vo/UserGridRoleItem.java (85%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/vo/UserGridVO.java (96%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/vo/UserImportVO.java (94%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/vo/UserItem.java (93%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/user/vo/UserItemVO.java (94%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/variable/api/SysVariablesApi.java (88%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/variable/dto/SysVariableDto.java (92%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/variable/dto/SysVariableValueDto.java (89%) rename sdk/api/api-permissions/src/main/java/io/{dataease => gisbi}/api/permissions/variable/dto/SysVariableValueItem.java (94%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/datasource/api/SyncDatasourceApi.java (83%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/datasource/dto/DBTableDTO.java (86%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/datasource/dto/DatasourceGridRequest.java (79%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/datasource/dto/GetDatasourceRequest.java (87%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/datasource/dto/SyncDatasourceDTO.java (94%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/datasource/vo/SyncDatasourceVO.java (94%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/summary/api/SummaryApi.java (79%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/task/api/TaskApi.java (85%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/task/api/TaskLogApi.java (82%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/task/dto/Source.java (80%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/task/dto/TableField.java (92%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/task/dto/Target.java (84%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/task/dto/TaskGridRequest.java (82%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/task/dto/TaskInfoDTO.java (98%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/task/dto/TaskLogGridRequest.java (80%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/task/vo/LogResultVO.java (94%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/task/vo/TaskInfoVO.java (95%) rename sdk/api/api-sync/src/main/java/io/{dataease => gisbi}/api/sync/task/vo/TaskLogVO.java (91%) rename sdk/common/src/main/java/io/{dataease => gisbi}/auth/DeApiPath.java (82%) rename sdk/common/src/main/java/io/{dataease => gisbi}/auth/DeLinkPermit.java (87%) rename sdk/common/src/main/java/io/{dataease => gisbi}/auth/DePermit.java (92%) rename sdk/common/src/main/java/io/{dataease => gisbi}/auth/bo/LinkTokenUserBO.java (75%) rename sdk/common/src/main/java/io/{dataease => gisbi}/auth/bo/TokenUserBO.java (92%) rename sdk/common/src/main/java/io/{dataease => gisbi}/auth/config/SubstituleLoginConfig.java (95%) rename sdk/common/src/main/java/io/{dataease => gisbi}/auth/filter/CommunityTokenFilter.java (93%) rename sdk/common/src/main/java/io/{dataease => gisbi}/auth/filter/FilterConfig.java (96%) rename sdk/common/src/main/java/io/{dataease => gisbi}/auth/filter/TokenFilter.java (80%) rename sdk/common/src/main/java/io/{dataease => gisbi}/auth/interceptor/CorsConfig.java (96%) rename sdk/common/src/main/java/io/{dataease => gisbi}/auth/vo/InvalidPwdVO.java (94%) rename sdk/common/src/main/java/io/{dataease => gisbi}/auth/vo/MfaItem.java (94%) rename sdk/common/src/main/java/io/{dataease => gisbi}/auth/vo/TokenVO.java (95%) rename sdk/common/src/main/java/io/{dataease => gisbi}/cache/DECacheService.java (92%) rename sdk/common/src/main/java/io/{dataease => gisbi}/cache/annotation/CacheClear.java (90%) rename sdk/common/src/main/java/io/{dataease => gisbi}/cache/impl/DefaultCacheImpl.java (97%) rename sdk/common/src/main/java/io/{dataease => gisbi}/cache/impl/RedisCacheImpl.java (95%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/AuthConstant.java (97%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/AuthEnum.java (92%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/AuthResourceEnum.java (95%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/BusiResourceEnum.java (91%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/CacheConstant.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/ColumnPermissionConstants.java (84%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/CommonConstants.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/DataFillingFinishTaskEnum.java (94%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/DataSourceType.java (96%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/DeTypeConstants.java (92%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/LogOT.java (97%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/LogST.java (97%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/MessageEnum.java (95%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/ReportLastStatusEnum.java (94%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/ReportTaskEnum.java (94%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/SQLConstants.java (99%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/SortConstants.java (91%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/StaticResourceConstants.java (89%) rename sdk/common/src/main/java/io/{dataease => gisbi}/constant/XpackSettingConstants.java (97%) rename sdk/common/src/main/java/io/{dataease => gisbi}/doc/SwaggerConfig.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/exception/DEException.java (94%) rename sdk/common/src/main/java/io/{dataease => gisbi}/exception/GlobalExceptionHandler.java (89%) rename sdk/common/src/main/java/io/{dataease => gisbi}/feign/DeFeign.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/filter/HtmlResourceFilter.java (94%) rename sdk/common/src/main/java/io/{dataease => gisbi}/i18n/DeI18nMessageConfig.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/i18n/DeI18nStarter.java (95%) rename sdk/common/src/main/java/io/{dataease => gisbi}/i18n/DeReloadableResourceBundleMessageSource.java (95%) rename sdk/common/src/main/java/io/{dataease => gisbi}/i18n/DynamicI18nUtils.java (96%) rename sdk/common/src/main/java/io/{dataease => gisbi}/i18n/I18n.java (87%) rename sdk/common/src/main/java/io/{dataease => gisbi}/i18n/Lang.java (97%) rename sdk/common/src/main/java/io/{dataease => gisbi}/i18n/Translator.java (97%) rename sdk/common/src/main/java/io/{dataease => gisbi}/jackson/JacksonConfig.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/listener/MyCacheListener.java (95%) rename sdk/common/src/main/java/io/{dataease => gisbi}/listener/RedisCacheListener.java (96%) rename sdk/common/src/main/java/io/{dataease => gisbi}/log/DeLog.java (74%) rename sdk/common/src/main/java/io/{dataease => gisbi}/model/BusiNodeRequest.java (93%) rename sdk/common/src/main/java/io/{dataease => gisbi}/model/BusiNodeVO.java (97%) rename sdk/common/src/main/java/io/{dataease => gisbi}/model/DeModel.java (70%) rename sdk/common/src/main/java/io/{dataease => gisbi}/model/ExportTaskDTO.java (96%) rename sdk/common/src/main/java/io/{dataease => gisbi}/model/ITreeBase.java (90%) rename sdk/common/src/main/java/io/{dataease => gisbi}/model/KeywordRequest.java (93%) rename sdk/common/src/main/java/io/{dataease => gisbi}/model/LogItemModel.java (74%) rename sdk/common/src/main/java/io/{dataease => gisbi}/model/RSAModel.java (84%) rename sdk/common/src/main/java/io/{dataease => gisbi}/model/TreeBaseModel.java (87%) rename sdk/common/src/main/java/io/{dataease => gisbi}/model/TreeModel.java (94%) rename sdk/common/src/main/java/io/{dataease => gisbi}/model/TreeResultModel.java (79%) rename sdk/common/src/main/java/io/{dataease => gisbi}/model/excel/AutoAdaptWidthStyleStrategy.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/model/excel/ErrWriteHandler.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/mybatisplus/MyBatisPlusPaginationInnerConfig.java (95%) rename sdk/common/src/main/java/io/{dataease => gisbi}/result/ResultCode.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/result/ResultMessage.java (97%) rename sdk/common/src/main/java/io/{dataease => gisbi}/result/ResultResponseBodyAdvice.java (93%) rename sdk/common/src/main/java/io/{dataease => gisbi}/rsa/dao/entity/CoreRsa.java (97%) rename sdk/common/src/main/java/io/{dataease => gisbi}/rsa/dao/mapper/CoreRsaMapper.java (76%) rename sdk/common/src/main/java/io/{dataease => gisbi}/rsa/manage/RsaManage.java (78%) rename sdk/common/src/main/java/io/{dataease => gisbi}/rsa/starter/RsaStarter.java (84%) rename sdk/common/src/main/java/io/{dataease => gisbi}/traffic/DeTraffic.java (86%) rename sdk/common/src/main/java/io/{dataease => gisbi}/traffic/DeTrafficAop.java (90%) rename sdk/common/src/main/java/io/{dataease => gisbi}/traffic/dao/entity/CoreApiTraffic.java (91%) rename sdk/common/src/main/java/io/{dataease => gisbi}/traffic/dao/mapper/CoreApiTrafficMapper.java (90%) rename sdk/common/src/main/java/io/{dataease => gisbi}/traffic/starter/DeTrafficStarter.java (81%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/AesUtils.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/AuthUtils.java (92%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/BeanUtils.java (99%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/CacheUtils.java (97%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/CalendarUtils.java (94%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/CommonBeanFactory.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/CommonExcelUtils.java (96%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/CommonThreadPool.java (99%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/CommunityUtils.java (91%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/ConfigUtils.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/DateUtils.java (96%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/DeClassUtils.java (97%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/DeReflectUtil.java (94%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/DelayQueueUtils.java (96%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/FileUtils.java (99%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/HttpClientConfig.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/HttpClientUtil.java (99%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/IDUtils.java (94%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/IPUtils.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/JsonUtil.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/LogUtil.java (99%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/LongArray2StringSerialize.java (96%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/Md5Utils.java (97%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/ModelUtils.java (89%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/Pager.java (96%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/RsaUtils.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/ServletUtils.java (96%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/SnowFlake.java (99%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/StaticResourceUtils.java (97%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/SystemSettingUtils.java (90%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/TokenUtils.java (93%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/TreeUtils.java (98%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/UserUtils.java (85%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/VersionUtil.java (72%) rename sdk/common/src/main/java/io/{dataease => gisbi}/utils/WhitelistUtils.java (96%) rename sdk/common/src/main/java/io/{dataease => gisbi}/websocket/WsMessage.java (90%) rename sdk/common/src/main/java/io/{dataease => gisbi}/websocket/WsService.java (72%) delete mode 100644 sdk/distributed/pom.xml delete mode 100644 sdk/distributed/src/main/java/io/dataease/DeFeignConfiguration.java delete mode 100644 sdk/distributed/src/main/java/io/dataease/dds/DynamicContextHolder.java delete mode 100644 sdk/distributed/src/main/java/io/dataease/dds/DynamicDataSource.java delete mode 100644 sdk/distributed/src/main/java/io/dataease/dds/config/DynamicDataSourceProperties.java delete mode 100644 sdk/distributed/src/main/java/io/dataease/dds/config/DynamicDsConfig.java delete mode 100644 sdk/distributed/src/main/java/io/dataease/dds/constant/DataSourceConstant.java delete mode 100644 sdk/distributed/src/main/java/io/dataease/dds/interceptor/DSInterceptor.java delete mode 100644 sdk/distributed/src/main/java/io/dataease/dds/provider/TenantDatasourceProvider.java delete mode 100644 sdk/distributed/src/main/java/io/dataease/flyway/TenantFlywayUtil.java delete mode 100644 sdk/distributed/src/main/java/io/dataease/rpc/DeFeignRegister.java delete mode 100644 sdk/distributed/src/main/resources/db/distributed/manage/V1.1__manage_ddl.sql delete mode 100644 sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/api/DfPluginManageApi.java delete mode 100644 sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/factory/ExtDDLProviderFactory.java delete mode 100644 sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/plugin/DataFillingPlugin.java create mode 100644 sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/api/DfPluginManageApi.java rename sdk/extensions/extensions-datafilling/src/main/java/io/{dataease => gisbi}/extensions/datafilling/dto/ExtFormSettings.java (94%) rename sdk/extensions/extensions-datafilling/src/main/java/io/{dataease => gisbi}/extensions/datafilling/dto/ExtIndexField.java (93%) rename sdk/extensions/extensions-datafilling/src/main/java/io/{dataease => gisbi}/extensions/datafilling/dto/ExtTableField.java (98%) rename sdk/extensions/extensions-datafilling/src/main/java/io/{dataease => gisbi}/extensions/datafilling/dto/ExtraColumnItem.java (79%) create mode 100644 sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/factory/ExtDDLProviderFactory.java create mode 100644 sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/plugin/DataFillingPlugin.java rename sdk/extensions/extensions-datafilling/src/main/java/io/{dataease => gisbi}/extensions/datafilling/provider/ExtDDLProvider.java (96%) rename sdk/extensions/extensions-datafilling/src/main/java/io/{dataease => gisbi}/extensions/datafilling/utils/BeanUtils.java (92%) rename sdk/extensions/extensions-datafilling/src/main/java/io/{dataease => gisbi}/extensions/datafilling/vo/XpackPluginsDfVO.java (88%) delete mode 100644 sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/plugin/DataEaseDatasourcePlugin.java rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/api/PluginManageApi.java (54%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/constant/SqlPlaceholderConstants.java (91%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/dto/ApiDefinition.java (95%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/dto/ApiDefinitionRequest.java (96%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/dto/CalParam.java (81%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/dto/ConnectionObj.java (77%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/dto/DatasetTableDTO.java (96%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/dto/DatasetTableFieldDTO.java (98%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/dto/DatasourceDTO.java (97%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/dto/DatasourceRequest.java (97%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/dto/DatasourceSchemaDTO.java (75%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/dto/DsTypeDTO.java (81%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/dto/FieldGroupDTO.java (87%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/dto/SimpleDatasourceDTO.java (93%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/dto/TableField.java (93%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/dto/TableFieldWithValue.java (95%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/dto/TaskDTO.java (93%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/factory/ProviderFactory.java (50%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/model/SQLMeta.java (95%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/model/SQLObj.java (93%) create mode 100644 sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/plugin/DataEaseDatasourcePlugin.java rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/provider/DriverShim.java (94%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/provider/ExtendedJdbcClassLoader.java (97%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/provider/Provider.java (97%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/utils/SpringContextUtil.java (97%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/vo/Configuration.java (97%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/vo/DatasourceConfiguration.java (97%) rename sdk/extensions/extensions-datasource/src/main/java/io/{dataease => gisbi}/extensions/datasource/vo/XpackPluginsDatasourceVO.java (92%) delete mode 100644 sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/FieldSource.java delete mode 100644 sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/factory/PluginsChartFactory.java delete mode 100644 sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/plugin/DataEaseChartPlugin.java rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/AxisChartDataAntVDTO.java (92%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/AxisChartDataDTO.java (86%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/AxisFormatResult.java (88%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartAxis.java (79%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartCalcDataResult.java (91%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartCustomFilterItemDTO.java (91%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartDimensionDTO.java (88%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartDrillRequest.java (79%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartExtFilterDTO.java (84%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartExtRequest.java (94%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartFieldCompareCustomDTO.java (89%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartFieldCompareDTO.java (90%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartFieldCustomFilterDTO.java (72%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartQuotaDTO.java (87%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartSeniorAssistCfgDTO.java (80%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartSeniorAssistDTO.java (94%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartSeniorFunctionCfgDTO.java (86%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartSeniorThresholdCfgDTO.java (85%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartSeniorThresholdDTO.java (93%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartViewBaseDTO.java (96%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartViewDTO.java (96%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartViewFieldBaseDTO.java (85%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartViewFieldDTO.java (93%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ChartViewFieldFilterDTO.java (85%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ColumnPermissionItem.java (96%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ColumnPermissions.java (79%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/CustomFilterResult.java (86%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/DatasetRowPermissionsTreeItem.java (88%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/DatasetRowPermissionsTreeObj.java (87%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/DynamicValueDTO.java (89%) create mode 100644 sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/FieldSource.java rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/FormatterCfgDTO.java (89%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/SortAxis.java (87%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/SqlVariableDetails.java (96%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/TableCalcTotal.java (75%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/TableCalcTotalCfg.java (85%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/TableThresholdDTO.java (89%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/TableTotal.java (74%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/TableTotalCfg.java (83%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/dto/ThresholdDynamicFieldDTO.java (88%) create mode 100644 sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/factory/PluginsChartFactory.java rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/filter/DynamicTimeSetting.java (93%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/filter/FilterTreeItem.java (89%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/filter/FilterTreeObj.java (80%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/plugin/AbstractChartPlugin.java (93%) create mode 100644 sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/plugin/DataEaseChartPlugin.java rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/util/ChartDataUtil.java (99%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/util/FieldUtil.java (73%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/util/Utils.java (85%) rename sdk/extensions/extensions-view/src/main/java/io/{dataease => gisbi}/extensions/view/vo/XpackPluginsViewVO.java (92%) diff --git a/Dockerfile b/Dockerfile index 271469a..c12c596 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ FROM registry.cn-qingdao.aliyuncs.com/dataease/alpine-openjdk21-jre STOPSIGNAL SIGTERM RUN mkdir -p /opt/apps/config \ - /opt/dataease2.0/drivers/ \ - /opt/dataease2.0/cache/ \ - /opt/dataease2.0/data/map \ - /opt/dataease2.0/data/static-resource/ \ - /opt/dataease2.0/data/appearance/ \ - /opt/dataease2.0/data/exportData/ \ - /opt/dataease2.0/data/i8n/ \ - /opt/dataease2.0/data/plugin/ + /opt/gisbi1.0/drivers/ \ + /opt/gisbi1.0/cache/ \ + /opt/gisbi1.0/data/map \ + /opt/gisbi1.0/data/static-resource/ \ + /opt/gisbi1.0/data/appearance/ \ + /opt/gisbi1.0/data/exportData/ \ + /opt/gisbi1.0/data/i8n/ \ + /opt/gisbi1.0/data/plugin/ -ADD drivers/* /opt/dataease2.0/drivers/ -ADD mapFiles/ /opt/dataease2.0/data/map/ -ADD staticResource/ /opt/dataease2.0/data/static-resource/ +ADD drivers/* /opt/gisbi1.0/drivers/ +ADD mapFiles/ /opt/gisbi1.0/data/map/ +ADD staticResource/ /opt/gisbi1.0/data/static-resource/ WORKDIR /opt/apps diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml index a1917fc..d6713ab 100644 --- a/core/core-backend/pom.xml +++ b/core/core-backend/pom.xml @@ -4,14 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> core - io.dataease - ${dataease.version} + io.gisbi + 1.0.0 - 4.0.0 jar core-backend - com.google.guava @@ -19,19 +17,20 @@ ${guava.version} - io.dataease + io.gisbi api-base - ${dataease.version} + 1.0.0 - io.dataease - api-permissions - ${dataease.version} + io.gisbi + common + 1.0.0 + compile - io.dataease + io.gisbi api-sync - ${dataease.version} + 1.0.0 com.mysql @@ -84,6 +83,17 @@ + + org.apache.commons + commons-lang3 + + + io.gisbi + api-permissions + 1.0.0 + compile + + @@ -173,93 +183,6 @@ - - - - desktop - - desktop - - - - com.h2database - h2 - - - - - - maven-clean-plugin - - - - src/main/resources/static - - ** - - false - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-antrun-plugin - - - copy-front-2-back - generate-resources - - - - - - - - - - - run - - - - - - - - - - distributed - - distributed - - - - - io.dataease - distributed - ${project.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io/dataease/substitute/** - - - - - - @@ -313,13 +236,4 @@ - - - - fit2cloud-public - Fit2cloud Public - https://repository.fit2cloud.com/repository/fit2cloud-public/ - - - diff --git a/core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java b/core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java deleted file mode 100644 index 44ab534..0000000 --- a/core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java +++ /dev/null @@ -1,34 +0,0 @@ -package io.dataease.ai.service; - -import io.dataease.api.ai.AiComponentApi; -import io.dataease.commons.utils.UrlTestUtils; -import io.dataease.system.manage.SysParameterManage; -import jakarta.annotation.Resource; -import org.apache.commons.lang3.StringUtils; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.HashMap; -import java.util.Map; - -/** - * @author : WangJiaHao - * @date : 2024/3/27 09:47 - */ -@RestController -@RequestMapping("aiBase") -public class AiBaseService implements AiComponentApi { - @Resource - private SysParameterManage sysParameterManage; - - @Override - public Map findTargetUrl() { - Map templateParams = sysParameterManage.groupVal("ai."); - if (templateParams != null && StringUtils.isNotEmpty(templateParams.get("ai.baseUrl"))) { - return templateParams; - - } else { - return new HashMap<>(); - } - } -} diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/MapHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/MapHandler.java deleted file mode 100644 index 02581ff..0000000 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/MapHandler.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.dataease.chart.charts.impl.map; - -import io.dataease.chart.charts.impl.ExtQuotaChartHandler; -import io.dataease.extensions.view.dto.AxisFormatResult; -import io.dataease.extensions.view.dto.ChartAxis; -import io.dataease.chart.charts.impl.DefaultChartHandler; -import io.dataease.extensions.view.dto.ChartViewDTO; -import lombok.Getter; -import org.springframework.stereotype.Component; - -@Component -public class MapHandler extends ExtQuotaChartHandler { - @Getter - private String type = "map"; -} diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/WordCloudHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/WordCloudHandler.java deleted file mode 100644 index 5995091..0000000 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/WordCloudHandler.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.dataease.chart.charts.impl.others; - -import io.dataease.chart.charts.impl.DefaultChartHandler; -import io.dataease.chart.charts.impl.ExtQuotaChartHandler; -import io.dataease.extensions.view.dto.AxisFormatResult; -import io.dataease.extensions.view.dto.ChartAxis; -import io.dataease.extensions.view.dto.ChartViewDTO; -import lombok.Getter; -import org.springframework.stereotype.Component; - -@Component -public class WordCloudHandler extends ExtQuotaChartHandler { - @Getter - private String type = "word-cloud"; -} diff --git a/core/core-backend/src/main/java/io/dataease/copilot/api/CopilotAPI.java b/core/core-backend/src/main/java/io/dataease/copilot/api/CopilotAPI.java deleted file mode 100644 index 3104050..0000000 --- a/core/core-backend/src/main/java/io/dataease/copilot/api/CopilotAPI.java +++ /dev/null @@ -1,102 +0,0 @@ -package io.dataease.copilot.api; - -import io.dataease.api.copilot.dto.ReceiveDTO; -import io.dataease.api.copilot.dto.SendDTO; -import io.dataease.copilot.dao.auto.entity.CoreCopilotConfig; -import io.dataease.copilot.dao.auto.mapper.CoreCopilotConfigMapper; -import io.dataease.exception.DEException; -import io.dataease.utils.HttpClientConfig; -import io.dataease.utils.HttpClientUtil; -import io.dataease.utils.JsonUtil; -import jakarta.annotation.Resource; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.Header; -import org.apache.http.HttpResponse; -import org.json.simple.JSONObject; -import org.springframework.stereotype.Component; - -import java.util.Base64; -import java.util.Map; - -/** - * @Author Junjun - */ -@Component -public class CopilotAPI { - - public static final String TOKEN = "/auth/token/license"; - - public static final String FREE_TOKEN = "/auth/token/free"; - - public static final String API = "/copilot/v1"; - - public static final String CHART = "/generate-chart"; - - public static final String RATE_LIMIT = "/rate-limit"; - - @Resource - private CoreCopilotConfigMapper coreCopilotConfigMapper; - - public String basicAuth(String userName, String password) { - String auth = userName + ":" + password; - String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes()); - return "Basic " + encodedAuth; - } - - public String bearerAuth(String token) { - return "Bearer " + token; - } - - public CoreCopilotConfig getConfig() { - CoreCopilotConfig coreCopilotConfig = coreCopilotConfigMapper.selectById(1); - coreCopilotConfig.setPwd(new String(Base64.getDecoder().decode(coreCopilotConfig.getPwd()))); - return coreCopilotConfig; - } - - public String getToken(String license) throws Exception { - String url = getConfig().getCopilotUrl() + TOKEN; - JSONObject json = new JSONObject(); - json.put("licenseText", license); - HttpClientConfig httpClientConfig = new HttpClientConfig(); - String tokenJson = HttpClientUtil.post(url, json.toString(), httpClientConfig); - return (String) JsonUtil.parse(tokenJson, Map.class).get("accessToken"); - } - - public String getFreeToken() throws Exception { - String url = getConfig().getCopilotUrl() + FREE_TOKEN; - HttpClientConfig httpClientConfig = new HttpClientConfig(); - String tokenJson = HttpClientUtil.post(url, "", httpClientConfig); - return (String) JsonUtil.parse(tokenJson, Map.class).get("accessToken"); - } - - public ReceiveDTO generateChart(String token, SendDTO sendDTO) { - String url = getConfig().getCopilotUrl() + API + CHART; - String request = (String) JsonUtil.toJSONString(sendDTO); - HttpClientConfig httpClientConfig = new HttpClientConfig(); - httpClientConfig.addHeader("Authorization", bearerAuth(token)); - String result = HttpClientUtil.post(url, request, httpClientConfig); - return JsonUtil.parseObject(result, ReceiveDTO.class); - } - - public void checkRateLimit(String token) { - String url = getConfig().getCopilotUrl() + API + RATE_LIMIT; - HttpClientConfig httpClientConfig = new HttpClientConfig(); - httpClientConfig.addHeader("Authorization", bearerAuth(token)); - HttpResponse httpResponse = HttpClientUtil.postWithHeaders(url, null, httpClientConfig); - Header[] allHeaders = httpResponse.getAllHeaders(); - - String limit = ""; - String seconds = ""; - for (Header header : allHeaders) { - if (StringUtils.equalsIgnoreCase(header.getName(), "x-rate-limit-remaining")) { - limit = header.getValue(); - } - if (StringUtils.equalsIgnoreCase(header.getName(), "x-rate-limit-retry-after-seconds")) { - seconds = header.getValue(); - } - } - if (Long.parseLong(limit) <= 0) { - DEException.throwException(String.format("当前请求频率已达上限,请在%s秒后重试", seconds)); - } - } -} diff --git a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotConfig.java b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotConfig.java deleted file mode 100644 index 7b7177b..0000000 --- a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotConfig.java +++ /dev/null @@ -1,71 +0,0 @@ -package io.dataease.copilot.dao.auto.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; - -/** - *

- * - *

- * - * @author fit2cloud - * @since 2024-07-08 - */ -@TableName("core_copilot_config") -public class CoreCopilotConfig implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private Long id; - - private String copilotUrl; - - private String username; - - private String pwd; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getCopilotUrl() { - return copilotUrl; - } - - public void setCopilotUrl(String copilotUrl) { - this.copilotUrl = copilotUrl; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPwd() { - return pwd; - } - - public void setPwd(String pwd) { - this.pwd = pwd; - } - - @Override - public String toString() { - return "CoreCopilotConfig{" + - "id = " + id + - ", copilotUrl = " + copilotUrl + - ", username = " + username + - ", pwd = " + pwd + - "}"; - } -} diff --git a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotMsg.java b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotMsg.java deleted file mode 100644 index 5c6f746..0000000 --- a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotMsg.java +++ /dev/null @@ -1,276 +0,0 @@ -package io.dataease.copilot.dao.auto.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; - -/** - *

- * - *

- * - * @author fit2cloud - * @since 2024-07-04 - */ -@TableName("core_copilot_msg") -public class CoreCopilotMsg implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private Long id; - - /** - * 用户ID - */ - private Long userId; - - /** - * 数据集ID - */ - private Long datasetGroupId; - - /** - * user or api - */ - private String msgType; - - /** - * mysql oracle ... - */ - private String engineType; - - /** - * create sql - */ - private String schemaSql; - - /** - * 用户提问 - */ - private String question; - - /** - * 历史信息 - */ - private String history; - - /** - * copilot 返回 sql - */ - private String copilotSql; - - /** - * copilot 返回信息 - */ - private String apiMsg; - - /** - * sql 状态 - */ - private Integer sqlOk; - - /** - * chart 状态 - */ - private Integer chartOk; - - /** - * chart 内容 - */ - private String chart; - - /** - * 视图数据 - */ - private String chartData; - - /** - * 执行请求的SQL - */ - private String execSql; - - /** - * msg状态,0失败 1成功 - */ - private Integer msgStatus; - - /** - * de错误信息 - */ - private String errMsg; - - /** - * 创建时间 - */ - private Long createTime; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public Long getDatasetGroupId() { - return datasetGroupId; - } - - public void setDatasetGroupId(Long datasetGroupId) { - this.datasetGroupId = datasetGroupId; - } - - public String getMsgType() { - return msgType; - } - - public void setMsgType(String msgType) { - this.msgType = msgType; - } - - public String getEngineType() { - return engineType; - } - - public void setEngineType(String engineType) { - this.engineType = engineType; - } - - public String getSchemaSql() { - return schemaSql; - } - - public void setSchemaSql(String schemaSql) { - this.schemaSql = schemaSql; - } - - public String getQuestion() { - return question; - } - - public void setQuestion(String question) { - this.question = question; - } - - public String getHistory() { - return history; - } - - public void setHistory(String history) { - this.history = history; - } - - public String getCopilotSql() { - return copilotSql; - } - - public void setCopilotSql(String copilotSql) { - this.copilotSql = copilotSql; - } - - public String getApiMsg() { - return apiMsg; - } - - public void setApiMsg(String apiMsg) { - this.apiMsg = apiMsg; - } - - public Integer getSqlOk() { - return sqlOk; - } - - public void setSqlOk(Integer sqlOk) { - this.sqlOk = sqlOk; - } - - public Integer getChartOk() { - return chartOk; - } - - public void setChartOk(Integer chartOk) { - this.chartOk = chartOk; - } - - public String getChart() { - return chart; - } - - public void setChart(String chart) { - this.chart = chart; - } - - public String getChartData() { - return chartData; - } - - public void setChartData(String chartData) { - this.chartData = chartData; - } - - public String getExecSql() { - return execSql; - } - - public void setExecSql(String execSql) { - this.execSql = execSql; - } - - public Integer getMsgStatus() { - return msgStatus; - } - - public void setMsgStatus(Integer msgStatus) { - this.msgStatus = msgStatus; - } - - public String getErrMsg() { - return errMsg; - } - - public void setErrMsg(String errMsg) { - this.errMsg = errMsg; - } - - public Long getCreateTime() { - return createTime; - } - - public void setCreateTime(Long createTime) { - this.createTime = createTime; - } - - @Override - public String toString() { - return "CoreCopilotMsg{" + - "id = " + id + - ", userId = " + userId + - ", datasetGroupId = " + datasetGroupId + - ", msgType = " + msgType + - ", engineType = " + engineType + - ", schemaSql = " + schemaSql + - ", question = " + question + - ", history = " + history + - ", copilotSql = " + copilotSql + - ", apiMsg = " + apiMsg + - ", sqlOk = " + sqlOk + - ", chartOk = " + chartOk + - ", chart = " + chart + - ", chartData = " + chartData + - ", execSql = " + execSql + - ", msgStatus = " + msgStatus + - ", errMsg = " + errMsg + - ", createTime = " + createTime + - "}"; - } -} diff --git a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotToken.java b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotToken.java deleted file mode 100644 index 40b0617..0000000 --- a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotToken.java +++ /dev/null @@ -1,74 +0,0 @@ -package io.dataease.copilot.dao.auto.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; - -/** - *

- * - *

- * - * @author fit2cloud - * @since 2024-07-08 - */ -@TableName("core_copilot_token") -public class CoreCopilotToken implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private Long id; - - /** - * free or license - */ - private String type; - - private String token; - - private Long updateTime; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getToken() { - return token; - } - - public void setToken(String token) { - this.token = token; - } - - public Long getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Long updateTime) { - this.updateTime = updateTime; - } - - @Override - public String toString() { - return "CoreCopilotToken{" + - "id = " + id + - ", type = " + type + - ", token = " + token + - ", updateTime = " + updateTime + - "}"; - } -} diff --git a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotConfigMapper.java b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotConfigMapper.java deleted file mode 100644 index 85e1097..0000000 --- a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotConfigMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.dataease.copilot.dao.auto.mapper; - -import io.dataease.copilot.dao.auto.entity.CoreCopilotConfig; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author fit2cloud - * @since 2024-07-08 - */ -@Mapper -public interface CoreCopilotConfigMapper extends BaseMapper { - -} diff --git a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotMsgMapper.java b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotMsgMapper.java deleted file mode 100644 index c513ec6..0000000 --- a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotMsgMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.dataease.copilot.dao.auto.mapper; - -import io.dataease.copilot.dao.auto.entity.CoreCopilotMsg; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author fit2cloud - * @since 2024-07-04 - */ -@Mapper -public interface CoreCopilotMsgMapper extends BaseMapper { - -} diff --git a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotTokenMapper.java b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotTokenMapper.java deleted file mode 100644 index 9aff246..0000000 --- a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotTokenMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.dataease.copilot.dao.auto.mapper; - -import io.dataease.copilot.dao.auto.entity.CoreCopilotToken; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author fit2cloud - * @since 2024-07-08 - */ -@Mapper -public interface CoreCopilotTokenMapper extends BaseMapper { - -} diff --git a/core/core-backend/src/main/java/io/dataease/copilot/manage/CopilotManage.java b/core/core-backend/src/main/java/io/dataease/copilot/manage/CopilotManage.java deleted file mode 100644 index 1ababb1..0000000 --- a/core/core-backend/src/main/java/io/dataease/copilot/manage/CopilotManage.java +++ /dev/null @@ -1,487 +0,0 @@ -package io.dataease.copilot.manage; - -import com.fasterxml.jackson.core.type.TypeReference; -import io.dataease.api.copilot.dto.*; -import io.dataease.api.dataset.union.DatasetGroupInfoDTO; -import io.dataease.api.dataset.union.UnionDTO; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.copilot.api.CopilotAPI; -import io.dataease.dataset.dao.auto.entity.CoreDatasetGroup; -import io.dataease.dataset.dao.auto.mapper.CoreDatasetGroupMapper; -import io.dataease.dataset.manage.DatasetDataManage; -import io.dataease.dataset.manage.DatasetSQLManage; -import io.dataease.dataset.manage.DatasetTableFieldManage; -import io.dataease.dataset.manage.PermissionManage; -import io.dataease.dataset.utils.FieldUtils; -import io.dataease.constant.DeTypeConstants; -import io.dataease.engine.utils.Utils; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.constant.SqlPlaceholderConstants; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.dto.TableField; -import io.dataease.extensions.datasource.factory.ProviderFactory; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.ColumnPermissionItem; -import io.dataease.i18n.Translator; -import io.dataease.license.dao.po.LicensePO; -import io.dataease.license.manage.F2CLicManage; -import io.dataease.license.utils.LicenseUtil; -import io.dataease.utils.AuthUtils; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.JsonUtil; -import jakarta.annotation.Resource; -import org.apache.calcite.config.Lex; -import org.apache.calcite.sql.SqlDialect; -import org.apache.calcite.sql.SqlNode; -import org.apache.calcite.sql.parser.SqlParser; -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Author Junjun - */ -@Component -public class CopilotManage { - @Resource - private DatasetSQLManage datasetSQLManage; - @Resource - private CoreDatasetGroupMapper coreDatasetGroupMapper; - @Resource - private DatasetTableFieldManage datasetTableFieldManage; - @Resource - private DatasetDataManage datasetDataManage; - @Resource - private PermissionManage permissionManage; - @Resource - private MsgManage msgManage; - - private static Logger logger = LoggerFactory.getLogger(CopilotManage.class); - - @Resource - private TokenManage tokenManage; - - @Resource - private CopilotAPI copilotAPI; - - @Resource - private F2CLicManage f2CLicManage; - - private String[] chartType = {"bar", "line", "pie"}; - - public MsgDTO chat(MsgDTO msgDTO) throws Exception { - CoreDatasetGroup coreDatasetGroup = coreDatasetGroupMapper.selectById(msgDTO.getDatasetGroupId()); - if (coreDatasetGroup == null) { - return null; - } - DatasetGroupInfoDTO dto = new DatasetGroupInfoDTO(); - BeanUtils.copyBean(dto, coreDatasetGroup); - dto.setUnionSql(null); - List unionDTOList = JsonUtil.parseList(coreDatasetGroup.getInfo(), new TypeReference<>() { - }); - dto.setUnion(unionDTOList); - - // 获取field - List dsFields = datasetTableFieldManage.selectByDatasetGroupId(msgDTO.getDatasetGroupId()); - List allFields = dsFields.stream().filter(ele -> ele.getExtField() == 0) - .map(ele -> { - DatasetTableFieldDTO datasetTableFieldDTO = new DatasetTableFieldDTO(); - BeanUtils.copyBean(datasetTableFieldDTO, ele); - datasetTableFieldDTO.setFieldShortName(ele.getDataeaseName()); - return datasetTableFieldDTO; - }).collect(Collectors.toList()); - - Map sqlMap = datasetSQLManage.getUnionSQLForEdit(dto, null); - String sql = (String) sqlMap.get("sql");// 数据集原始SQL - Map dsMap = (Map) sqlMap.get("dsMap"); - boolean crossDs = Utils.isCrossDs(dsMap); - if (crossDs) { - DEException.throwException(Translator.get("i18n_copilot_cross_ds_error")); - } - - // 调用copilot service 获取SQL和chart struct,将返回SQL中表名替换成数据集SQL - // deSendDTO 构建schema和engine - if (ObjectUtils.isEmpty(dsMap)) { - DEException.throwException("No datasource"); - } - - DatasourceSchemaDTO ds = dsMap.entrySet().iterator().next().getValue(); - String type = engine(ds.getType());// 数据库类型,如mysql,oracle等,可能需要映射成copilot需要的类型 - - datasetDataManage.buildFieldName(sqlMap, allFields); - List strings = transCreateTableFields(allFields); - String createSql = "CREATE TABLE de_tmp_table (" + StringUtils.join(strings, ",") + ")"; - logger.debug("Copilot Schema SQL: " + createSql); - -// PerMsgDTO perMsgDTO = new PerMsgDTO(); - msgDTO.setDatasetGroupId(dto.getId()); - msgDTO.setMsgType("user"); - msgDTO.setEngineType(type); - msgDTO.setSchemaSql(createSql); - msgDTO.setHistory(msgDTO.getHistory()); - msgDTO.setMsgStatus(1); - msgManage.save(msgDTO);// 到这里为止,提问所需参数构建完毕,往数据库插入一条提问记录 - - DESendDTO deSendDTO = new DESendDTO(); - deSendDTO.setDatasetGroupId(dto.getId()); - deSendDTO.setQuestion(msgDTO.getQuestion()); - deSendDTO.setHistory(msgDTO.getHistory()); - deSendDTO.setEngine(type); - deSendDTO.setSchema(createSql); - - // do copilot chat - ReceiveDTO receiveDTO = copilotChat(deSendDTO); - - // copilot 请求结束,继续de获取数据 - // 获取数据集相关行列权限、最终再套一层SQL - Map desensitizationList = new HashMap<>(); - allFields = permissionManage.filterColumnPermissions(allFields, desensitizationList, dto.getId(), null); - if (ObjectUtils.isEmpty(allFields)) { - DEException.throwException(Translator.get("i18n_no_column_permission")); - } - - List dsList = new ArrayList<>(); - for (Map.Entry next : dsMap.entrySet()) { - dsList.add(next.getValue().getType()); - } - - if (!crossDs) { - sql = Utils.replaceSchemaAlias(sql, dsMap); - } - - Provider provider; - if (crossDs) { - provider = ProviderFactory.getDefaultProvider(); - } else { - provider = ProviderFactory.getProvider(dsList.getFirst()); - } - -// List rowPermissionsTree = new ArrayList<>(); -// TokenUserBO user = AuthUtils.getUser(); -// if (user != null) { -// rowPermissionsTree = permissionManage.getRowPermissionsTree(dto.getId(), user.getUserId()); -// } - - // build query sql -// SQLMeta sqlMeta = new SQLMeta(); -// Table2SQLObj.table2sqlobj(sqlMeta, null, "(" + sql + ")", crossDs); -// Field2SQLObj.field2sqlObj(sqlMeta, allFields, allFields, crossDs, dsMap); -// WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, allFields, crossDs, dsMap); -// Order2SQLObj.getOrders(sqlMeta, dto.getSortFields(), allFields, crossDs, dsMap); -// String querySQL = SQLProvider.createQuerySQL(sqlMeta, false, false, needOrder); -// querySQL = provider.rebuildSQL(querySQL, sqlMeta, crossDs, dsMap); -// logger.debug("preview sql: " + querySQL); - - // 无法加行权限的情况下,直接用sql - String querySQL = sql; - - String copilotSQL = receiveDTO.getSql(); - // 用calcite尝试将SQL转方言,如果失败了,就按照原SQL执行 -// copilotSQL = transSql(type, copilotSQL, provider, receiveDTO); - - // 通过数据源请求数据 - // 调用数据源的calcite获得data - DatasourceRequest datasourceRequest = new DatasourceRequest(); - datasourceRequest.setDsList(dsMap); - String s = ""; - Map data; - try { - s = copilotSQL - .replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + "de_tmp_table" + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX, "(" + querySQL + ")") - .replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + "DE_TMP_TABLE" + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX, "(" + querySQL + ")"); - logger.debug("copilot sql: " + s); - datasourceRequest.setQuery(s); - data = provider.fetchResultField(datasourceRequest); - } catch (Exception e) { - try { - s = copilotSQL - .replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + "de_tmp_table" + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX, "(" + querySQL + ") tmp") - .replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + "DE_TMP_TABLE" + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX, "(" + querySQL + ") tmp"); - logger.debug("copilot sql: " + s); - datasourceRequest.setQuery(s); - data = provider.fetchResultField(datasourceRequest); - } catch (Exception e1) { - // 如果异常,则获取最后一条成功的history - MsgDTO lastSuccessMsg = msgManage.getLastSuccessMsg(AuthUtils.getUser().getUserId(), dto.getId()); - // 请求数据出错,记录错误信息和copilot返回的信息 - MsgDTO result = new MsgDTO(); - result.setDatasetGroupId(dto.getId()); - result.setMsgType("api"); - result.setHistory(lastSuccessMsg == null ? new ArrayList<>() : lastSuccessMsg.getHistory()); - result.setCopilotSql(receiveDTO.getSql()); - result.setApiMsg(receiveDTO.getApiMessage()); - result.setSqlOk(receiveDTO.getSqlOk() ? 1 : 0); - result.setChartOk(receiveDTO.getChartOk() ? 1 : 0); - result.setChart(receiveDTO.getChart()); - result.setExecSql(s); - result.setMsgStatus(0); - result.setErrMsg(e1.getMessage()); - msgManage.save(result); - return result; - } - } - - List fields = (List) data.get("fields"); - fields = transField(fields); - Map map = new LinkedHashMap<>(); - // 重新构造data - Map previewData = buildPreviewData(data, fields, desensitizationList); - - map.put("data", previewData); - map.put("sql", Base64.getEncoder().encodeToString(s.getBytes())); - - // 重构chart结构,补全缺失字段 - rebuildChart(receiveDTO, fields); - - MsgDTO result = new MsgDTO(); - result.setDatasetGroupId(dto.getId()); - result.setMsgType("api"); - result.setHistory(receiveDTO.getHistory()); - result.setCopilotSql(receiveDTO.getSql()); - result.setApiMsg(receiveDTO.getApiMessage()); - result.setSqlOk(receiveDTO.getSqlOk() ? 1 : 0); - result.setChartOk(receiveDTO.getChartOk() ? 1 : 0); - result.setChart(receiveDTO.getChart()); - result.setChartData(map); - result.setExecSql(s); - result.setMsgStatus(1); - msgManage.save(result); - return result; - } - - public ReceiveDTO copilotChat(DESendDTO deSendDTO) throws Exception { - boolean valid = LicenseUtil.licenseValid(); - // call copilot service - TokenDTO tokenDTO = tokenManage.getToken(valid); - ReceiveDTO receiveDTO; - if (StringUtils.isEmpty(tokenDTO.getToken())) { - // get token - String token; - if (valid) { - LicensePO read = f2CLicManage.read(); - token = copilotAPI.getToken(read.getLicense()); - } else { - token = copilotAPI.getFreeToken(); - } - tokenManage.updateToken(token, valid); - receiveDTO = copilotAPI.generateChart(token, deSendDTO); - } else { - try { - receiveDTO = copilotAPI.generateChart(tokenDTO.getToken(), deSendDTO); - } catch (Exception e) { - // error, get token again - String token; - if (valid) { - LicensePO read = f2CLicManage.read(); - token = copilotAPI.getToken(read.getLicense()); - } else { - token = copilotAPI.getFreeToken(); - } - tokenManage.updateToken(token, valid); - throw new Exception(e.getMessage()); - } - } - - if (!receiveDTO.getSqlOk() || !receiveDTO.getChartOk()) { - DEException.throwException((String) JsonUtil.toJSONString(receiveDTO)); - } - logger.debug("Copilot Service SQL: " + receiveDTO.getSql()); - logger.debug("Copilot Service Chart: " + JsonUtil.toJSONString(receiveDTO.getChart())); - return receiveDTO; - } - - public void rebuildChart(ReceiveDTO receiveDTO, List fields) { - if (StringUtils.equalsIgnoreCase(receiveDTO.getChart().getType(), "pie")) { - AxisFieldDTO column = receiveDTO.getChart().getColumn(); - if (fields.size() != 2 || column == null) { - DEException.throwException("build pie error: " + JsonUtil.toJSONString(receiveDTO)); - } - AxisDTO axisDTO = new AxisDTO(); - AxisFieldDTO x = new AxisFieldDTO(); - AxisFieldDTO y = new AxisFieldDTO(); - if (StringUtils.equals(fields.get(0).getOriginName(), column.getValue())) { - x.setName(column.getName()); - x.setValue(column.getValue()); - y.setName(fields.get(1).getOriginName()); - y.setValue(fields.get(1).getOriginName()); - } else if (StringUtils.equals(fields.get(1).getOriginName(), column.getValue())) { - x.setName(fields.get(0).getOriginName()); - x.setValue(fields.get(0).getOriginName()); - y.setName(column.getName()); - y.setValue(column.getValue()); - } else { - DEException.throwException("build pie error: " + JsonUtil.toJSONString(receiveDTO)); - } - axisDTO.setX(x); - axisDTO.setY(y); - receiveDTO.getChart().setAxis(axisDTO); - } else if (StringUtils.equalsIgnoreCase(receiveDTO.getChart().getType(), "table")) { - // 将fields赋值给columns - if (ObjectUtils.isEmpty(receiveDTO.getChart().getColumns())) { - List columns = new ArrayList<>(); - for (TableField field : fields) { - AxisFieldDTO dto = new AxisFieldDTO(); - dto.setName(field.getOriginName()); - dto.setValue(field.getOriginName()); - columns.add(dto); - } - receiveDTO.getChart().setColumns(columns); - } - } - - // 所有图表都加上columns字段用于切换明细表展示 - if (Arrays.asList(chartType).contains(receiveDTO.getChart().getType())) { - List columns = new ArrayList<>(); - columns.add(receiveDTO.getChart().getAxis().getX()); - columns.add(receiveDTO.getChart().getAxis().getY()); - receiveDTO.getChart().setColumns(columns); - } - } - - public List getList(Long userId) { - MsgDTO lastMsg = msgManage.getLastMsg(userId); - if (lastMsg == null) { - return null; - } - List msg = msgManage.getMsg(lastMsg); - msgManage.deleteMsg(lastMsg); - return msg; - } - - public void clearAll(Long userId) { - msgManage.clearAllUserMsg(userId); - } - - public MsgDTO errorMsg(MsgDTO msgDTO, String errMsg) throws Exception { - // 如果异常,则获取最后一条成功的history - MsgDTO lastSuccessMsg = msgManage.getLastSuccessMsg(AuthUtils.getUser().getUserId(), msgDTO.getDatasetGroupId()); - MsgDTO dto = new MsgDTO(); - dto.setDatasetGroupId(msgDTO.getDatasetGroupId()); - dto.setHistory(lastSuccessMsg == null ? new ArrayList<>() : lastSuccessMsg.getHistory()); - dto.setMsgStatus(0); - dto.setMsgType("api"); - dto.setErrMsg(errMsg); - msgManage.save(dto); - return dto; - } - - public List transField(List fields) { - fields.forEach(field -> { - field.setDeExtractType(FieldUtils.transType2DeType(field.getFieldType())); - field.setDeType(FieldUtils.transType2DeType(field.getFieldType())); - }); - return fields; - } - - public Map buildPreviewData(Map data, List fields, Map desensitizationList) { - Map map = new LinkedHashMap<>(); - List dataList = (List) data.get("data"); - List> dataObjectList = new ArrayList<>(); - if (ObjectUtils.isNotEmpty(dataList)) { - for (int i = 0; i < dataList.size(); i++) { - String[] row = dataList.get(i); - LinkedHashMap obj = new LinkedHashMap<>(); - if (row.length > 0) { - for (int j = 0; j < fields.size(); j++) { - TableField tableField = fields.get(j); - if (desensitizationList.containsKey(tableField.getOriginName())) { - obj.put(tableField.getOriginName(), ChartDataBuild.desensitizationValue(desensitizationList.get(tableField.getOriginName()), String.valueOf(row[j]))); - } else { - if (tableField.getDeExtractType() == DeTypeConstants.DE_INT - || tableField.getDeExtractType() == DeTypeConstants.DE_FLOAT - || tableField.getDeExtractType() == DeTypeConstants.DE_BOOL) { - try { - obj.put(tableField.getOriginName(), new BigDecimal(row[j])); - } catch (Exception e) { - obj.put(tableField.getOriginName(), row[j]); - } - } else { - obj.put(tableField.getOriginName(), row[j]); - } - } - } - } - dataObjectList.add(obj); - } - } - - map.put("fields", fields); - map.put("data", dataObjectList); - return map; - } - - public List transCreateTableFields(List allFields) { - List list = new ArrayList<>(); - for (DatasetTableFieldDTO dto : allFields) { - list.add(" " + dto.getDataeaseName() + " " + transNum2Type(dto.getDeExtractType()) + - " COMMENT '" + dto.getName() + "'"); - } - return list; - } - - public String transNum2Type(Integer num) { - return switch (num) { - case 0, 1, 5 -> "VARCHAR(50)"; - case 2, 3, 4 -> "INT(10)"; - default -> "VARCHAR(50)"; - }; - } - - public Lex getLex(String type) { - switch (type) { - case "oracle": - return Lex.ORACLE; - case "sqlServer": - case "mssql": - return Lex.SQL_SERVER; - default: - return Lex.JAVA; - } - } - - public String transSql(String type, String copilotSQL, Provider provider, ReceiveDTO receiveDTO) { - if (type.equals("oracle") || type.equals("sqlServer")) { - try { - copilotSQL = copilotSQL.trim(); - if (copilotSQL.endsWith(";")) { - copilotSQL = copilotSQL.substring(0, copilotSQL.length() - 1); - } - DatasourceSchemaDTO datasourceSchemaDTO = new DatasourceSchemaDTO(); - datasourceSchemaDTO.setType(type); - SqlDialect dialect = provider.getDialect(datasourceSchemaDTO); - - SqlParser parser = SqlParser.create(copilotSQL, SqlParser.Config.DEFAULT.withLex(getLex(type))); - SqlNode sqlNode = parser.parseStmt(); - return sqlNode.toSqlString(dialect).toString().toLowerCase(); - } catch (Exception e) { - logger.debug("calcite trans copilot SQL error"); - return receiveDTO.getSql(); - } - } else { - return copilotSQL; - } - } - - private String engine(String type) { - switch (type) { - case "ck": - return "ClickHouse"; - case "pg": - return "PostgreSQL"; - case "mysql": - return "MySQL"; - case "sqlServer": - return "SQL Server"; - default: - return type; - } - } -} diff --git a/core/core-backend/src/main/java/io/dataease/copilot/manage/MsgManage.java b/core/core-backend/src/main/java/io/dataease/copilot/manage/MsgManage.java deleted file mode 100644 index a3dbaa2..0000000 --- a/core/core-backend/src/main/java/io/dataease/copilot/manage/MsgManage.java +++ /dev/null @@ -1,100 +0,0 @@ -package io.dataease.copilot.manage; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import io.dataease.api.copilot.dto.ChartDTO; -import io.dataease.api.copilot.dto.HistoryDTO; -import io.dataease.api.copilot.dto.MsgDTO; -import io.dataease.copilot.dao.auto.entity.CoreCopilotMsg; -import io.dataease.copilot.dao.auto.mapper.CoreCopilotMsgMapper; -import io.dataease.utils.AuthUtils; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.IDUtils; -import io.dataease.utils.JsonUtil; -import jakarta.annotation.Resource; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * @Author Junjun - */ -@Component -public class MsgManage { - @Resource - private CoreCopilotMsgMapper coreCopilotMsgMapper; - - private ObjectMapper objectMapper = new ObjectMapper(); - - public void save(MsgDTO msgDTO) throws Exception { - msgDTO.setId(IDUtils.snowID()); - msgDTO.setCreateTime(System.currentTimeMillis()); - msgDTO.setUserId(AuthUtils.getUser().getUserId()); - coreCopilotMsgMapper.insert(transDTO(msgDTO)); - } - - public List getMsg(MsgDTO msgDTO) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("user_id", msgDTO.getUserId()); - wrapper.eq("dataset_group_id", msgDTO.getDatasetGroupId()); - wrapper.orderByAsc("create_time"); - List perCopilotMsgs = coreCopilotMsgMapper.selectList(wrapper); - return perCopilotMsgs.stream().map(this::transRecord).toList(); - } - - public void deleteMsg(MsgDTO msgDTO) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("user_id", msgDTO.getUserId()); - wrapper.ne("dataset_group_id", msgDTO.getDatasetGroupId()); - coreCopilotMsgMapper.delete(wrapper); - } - - public void clearAllUserMsg(Long userId) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("user_id", userId); - coreCopilotMsgMapper.delete(wrapper); - } - - public MsgDTO getLastMsg(Long userId) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("user_id", userId); - wrapper.orderByDesc("create_time"); - List perCopilotMsgs = coreCopilotMsgMapper.selectList(wrapper); - return ObjectUtils.isEmpty(perCopilotMsgs) ? null : transRecord(perCopilotMsgs.getFirst()); - } - - public MsgDTO getLastSuccessMsg(Long userId, Long datasetGroupId) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("user_id", userId); - wrapper.eq("dataset_group_id", datasetGroupId); - wrapper.eq("msg_status", 1); - wrapper.eq("msg_type", "api"); - wrapper.orderByDesc("create_time"); - List perCopilotMsgs = coreCopilotMsgMapper.selectList(wrapper); - return ObjectUtils.isEmpty(perCopilotMsgs) ? null : transRecord(perCopilotMsgs.getFirst()); - } - - private CoreCopilotMsg transDTO(MsgDTO dto) throws Exception { - CoreCopilotMsg record = new CoreCopilotMsg(); - BeanUtils.copyBean(record, dto); - record.setHistory(dto.getHistory() == null ? null : objectMapper.writeValueAsString(dto.getHistory())); - record.setChart(dto.getChart() == null ? null : objectMapper.writeValueAsString(dto.getChart())); - record.setChartData(dto.getChartData() == null ? null : objectMapper.writeValueAsString(dto.getChartData())); - return record; - } - - private MsgDTO transRecord(CoreCopilotMsg record) { - MsgDTO dto = new MsgDTO(); - BeanUtils.copyBean(dto, record); - TypeReference> tokenType = new TypeReference<>() { - }; - dto.setHistory(record.getHistory() == null ? new ArrayList<>() : JsonUtil.parseList(record.getHistory(), tokenType)); - dto.setChart(record.getChart() == null ? null : JsonUtil.parseObject(record.getChart(), ChartDTO.class)); - dto.setChartData(record.getChartData() == null ? null : JsonUtil.parse(record.getChartData(), Map.class)); - return dto; - } -} diff --git a/core/core-backend/src/main/java/io/dataease/copilot/manage/TokenManage.java b/core/core-backend/src/main/java/io/dataease/copilot/manage/TokenManage.java deleted file mode 100644 index 104de25..0000000 --- a/core/core-backend/src/main/java/io/dataease/copilot/manage/TokenManage.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.dataease.copilot.manage; - -import io.dataease.api.copilot.dto.TokenDTO; -import io.dataease.copilot.dao.auto.entity.CoreCopilotToken; -import io.dataease.copilot.dao.auto.mapper.CoreCopilotTokenMapper; -import io.dataease.utils.BeanUtils; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Component; - -/** - * @Author Junjun - */ -@Component -public class TokenManage { - @Resource - private CoreCopilotTokenMapper coreCopilotTokenMapper; - - public TokenDTO getToken(boolean valid) { - CoreCopilotToken perCopilotToken = coreCopilotTokenMapper.selectById(valid ? 2 : 1); - return transRecord(perCopilotToken); - } - - public void updateToken(String token, boolean valid) { - CoreCopilotToken record = new CoreCopilotToken(); - record.setId(valid ? 2L : 1L); - record.setToken(token); - record.setUpdateTime(System.currentTimeMillis()); - coreCopilotTokenMapper.updateById(record); - } - - private TokenDTO transRecord(CoreCopilotToken perCopilotToken) { - TokenDTO dto = new TokenDTO(); - BeanUtils.copyBean(dto, perCopilotToken); - return dto; - } -} diff --git a/core/core-backend/src/main/java/io/dataease/copilot/service/CopilotService.java b/core/core-backend/src/main/java/io/dataease/copilot/service/CopilotService.java deleted file mode 100644 index e78a7bd..0000000 --- a/core/core-backend/src/main/java/io/dataease/copilot/service/CopilotService.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.dataease.copilot.service; - -import io.dataease.api.copilot.CopilotApi; -import io.dataease.api.copilot.dto.MsgDTO; -import io.dataease.copilot.manage.CopilotManage; -import io.dataease.utils.AuthUtils; -import jakarta.annotation.Resource; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @Author Junjun - */ -@RestController -@RequestMapping("copilot") -public class CopilotService implements CopilotApi { - @Resource - private CopilotManage copilotManage; - - @Override - public MsgDTO chat(MsgDTO msgDTO) throws Exception { - try { - return copilotManage.chat(msgDTO); - } catch (Exception e) { - return copilotManage.errorMsg(msgDTO, e.getMessage()); - } - } - - @Override - public List getList() throws Exception { - return copilotManage.getList(AuthUtils.getUser().getUserId()); - } - - @Override - public void clearAll() throws Exception { - copilotManage.clearAll(AuthUtils.getUser().getUserId()); - } -} diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/TaskLogExtMapper.java b/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/TaskLogExtMapper.java deleted file mode 100644 index 59fa6f3..0000000 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/TaskLogExtMapper.java +++ /dev/null @@ -1 +0,0 @@ -package io.dataease.datasource.dao.ext.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.dataease.api.ds.vo.CoreDatasourceTaskLogDTO; import org.apache.ibatis.annotations.*; @Mapper public interface TaskLogExtMapper extends BaseMapper { @Select( """ select * from core_datasource_task_log ${ew.customSqlSegment} """ ) @Results( id = "taskLog", value = { @Result(property = "id", column = "id"), @Result(property = "ds_id", column = "dsId"), @Result(property = "task_id", column = "taskId"), @Result(property = "start_time", column = "startTime"), @Result(property = "end_time", column = "endTime"), @Result(property = "task_status", column = "taskStatus"), @Result(property = "trigger_type", column = "triggerType"), @Result(property = "table_name", column = "tableName"), @Result(property = "info", column = "info") } ) IPage pager(IPage page, @Param("ew") QueryWrapper queryWrapper); } \ No newline at end of file diff --git a/core/core-backend/src/main/java/io/dataease/defeign/permissions/auth/InteractiveAuthFeignService.java b/core/core-backend/src/main/java/io/dataease/defeign/permissions/auth/InteractiveAuthFeignService.java deleted file mode 100644 index f8e218e..0000000 --- a/core/core-backend/src/main/java/io/dataease/defeign/permissions/auth/InteractiveAuthFeignService.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.dataease.defeign.permissions.auth; - -import io.dataease.api.permissions.auth.api.InteractiveAuthApi; -import io.dataease.feign.DeFeign; - -@DeFeign(value = "xpack-permissions", path = "/interactive") -public interface InteractiveAuthFeignService extends InteractiveAuthApi { -} diff --git a/core/core-backend/src/main/java/io/dataease/defeign/permissions/auth/PermissionFeignService.java b/core/core-backend/src/main/java/io/dataease/defeign/permissions/auth/PermissionFeignService.java deleted file mode 100644 index f048f16..0000000 --- a/core/core-backend/src/main/java/io/dataease/defeign/permissions/auth/PermissionFeignService.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.dataease.defeign.permissions.auth; - -import io.dataease.feign.DeFeign; -import io.dataease.api.permissions.auth.api.AuthApi; - - -@DeFeign(value = "xpack-permissions", path = "/auth") -public interface PermissionFeignService extends AuthApi { - -} diff --git a/core/core-backend/src/main/java/io/dataease/defeign/permissions/user/UserFeignService.java b/core/core-backend/src/main/java/io/dataease/defeign/permissions/user/UserFeignService.java deleted file mode 100644 index a3d53a4..0000000 --- a/core/core-backend/src/main/java/io/dataease/defeign/permissions/user/UserFeignService.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.dataease.defeign.permissions.user; - -import io.dataease.api.permissions.user.api.UserApi; -import io.dataease.feign.DeFeign; - -@DeFeign(value = "xpack-permissions", path = "/user") -public interface UserFeignService extends UserApi { -} diff --git a/core/core-backend/src/main/java/io/dataease/resource/ResourceService.java b/core/core-backend/src/main/java/io/dataease/resource/ResourceService.java deleted file mode 100644 index ee67b75..0000000 --- a/core/core-backend/src/main/java/io/dataease/resource/ResourceService.java +++ /dev/null @@ -1,29 +0,0 @@ -package io.dataease.resource; - -import io.dataease.api.permissions.auth.dto.BusiPerCheckDTO; -import io.dataease.constant.AuthEnum; -import io.dataease.system.manage.CorePermissionManage; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Component; - -/** - * @Author Junjun - */ -@Component -public class ResourceService { - @Resource - private CorePermissionManage corePermissionManage; - - public boolean checkPermission(Long id) { - BusiPerCheckDTO dto = new BusiPerCheckDTO(); - dto.setId(id); - dto.setAuthEnum(AuthEnum.READ); - boolean b; - try { - b = corePermissionManage.checkAuth(dto); - } catch (Exception e) { - b = false; - } - return b; - } -} diff --git a/core/core-backend/src/main/java/io/dataease/system/manage/CorePermissionManage.java b/core/core-backend/src/main/java/io/dataease/system/manage/CorePermissionManage.java deleted file mode 100644 index e01e24a..0000000 --- a/core/core-backend/src/main/java/io/dataease/system/manage/CorePermissionManage.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.dataease.system.manage; - -import io.dataease.api.permissions.auth.dto.BusiPerCheckDTO; -import io.dataease.license.config.XpackInteract; -import org.springframework.stereotype.Component; - -@Component -public class CorePermissionManage { - - @XpackInteract(value = "corePermissionManage", replace = true) - public boolean checkAuth(BusiPerCheckDTO dto) { - return true; - } -} diff --git a/core/core-backend/src/main/java/io/dataease/CoreApplication.java b/core/core-backend/src/main/java/io/gisbi/CoreApplication.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/CoreApplication.java rename to core/core-backend/src/main/java/io/gisbi/CoreApplication.java index 7d8cd14..1f848f3 100644 --- a/core/core-backend/src/main/java/io/dataease/CoreApplication.java +++ b/core/core-backend/src/main/java/io/gisbi/CoreApplication.java @@ -1,6 +1,6 @@ -package io.dataease; +package io.gisbi; -import io.dataease.listener.EhCacheStartListener; +import io.gisbi.listener.EhCacheStartListener; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration; diff --git a/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java b/core/core-backend/src/main/java/io/gisbi/MybatisPlusGenerator.java similarity index 99% rename from core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java rename to core/core-backend/src/main/java/io/gisbi/MybatisPlusGenerator.java index e648e87..c5db994 100644 --- a/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java +++ b/core/core-backend/src/main/java/io/gisbi/MybatisPlusGenerator.java @@ -1,4 +1,4 @@ -package io.dataease; +package io.gisbi; import com.baomidou.mybatisplus.generator.FastAutoGenerator; import com.baomidou.mybatisplus.generator.config.DataSourceConfig; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/ChartHandlerManager.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/ChartHandlerManager.java similarity index 84% rename from core/core-backend/src/main/java/io/dataease/chart/charts/ChartHandlerManager.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/ChartHandlerManager.java index 5009fd7..b952348 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/ChartHandlerManager.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/ChartHandlerManager.java @@ -1,7 +1,7 @@ -package io.dataease.chart.charts; +package io.gisbi.chart.charts; -import io.dataease.chart.charts.impl.DefaultChartHandler; -import io.dataease.extensions.view.plugin.AbstractChartPlugin; +import io.gisbi.chart.charts.impl.DefaultChartHandler; +import io.gisbi.extensions.view.plugin.AbstractChartPlugin; import jakarta.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/DefaultChartHandler.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/DefaultChartHandler.java index 7b1af9f..7f00f9c 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/DefaultChartHandler.java @@ -1,32 +1,31 @@ -package io.dataease.chart.charts.impl; +package io.gisbi.chart.charts.impl; -import io.dataease.chart.charts.ChartHandlerManager; -import io.dataease.chart.constant.ChartConstants; -import io.dataease.chart.manage.ChartDataManage; -import io.dataease.chart.manage.ChartViewManege; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.dataset.manage.DatasetTableFieldManage; -import io.dataease.constant.SQLConstants; -import io.dataease.engine.sql.SQLProvider; -import io.dataease.engine.trans.Dimension2SQLObj; -import io.dataease.engine.trans.Quota2SQLObj; -import io.dataease.engine.utils.Utils; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; -import io.dataease.extensions.datasource.vo.XpackPluginsDatasourceVO; -import io.dataease.extensions.view.dto.*; -import io.dataease.extensions.view.plugin.AbstractChartPlugin; -import io.dataease.extensions.view.util.ChartDataUtil; -import io.dataease.extensions.view.util.FieldUtil; -import io.dataease.license.utils.LicenseUtil; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.JsonUtil; +import io.gisbi.chart.charts.ChartHandlerManager; +import io.gisbi.chart.constant.ChartConstants; +import io.gisbi.chart.manage.ChartDataManage; +import io.gisbi.chart.manage.ChartViewManege; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.dataset.manage.DatasetTableFieldManage; +import io.gisbi.constant.SQLConstants; +import io.gisbi.engine.sql.SQLProvider; +import io.gisbi.engine.trans.Dimension2SQLObj; +import io.gisbi.engine.trans.Quota2SQLObj; +import io.gisbi.engine.utils.Utils; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.vo.XpackPluginsDatasourceVO; +import io.gisbi.extensions.view.dto.*; +import io.gisbi.extensions.view.plugin.AbstractChartPlugin; +import io.gisbi.extensions.view.util.ChartDataUtil; +import io.gisbi.extensions.view.util.FieldUtil; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.JsonUtil; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import lombok.Getter; @@ -381,16 +380,14 @@ public class DefaultChartHandler extends AbstractChartPlugin { prefix = datasourceType.getPrefix(); suffix = datasourceType.getSuffix(); } else { - if (LicenseUtil.licenseValid()) { - List xpackPluginsDatasourceVOS = pluginManage.queryPluginDs(); - List list = xpackPluginsDatasourceVOS.stream().filter(ele -> StringUtils.equals(ele.getType(), dsType)).toList(); - if (ObjectUtils.isNotEmpty(list)) { - XpackPluginsDatasourceVO first = list.getFirst(); - prefix = first.getPrefix(); - suffix = first.getSuffix(); - } else { - DEException.throwException("当前数据源插件不存在"); - } + List xpackPluginsDatasourceVOS = pluginManage.queryPluginDs(); + List list = xpackPluginsDatasourceVOS.stream().filter(ele -> StringUtils.equals(ele.getType(), dsType)).toList(); + if (ObjectUtils.isNotEmpty(list)) { + XpackPluginsDatasourceVO first = list.getFirst(); + prefix = first.getPrefix(); + suffix = first.getSuffix(); + } else { + DEException.throwException("当前数据源插件不存在"); } } diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/ExtQuotaChartHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/ExtQuotaChartHandler.java similarity index 67% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/ExtQuotaChartHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/ExtQuotaChartHandler.java index d0fbaa5..bd6962b 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/ExtQuotaChartHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/ExtQuotaChartHandler.java @@ -1,9 +1,9 @@ -package io.dataease.chart.charts.impl; +package io.gisbi.chart.charts.impl; -import io.dataease.extensions.view.dto.AxisFormatResult; -import io.dataease.extensions.view.dto.ChartAxis; -import io.dataease.extensions.view.dto.ChartViewDTO; -import io.dataease.extensions.view.dto.ChartViewFieldDTO; +import io.gisbi.extensions.view.dto.AxisFormatResult; +import io.gisbi.extensions.view.dto.ChartAxis; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import io.gisbi.extensions.view.dto.ChartViewFieldDTO; import java.util.ArrayList; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/GroupChartHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/GroupChartHandler.java similarity index 61% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/GroupChartHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/GroupChartHandler.java index fb88f04..3a134ca 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/GroupChartHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/GroupChartHandler.java @@ -1,10 +1,10 @@ -package io.dataease.chart.charts.impl; +package io.gisbi.chart.charts.impl; -import io.dataease.extensions.view.dto.AxisFormatResult; -import io.dataease.extensions.view.dto.ChartAxis; -import io.dataease.extensions.view.dto.ChartViewDTO; -import io.dataease.extensions.view.dto.ChartViewFieldDTO; +import io.gisbi.extensions.view.dto.AxisFormatResult; +import io.gisbi.extensions.view.dto.ChartAxis; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import io.gisbi.extensions.view.dto.ChartViewFieldDTO; import java.util.ArrayList; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/YoyChartHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/YoyChartHandler.java similarity index 94% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/YoyChartHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/YoyChartHandler.java index 6f64f5b..d4af6b9 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/YoyChartHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/YoyChartHandler.java @@ -1,17 +1,17 @@ -package io.dataease.chart.charts.impl; +package io.gisbi.chart.charts.impl; import com.fasterxml.jackson.core.type.TypeReference; -import io.dataease.engine.sql.SQLProvider; -import io.dataease.engine.trans.ExtWhere2Str; -import io.dataease.engine.utils.Utils; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; -import io.dataease.extensions.view.util.FieldUtil; -import io.dataease.utils.JsonUtil; +import io.gisbi.engine.sql.SQLProvider; +import io.gisbi.engine.trans.ExtWhere2Str; +import io.gisbi.engine.utils.Utils; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; +import io.gisbi.extensions.view.util.FieldUtil; +import io.gisbi.utils.JsonUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/BarHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/BarHandler.java similarity index 86% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/BarHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/BarHandler.java index 455a4aa..7e83893 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/BarHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/BarHandler.java @@ -1,12 +1,12 @@ -package io.dataease.chart.charts.impl.bar; +package io.gisbi.chart.charts.impl.bar; -import io.dataease.chart.charts.impl.YoyChartHandler; -import io.dataease.engine.utils.Utils; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.charts.impl.YoyChartHandler; +import io.gisbi.engine.utils.Utils; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/BidirectionalBarHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/BidirectionalBarHandler.java similarity index 83% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/BidirectionalBarHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/BidirectionalBarHandler.java index 1b04272..a90c943 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/BidirectionalBarHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/BidirectionalBarHandler.java @@ -1,4 +1,4 @@ -package io.dataease.chart.charts.impl.bar; +package io.gisbi.chart.charts.impl.bar; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/GroupBarHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/GroupBarHandler.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/GroupBarHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/GroupBarHandler.java index f4dc3f6..f123608 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/GroupBarHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/GroupBarHandler.java @@ -1,7 +1,7 @@ -package io.dataease.chart.charts.impl.bar; +package io.gisbi.chart.charts.impl.bar; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/ProgressBarHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/ProgressBarHandler.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/ProgressBarHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/ProgressBarHandler.java index 49fc7e7..34369fd 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/ProgressBarHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/ProgressBarHandler.java @@ -1,7 +1,7 @@ -package io.dataease.chart.charts.impl.bar; +package io.gisbi.chart.charts.impl.bar; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/RangeBarHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/RangeBarHandler.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/RangeBarHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/RangeBarHandler.java index 8ebe6be..76c0fde 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/RangeBarHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/RangeBarHandler.java @@ -1,10 +1,10 @@ -package io.dataease.chart.charts.impl.bar; +package io.gisbi.chart.charts.impl.bar; -import io.dataease.chart.charts.impl.YoyChartHandler; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.charts.impl.YoyChartHandler; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/StackBarHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/StackBarHandler.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/StackBarHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/StackBarHandler.java index 82f0827..78f39f5 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/StackBarHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/StackBarHandler.java @@ -1,7 +1,7 @@ -package io.dataease.chart.charts.impl.bar; +package io.gisbi.chart.charts.impl.bar; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/StackGroupBarHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/StackGroupBarHandler.java similarity index 93% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/StackGroupBarHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/StackGroupBarHandler.java index e023426..c12dc16 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/StackGroupBarHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/StackGroupBarHandler.java @@ -1,7 +1,7 @@ -package io.dataease.chart.charts.impl.bar; +package io.gisbi.chart.charts.impl.bar; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Component; @@ -12,8 +12,8 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import static io.dataease.extensions.view.dto.ChartAxis.extStack; -import static io.dataease.extensions.view.dto.ChartAxis.xAxisExt; +import static io.gisbi.extensions.view.dto.ChartAxis.extStack; +import static io.gisbi.extensions.view.dto.ChartAxis.xAxisExt; @Component public class StackGroupBarHandler extends BarHandler { diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/AreaHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/AreaHandler.java similarity index 87% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/AreaHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/AreaHandler.java index ea1787d..5de7abc 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/AreaHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/AreaHandler.java @@ -1,7 +1,7 @@ -package io.dataease.chart.charts.impl.line; +package io.gisbi.chart.charts.impl.line; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/LineHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/LineHandler.java similarity index 88% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/LineHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/LineHandler.java index 5c6af48..5f90baa 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/LineHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/LineHandler.java @@ -1,12 +1,12 @@ -package io.dataease.chart.charts.impl.line; +package io.gisbi.chart.charts.impl.line; -import io.dataease.chart.charts.impl.YoyChartHandler; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.charts.impl.YoyChartHandler; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/StackAreaHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/StackAreaHandler.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/StackAreaHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/StackAreaHandler.java index 4a12101..70b9a4f 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/StackAreaHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/StackAreaHandler.java @@ -1,13 +1,13 @@ -package io.dataease.chart.charts.impl.line; +package io.gisbi.chart.charts.impl.line; -import io.dataease.chart.charts.impl.YoyChartHandler; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.engine.utils.Utils; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.charts.impl.YoyChartHandler; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.engine.utils.Utils; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/BubbleMapHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/BubbleMapHandler.java similarity index 60% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/BubbleMapHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/BubbleMapHandler.java index 1b926b1..a913f15 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/BubbleMapHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/BubbleMapHandler.java @@ -1,8 +1,8 @@ -package io.dataease.chart.charts.impl.map; +package io.gisbi.chart.charts.impl.map; -import io.dataease.chart.charts.impl.ExtQuotaChartHandler; -import io.dataease.extensions.view.dto.AxisFormatResult; -import io.dataease.extensions.view.dto.ChartViewDTO; +import io.gisbi.chart.charts.impl.ExtQuotaChartHandler; +import io.gisbi.extensions.view.dto.AxisFormatResult; +import io.gisbi.extensions.view.dto.ChartViewDTO; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/FlowMapHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/FlowMapHandler.java similarity index 73% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/FlowMapHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/FlowMapHandler.java index 1116ace..1fe0c2b 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/FlowMapHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/FlowMapHandler.java @@ -1,9 +1,9 @@ -package io.dataease.chart.charts.impl.map; +package io.gisbi.chart.charts.impl.map; -import io.dataease.chart.charts.impl.GroupChartHandler; -import io.dataease.extensions.view.dto.AxisFormatResult; -import io.dataease.extensions.view.dto.ChartAxis; -import io.dataease.extensions.view.dto.ChartViewDTO; +import io.gisbi.chart.charts.impl.GroupChartHandler; +import io.gisbi.extensions.view.dto.AxisFormatResult; +import io.gisbi.extensions.view.dto.ChartAxis; +import io.gisbi.extensions.view.dto.ChartViewDTO; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/HeatMapHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/HeatMapHandler.java similarity index 81% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/HeatMapHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/HeatMapHandler.java index e210bf9..8e1cdaa 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/HeatMapHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/HeatMapHandler.java @@ -1,8 +1,8 @@ -package io.dataease.chart.charts.impl.map; +package io.gisbi.chart.charts.impl.map; -import io.dataease.chart.charts.impl.DefaultChartHandler; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.charts.impl.DefaultChartHandler; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/MapHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/MapHandler.java new file mode 100644 index 0000000..8259def --- /dev/null +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/MapHandler.java @@ -0,0 +1,15 @@ +package io.gisbi.chart.charts.impl.map; + +import io.gisbi.chart.charts.impl.ExtQuotaChartHandler; +import io.gisbi.extensions.view.dto.AxisFormatResult; +import io.gisbi.extensions.view.dto.ChartAxis; +import io.gisbi.chart.charts.impl.DefaultChartHandler; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import lombok.Getter; +import org.springframework.stereotype.Component; + +@Component +public class MapHandler extends ExtQuotaChartHandler { + @Getter + private String type = "map"; +} diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/SymbolicMapHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/SymbolicMapHandler.java similarity index 88% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/SymbolicMapHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/SymbolicMapHandler.java index 547ee0a..b19f87a 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/SymbolicMapHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/SymbolicMapHandler.java @@ -1,23 +1,23 @@ -package io.dataease.chart.charts.impl.map; +package io.gisbi.chart.charts.impl.map; -import io.dataease.chart.charts.impl.GroupChartHandler; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.dataset.manage.DatasetDataManage; -import io.dataease.engine.sql.SQLProvider; -import io.dataease.engine.trans.Dimension2SQLObj; -import io.dataease.engine.trans.Field2SQLObj; -import io.dataease.engine.trans.Quota2SQLObj; -import io.dataease.engine.trans.Table2SQLObj; -import io.dataease.engine.utils.Utils; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; -import io.dataease.extensions.view.util.ChartDataUtil; -import io.dataease.extensions.view.util.FieldUtil; -import io.dataease.utils.BeanUtils; +import io.gisbi.chart.charts.impl.GroupChartHandler; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.dataset.manage.DatasetDataManage; +import io.gisbi.engine.sql.SQLProvider; +import io.gisbi.engine.trans.Dimension2SQLObj; +import io.gisbi.engine.trans.Field2SQLObj; +import io.gisbi.engine.trans.Quota2SQLObj; +import io.gisbi.engine.trans.Table2SQLObj; +import io.gisbi.engine.utils.Utils; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; +import io.gisbi.extensions.view.util.ChartDataUtil; +import io.gisbi.extensions.view.util.FieldUtil; +import io.gisbi.utils.BeanUtils; import jakarta.annotation.Resource; import lombok.Getter; import org.apache.commons.collections4.CollectionUtils; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/DualLineMixHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/DualLineMixHandler.java similarity index 76% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/DualLineMixHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/DualLineMixHandler.java index 491d6c9..56a9c2e 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/DualLineMixHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/DualLineMixHandler.java @@ -1,10 +1,10 @@ -package io.dataease.chart.charts.impl.mix; +package io.gisbi.chart.charts.impl.mix; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.extensions.view.dto.AxisFormatResult; -import io.dataease.extensions.view.dto.ChartAxis; -import io.dataease.extensions.view.dto.ChartViewDTO; -import io.dataease.extensions.view.dto.CustomFilterResult; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.extensions.view.dto.AxisFormatResult; +import io.gisbi.extensions.view.dto.ChartAxis; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import io.gisbi.extensions.view.dto.CustomFilterResult; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/GroupMixHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/GroupMixHandler.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/GroupMixHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/GroupMixHandler.java index c1e6c71..378fb82 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/GroupMixHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/GroupMixHandler.java @@ -1,6 +1,6 @@ -package io.dataease.chart.charts.impl.mix; +package io.gisbi.chart.charts.impl.mix; -import io.dataease.extensions.view.dto.*; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/MixHandler.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/MixHandler.java index 5884849..9977cee 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/MixHandler.java @@ -1,13 +1,13 @@ -package io.dataease.chart.charts.impl.mix; +package io.gisbi.chart.charts.impl.mix; -import io.dataease.chart.charts.impl.YoyChartHandler; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.engine.utils.Utils; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.charts.impl.YoyChartHandler; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.engine.utils.Utils; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/StackMixHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/StackMixHandler.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/StackMixHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/StackMixHandler.java index f38e59c..1390ae8 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/StackMixHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/StackMixHandler.java @@ -1,7 +1,7 @@ -package io.dataease.chart.charts.impl.mix; +package io.gisbi.chart.charts.impl.mix; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/GaugeHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/GaugeHandler.java similarity index 81% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/GaugeHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/GaugeHandler.java index ca0ffee..ac1a599 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/GaugeHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/GaugeHandler.java @@ -1,10 +1,10 @@ -package io.dataease.chart.charts.impl.numeric; +package io.gisbi.chart.charts.impl.numeric; -import io.dataease.extensions.view.dto.AxisFormatResult; -import io.dataease.extensions.view.dto.ChartAxis; -import io.dataease.dataset.manage.DatasetTableFieldManage; -import io.dataease.extensions.view.dto.ChartViewDTO; -import io.dataease.extensions.view.dto.ChartViewFieldDTO; +import io.gisbi.extensions.view.dto.AxisFormatResult; +import io.gisbi.extensions.view.dto.ChartAxis; +import io.gisbi.dataset.manage.DatasetTableFieldManage; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import io.gisbi.extensions.view.dto.ChartViewFieldDTO; import jakarta.annotation.Resource; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/IndicatorHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/IndicatorHandler.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/IndicatorHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/IndicatorHandler.java index 7802e4d..5f7531e 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/IndicatorHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/IndicatorHandler.java @@ -1,10 +1,10 @@ -package io.dataease.chart.charts.impl.numeric; +package io.gisbi.chart.charts.impl.numeric; -import io.dataease.chart.charts.impl.YoyChartHandler; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.charts.impl.YoyChartHandler; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/LiquidHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/LiquidHandler.java similarity index 80% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/LiquidHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/LiquidHandler.java index a2fcbca..c1143ad 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/LiquidHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/LiquidHandler.java @@ -1,9 +1,9 @@ -package io.dataease.chart.charts.impl.numeric; +package io.gisbi.chart.charts.impl.numeric; -import io.dataease.extensions.view.dto.AxisFormatResult; -import io.dataease.extensions.view.dto.ChartAxis; -import io.dataease.extensions.view.dto.ChartViewDTO; -import io.dataease.extensions.view.dto.ChartViewFieldDTO; +import io.gisbi.extensions.view.dto.AxisFormatResult; +import io.gisbi.extensions.view.dto.ChartAxis; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import io.gisbi.extensions.view.dto.ChartViewFieldDTO; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/NumericalChartHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/NumericalChartHandler.java similarity index 82% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/NumericalChartHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/NumericalChartHandler.java index 62530e0..1b91c0c 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/NumericalChartHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/NumericalChartHandler.java @@ -1,20 +1,20 @@ -package io.dataease.chart.charts.impl.numeric; +package io.gisbi.chart.charts.impl.numeric; -import io.dataease.chart.charts.impl.DefaultChartHandler; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.engine.sql.SQLProvider; -import io.dataease.engine.trans.Quota2SQLObj; -import io.dataease.engine.utils.Utils; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; -import io.dataease.extensions.view.util.FieldUtil; -import io.dataease.i18n.Translator; -import io.dataease.utils.BeanUtils; +import io.gisbi.chart.charts.impl.DefaultChartHandler; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.engine.sql.SQLProvider; +import io.gisbi.engine.trans.Quota2SQLObj; +import io.gisbi.engine.utils.Utils; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; +import io.gisbi.extensions.view.util.FieldUtil; +import io.gisbi.i18n.Translator; +import io.gisbi.utils.BeanUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/FunnelHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/FunnelHandler.java similarity index 64% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/FunnelHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/FunnelHandler.java index b5f6434..ee68346 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/FunnelHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/FunnelHandler.java @@ -1,6 +1,6 @@ -package io.dataease.chart.charts.impl.others; +package io.gisbi.chart.charts.impl.others; -import io.dataease.chart.charts.impl.ExtQuotaChartHandler; +import io.gisbi.chart.charts.impl.ExtQuotaChartHandler; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/RadarHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/RadarHandler.java similarity index 66% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/RadarHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/RadarHandler.java index c84f12d..97b4177 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/RadarHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/RadarHandler.java @@ -1,10 +1,10 @@ -package io.dataease.chart.charts.impl.others; +package io.gisbi.chart.charts.impl.others; -import io.dataease.chart.charts.impl.DefaultChartHandler; -import io.dataease.chart.charts.impl.YoyChartHandler; -import io.dataease.extensions.view.dto.AxisFormatResult; -import io.dataease.extensions.view.dto.ChartAxis; -import io.dataease.extensions.view.dto.ChartViewDTO; +import io.gisbi.chart.charts.impl.DefaultChartHandler; +import io.gisbi.chart.charts.impl.YoyChartHandler; +import io.gisbi.extensions.view.dto.AxisFormatResult; +import io.gisbi.extensions.view.dto.ChartAxis; +import io.gisbi.extensions.view.dto.ChartViewDTO; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/RichTextHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/RichTextHandler.java similarity index 70% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/RichTextHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/RichTextHandler.java index b057d67..81a06fc 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/RichTextHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/RichTextHandler.java @@ -1,6 +1,6 @@ -package io.dataease.chart.charts.impl.others; +package io.gisbi.chart.charts.impl.others; -import io.dataease.chart.charts.impl.YoyChartHandler; +import io.gisbi.chart.charts.impl.YoyChartHandler; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/SankeyHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/SankeyHandler.java similarity index 64% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/SankeyHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/SankeyHandler.java index 788644c..80530b4 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/SankeyHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/SankeyHandler.java @@ -1,6 +1,6 @@ -package io.dataease.chart.charts.impl.others; +package io.gisbi.chart.charts.impl.others; -import io.dataease.chart.charts.impl.GroupChartHandler; +import io.gisbi.chart.charts.impl.GroupChartHandler; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/TreemapHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/TreemapHandler.java similarity index 64% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/TreemapHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/TreemapHandler.java index 4513004..9ae4f36 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/TreemapHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/TreemapHandler.java @@ -1,6 +1,6 @@ -package io.dataease.chart.charts.impl.others; +package io.gisbi.chart.charts.impl.others; -import io.dataease.chart.charts.impl.ExtQuotaChartHandler; +import io.gisbi.chart.charts.impl.ExtQuotaChartHandler; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/WaterfallHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/WaterfallHandler.java similarity index 65% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/WaterfallHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/WaterfallHandler.java index 76a0ae2..d1fc7b2 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/others/WaterfallHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/WaterfallHandler.java @@ -1,6 +1,6 @@ -package io.dataease.chart.charts.impl.others; +package io.gisbi.chart.charts.impl.others; -import io.dataease.chart.charts.impl.ExtQuotaChartHandler; +import io.gisbi.chart.charts.impl.ExtQuotaChartHandler; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/WordCloudHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/WordCloudHandler.java new file mode 100644 index 0000000..942ad56 --- /dev/null +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/others/WordCloudHandler.java @@ -0,0 +1,15 @@ +package io.gisbi.chart.charts.impl.others; + +import io.gisbi.chart.charts.impl.DefaultChartHandler; +import io.gisbi.chart.charts.impl.ExtQuotaChartHandler; +import io.gisbi.extensions.view.dto.AxisFormatResult; +import io.gisbi.extensions.view.dto.ChartAxis; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import lombok.Getter; +import org.springframework.stereotype.Component; + +@Component +public class WordCloudHandler extends ExtQuotaChartHandler { + @Getter + private String type = "word-cloud"; +} diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/pie/PieHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/pie/PieHandler.java similarity index 78% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/pie/PieHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/pie/PieHandler.java index c859f4c..a05cc7b 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/pie/PieHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/pie/PieHandler.java @@ -1,9 +1,9 @@ -package io.dataease.chart.charts.impl.pie; +package io.gisbi.chart.charts.impl.pie; -import io.dataease.chart.charts.impl.YoyChartHandler; -import io.dataease.extensions.view.dto.AxisFormatResult; -import io.dataease.extensions.view.dto.ChartAxis; -import io.dataease.extensions.view.dto.ChartViewDTO; +import io.gisbi.chart.charts.impl.YoyChartHandler; +import io.gisbi.extensions.view.dto.AxisFormatResult; +import io.gisbi.extensions.view.dto.ChartAxis; +import io.gisbi.extensions.view.dto.ChartViewDTO; import org.springframework.stereotype.Component; @Component diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/scatter/QuadrantHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/scatter/QuadrantHandler.java similarity index 88% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/scatter/QuadrantHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/scatter/QuadrantHandler.java index 8017af4..c2d7810 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/scatter/QuadrantHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/scatter/QuadrantHandler.java @@ -1,8 +1,8 @@ -package io.dataease.chart.charts.impl.scatter; +package io.gisbi.chart.charts.impl.scatter; -import io.dataease.chart.charts.impl.YoyChartHandler; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.charts.impl.YoyChartHandler; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/scatter/ScatterHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/scatter/ScatterHandler.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/scatter/ScatterHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/scatter/ScatterHandler.java index 90037d3..82b420e 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/scatter/ScatterHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/scatter/ScatterHandler.java @@ -1,8 +1,8 @@ -package io.dataease.chart.charts.impl.scatter; +package io.gisbi.chart.charts.impl.scatter; -import io.dataease.chart.charts.impl.YoyChartHandler; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.charts.impl.YoyChartHandler; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableHeatmapHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableHeatmapHandler.java similarity index 82% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableHeatmapHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableHeatmapHandler.java index 4ca16e7..dae3acf 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableHeatmapHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableHeatmapHandler.java @@ -1,18 +1,18 @@ -package io.dataease.chart.charts.impl.table; +package io.gisbi.chart.charts.impl.table; -import io.dataease.chart.charts.impl.DefaultChartHandler; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.engine.sql.SQLProvider; -import io.dataease.engine.trans.Dimension2SQLObj; -import io.dataease.engine.trans.Quota2SQLObj; -import io.dataease.engine.utils.Utils; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; -import io.dataease.extensions.view.util.ChartDataUtil; -import io.dataease.extensions.view.util.FieldUtil; +import io.gisbi.chart.charts.impl.DefaultChartHandler; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.engine.sql.SQLProvider; +import io.gisbi.engine.trans.Dimension2SQLObj; +import io.gisbi.engine.trans.Quota2SQLObj; +import io.gisbi.engine.utils.Utils; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; +import io.gisbi.extensions.view.util.ChartDataUtil; +import io.gisbi.extensions.view.util.FieldUtil; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableInfoHandler.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableInfoHandler.java index 923a43a..2d08831 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableInfoHandler.java @@ -1,18 +1,18 @@ -package io.dataease.chart.charts.impl.table; +package io.gisbi.chart.charts.impl.table; -import io.dataease.api.chart.dto.PageInfo; -import io.dataease.chart.charts.impl.DefaultChartHandler; -import io.dataease.engine.sql.SQLProvider; -import io.dataease.engine.trans.Dimension2SQLObj; -import io.dataease.engine.utils.Utils; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; -import io.dataease.extensions.view.util.ChartDataUtil; -import io.dataease.extensions.view.util.FieldUtil; -import io.dataease.utils.BeanUtils; +import io.gisbi.api.chart.dto.PageInfo; +import io.gisbi.chart.charts.impl.DefaultChartHandler; +import io.gisbi.engine.sql.SQLProvider; +import io.gisbi.engine.trans.Dimension2SQLObj; +import io.gisbi.engine.utils.Utils; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; +import io.gisbi.extensions.view.util.ChartDataUtil; +import io.gisbi.extensions.view.util.FieldUtil; +import io.gisbi.utils.BeanUtils; import lombok.Getter; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableNormalHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableNormalHandler.java similarity index 81% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableNormalHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableNormalHandler.java index 27f7913..7fb8135 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableNormalHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableNormalHandler.java @@ -1,11 +1,11 @@ -package io.dataease.chart.charts.impl.table; +package io.gisbi.chart.charts.impl.table; -import io.dataease.chart.charts.impl.YoyChartHandler; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; +import io.gisbi.chart.charts.impl.YoyChartHandler; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; import lombok.Getter; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TablePivotHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TablePivotHandler.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TablePivotHandler.java rename to core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TablePivotHandler.java index 75b4680..b7bcd76 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TablePivotHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TablePivotHandler.java @@ -1,21 +1,21 @@ -package io.dataease.chart.charts.impl.table; +package io.gisbi.chart.charts.impl.table; -import io.dataease.chart.charts.impl.GroupChartHandler; -import io.dataease.constant.DeTypeConstants; -import io.dataease.engine.constant.ExtFieldConstant; -import io.dataease.engine.sql.SQLProvider; -import io.dataease.engine.trans.Dimension2SQLObj; -import io.dataease.engine.trans.Quota2SQLObj; -import io.dataease.engine.utils.Utils; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; -import io.dataease.extensions.view.util.FieldUtil; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.IDUtils; -import io.dataease.utils.JsonUtil; +import io.gisbi.chart.charts.impl.GroupChartHandler; +import io.gisbi.constant.DeTypeConstants; +import io.gisbi.engine.constant.ExtFieldConstant; +import io.gisbi.engine.sql.SQLProvider; +import io.gisbi.engine.trans.Dimension2SQLObj; +import io.gisbi.engine.trans.Quota2SQLObj; +import io.gisbi.engine.utils.Utils; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; +import io.gisbi.extensions.view.util.FieldUtil; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.IDUtils; +import io.gisbi.utils.JsonUtil; import lombok.Getter; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/chart/constant/ChartConstants.java b/core/core-backend/src/main/java/io/gisbi/chart/constant/ChartConstants.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/chart/constant/ChartConstants.java rename to core/core-backend/src/main/java/io/gisbi/chart/constant/ChartConstants.java index 16ff1fe..0e22c8e 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/constant/ChartConstants.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/constant/ChartConstants.java @@ -1,7 +1,7 @@ -package io.dataease.chart.constant; +package io.gisbi.chart.constant; /** - * @Author gin + * @Author bi-coder */ public class ChartConstants { public static final String YEAR_MOM = "year_mom"; diff --git a/core/core-backend/src/main/java/io/dataease/chart/dao/auto/entity/CoreChartView.java b/core/core-backend/src/main/java/io/gisbi/chart/dao/auto/entity/CoreChartView.java similarity index 99% rename from core/core-backend/src/main/java/io/dataease/chart/dao/auto/entity/CoreChartView.java rename to core/core-backend/src/main/java/io/gisbi/chart/dao/auto/entity/CoreChartView.java index 6307ee4..6ca0143 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/dao/auto/entity/CoreChartView.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/dao/auto/entity/CoreChartView.java @@ -1,4 +1,4 @@ -package io.dataease.chart.dao.auto.entity; +package io.gisbi.chart.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * 组件图表表 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-12-12 */ @TableName("core_chart_view") diff --git a/core/core-backend/src/main/java/io/dataease/chart/dao/auto/mapper/CoreChartViewMapper.java b/core/core-backend/src/main/java/io/gisbi/chart/dao/auto/mapper/CoreChartViewMapper.java similarity index 68% rename from core/core-backend/src/main/java/io/dataease/chart/dao/auto/mapper/CoreChartViewMapper.java rename to core/core-backend/src/main/java/io/gisbi/chart/dao/auto/mapper/CoreChartViewMapper.java index 6b9fa61..8198e6c 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/dao/auto/mapper/CoreChartViewMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/dao/auto/mapper/CoreChartViewMapper.java @@ -1,6 +1,6 @@ -package io.dataease.chart.dao.auto.mapper; +package io.gisbi.chart.dao.auto.mapper; -import io.dataease.chart.dao.auto.entity.CoreChartView; +import io.gisbi.chart.dao.auto.entity.CoreChartView; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 组件图表表 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-12-12 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/chart/dao/ext/entity/ChartBasePO.java b/core/core-backend/src/main/java/io/gisbi/chart/dao/ext/entity/ChartBasePO.java similarity index 94% rename from core/core-backend/src/main/java/io/dataease/chart/dao/ext/entity/ChartBasePO.java rename to core/core-backend/src/main/java/io/gisbi/chart/dao/ext/entity/ChartBasePO.java index d490d87..cf48f29 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/dao/ext/entity/ChartBasePO.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/dao/ext/entity/ChartBasePO.java @@ -1,4 +1,4 @@ -package io.dataease.chart.dao.ext.entity; +package io.gisbi.chart.dao.ext.entity; import lombok.Data; diff --git a/core/core-backend/src/main/java/io/dataease/chart/dao/ext/mapper/ExtChartViewMapper.java b/core/core-backend/src/main/java/io/gisbi/chart/dao/ext/mapper/ExtChartViewMapper.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/chart/dao/ext/mapper/ExtChartViewMapper.java rename to core/core-backend/src/main/java/io/gisbi/chart/dao/ext/mapper/ExtChartViewMapper.java index 8580789..c517bf8 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/dao/ext/mapper/ExtChartViewMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/dao/ext/mapper/ExtChartViewMapper.java @@ -1,7 +1,7 @@ -package io.dataease.chart.dao.ext.mapper; +package io.gisbi.chart.dao.ext.mapper; -import io.dataease.api.chart.vo.ViewSelectorVO; -import io.dataease.chart.dao.ext.entity.ChartBasePO; +import io.gisbi.api.chart.vo.ViewSelectorVO; +import io.gisbi.chart.dao.ext.entity.ChartBasePO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartDataManage.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java rename to core/core-backend/src/main/java/io/gisbi/chart/manage/ChartDataManage.java index b72e22a..c7b53de 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartDataManage.java @@ -1,37 +1,35 @@ -package io.dataease.chart.manage; +package io.gisbi.chart.manage; -import io.dataease.api.dataset.union.DatasetGroupInfoDTO; -import io.dataease.api.permissions.auth.dto.BusiPerCheckDTO; -import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO; -import io.dataease.chart.charts.ChartHandlerManager; -import io.dataease.chart.constant.ChartConstants; -import io.dataease.constant.AuthEnum; -import io.dataease.dataset.manage.DatasetGroupManage; -import io.dataease.dataset.manage.DatasetSQLManage; -import io.dataease.dataset.manage.DatasetTableFieldManage; -import io.dataease.dataset.manage.PermissionManage; -import io.dataease.engine.sql.SQLProvider; -import io.dataease.engine.trans.*; -import io.dataease.engine.utils.SQLUtils; -import io.dataease.engine.utils.Utils; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.factory.ProviderFactory; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; -import io.dataease.extensions.view.factory.PluginsChartFactory; -import io.dataease.extensions.view.filter.FilterTreeObj; -import io.dataease.extensions.view.plugin.AbstractChartPlugin; -import io.dataease.extensions.view.util.FieldUtil; -import io.dataease.i18n.Translator; -import io.dataease.result.ResultCode; -import io.dataease.system.manage.CorePermissionManage; -import io.dataease.utils.AuthUtils; -import io.dataease.utils.BeanUtils; +import io.gisbi.api.dataset.union.DatasetGroupInfoDTO; + +import io.gisbi.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO; +import io.gisbi.chart.charts.ChartHandlerManager; +import io.gisbi.chart.constant.ChartConstants; +import io.gisbi.dataset.manage.DatasetGroupManage; +import io.gisbi.dataset.manage.DatasetSQLManage; +import io.gisbi.dataset.manage.DatasetTableFieldManage; +import io.gisbi.dataset.manage.PermissionManage; +import io.gisbi.engine.sql.SQLProvider; +import io.gisbi.engine.trans.*; +import io.gisbi.engine.utils.SQLUtils; +import io.gisbi.engine.utils.Utils; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.factory.ProviderFactory; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; +import io.gisbi.extensions.view.factory.PluginsChartFactory; +import io.gisbi.extensions.view.filter.FilterTreeObj; +import io.gisbi.extensions.view.plugin.AbstractChartPlugin; +import io.gisbi.extensions.view.util.FieldUtil; +import io.gisbi.i18n.Translator; +import io.gisbi.result.ResultCode; +import io.gisbi.utils.AuthUtils; +import io.gisbi.utils.BeanUtils; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; @@ -47,7 +45,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Author Junjun + * @Author bi-coder */ @Component public class ChartDataManage { @@ -60,14 +58,12 @@ public class ChartDataManage { @Resource private ChartViewManege chartViewManege; @Resource - private PermissionManage permissionManage; - @Resource private ChartFilterTreeService chartFilterTreeService; @Resource private ChartHandlerManager chartHandlerManager; - @Resource - private CorePermissionManage corePermissionManage; + private PermissionManage permissionManage; + @Autowired(required = false) private PluginManageApi pluginManage; @@ -115,13 +111,13 @@ public class ChartDataManage { DEException.throwException(ResultCode.DATA_IS_WRONG.code(), Translator.get("i18n_no_ds")); } // check permission - BusiPerCheckDTO dto = new BusiPerCheckDTO(); - dto.setId(table.getId()); - dto.setAuthEnum(AuthEnum.READ); - boolean checked = corePermissionManage.checkAuth(dto); - if (!checked) { - DEException.throwException(Translator.get("i18n_no_dataset_permission")); - } +// BusiPerCheckDTO dto = new BusiPerCheckDTO(); +// dto.setId(table.getId()); +// dto.setAuthEnum(AuthEnum.READ); +// boolean checked = corePermissionManage.checkAuth(dto); +// if (!checked) { +// DEException.throwException(Translator.get("i18n_no_dataset_permission")); +// } List allFields = getAllChartFields(view); // column permission diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartFilterTreeService.java b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartFilterTreeService.java similarity index 85% rename from core/core-backend/src/main/java/io/dataease/chart/manage/ChartFilterTreeService.java rename to core/core-backend/src/main/java/io/gisbi/chart/manage/ChartFilterTreeService.java index 350daf5..ad9abb2 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartFilterTreeService.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartFilterTreeService.java @@ -1,16 +1,16 @@ -package io.dataease.chart.manage; +package io.gisbi.chart.manage; import com.fasterxml.jackson.core.type.TypeReference; -import io.dataease.dataset.dao.auto.entity.CoreDatasetTableField; -import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper; -import io.dataease.engine.utils.SQLUtils; -import io.dataease.extensions.datasource.dto.CalParam; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.FieldGroupDTO; -import io.dataease.extensions.view.filter.FilterTreeItem; -import io.dataease.extensions.view.filter.FilterTreeObj; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.JsonUtil; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetTableField; +import io.gisbi.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper; +import io.gisbi.engine.utils.SQLUtils; +import io.gisbi.extensions.datasource.dto.CalParam; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.FieldGroupDTO; +import io.gisbi.extensions.view.filter.FilterTreeItem; +import io.gisbi.extensions.view.filter.FilterTreeObj; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.JsonUtil; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -21,7 +21,7 @@ import java.util.List; import java.util.stream.Collectors; /** - * @Author Junjun + * @Author bi-coder */ @Service public class ChartFilterTreeService { diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewManege.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java rename to core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewManege.java index 2271447..2604295 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewManege.java @@ -1,39 +1,37 @@ -package io.dataease.chart.manage; +package io.gisbi.chart.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import io.dataease.api.chart.vo.ChartBaseVO; -import io.dataease.api.chart.vo.ViewSelectorVO; -import io.dataease.chart.dao.auto.entity.CoreChartView; -import io.dataease.chart.dao.auto.mapper.CoreChartViewMapper; -import io.dataease.chart.dao.ext.entity.ChartBasePO; -import io.dataease.chart.dao.ext.mapper.ExtChartViewMapper; -import io.dataease.dataset.dao.auto.entity.CoreDatasetTableField; -import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper; -import io.dataease.dataset.manage.DatasetTableFieldManage; -import io.dataease.dataset.manage.PermissionManage; -import io.dataease.dataset.utils.TableUtils; -import io.dataease.engine.constant.ExtFieldConstant; -import io.dataease.engine.func.FunctionConstant; -import io.dataease.engine.utils.Utils; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.dto.CalParam; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.FieldGroupDTO; -import io.dataease.extensions.datasource.model.SQLObj; -import io.dataease.extensions.view.dto.*; -import io.dataease.extensions.view.filter.FilterTreeObj; -import io.dataease.i18n.Translator; -import io.dataease.license.config.XpackInteract; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.IDUtils; -import io.dataease.utils.JsonUtil; -import io.dataease.utils.LogUtil; -import io.dataease.visualization.dao.auto.entity.DataVisualizationInfo; -import io.dataease.visualization.dao.auto.mapper.DataVisualizationInfoMapper; +import io.gisbi.api.chart.vo.ChartBaseVO; +import io.gisbi.api.chart.vo.ViewSelectorVO; +import io.gisbi.chart.dao.auto.entity.CoreChartView; +import io.gisbi.chart.dao.auto.mapper.CoreChartViewMapper; +import io.gisbi.chart.dao.ext.entity.ChartBasePO; +import io.gisbi.chart.dao.ext.mapper.ExtChartViewMapper; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetTableField; +import io.gisbi.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper; +import io.gisbi.dataset.manage.DatasetTableFieldManage; +import io.gisbi.dataset.utils.TableUtils; +import io.gisbi.engine.constant.ExtFieldConstant; +import io.gisbi.engine.func.FunctionConstant; +import io.gisbi.engine.utils.Utils; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.dto.CalParam; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.FieldGroupDTO; +import io.gisbi.extensions.datasource.model.SQLObj; +import io.gisbi.extensions.view.dto.*; +import io.gisbi.extensions.view.filter.FilterTreeObj; +import io.gisbi.i18n.Translator; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.IDUtils; +import io.gisbi.utils.JsonUtil; +import io.gisbi.utils.LogUtil; +import io.gisbi.visualization.dao.auto.entity.DataVisualizationInfo; +import io.gisbi.visualization.dao.auto.mapper.DataVisualizationInfoMapper; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -50,7 +48,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** - * @Author Junjun + * @Author bi-coder */ @Component public class ChartViewManege { @@ -60,8 +58,7 @@ public class ChartViewManege { private ChartDataManage chartDataManage; @Resource private CoreDatasetTableFieldMapper coreDatasetTableFieldMapper; - @Resource - private PermissionManage permissionManage; + @Resource private DataVisualizationInfoMapper visualizationInfoMapper; @@ -105,7 +102,6 @@ public class ChartViewManege { coreChartViewMapper.deleteById(id); } - @XpackInteract(value = "chartViewManage") public void disuse(List chartIdList) { } @@ -224,7 +220,8 @@ public class ChartViewManege { }).collect(Collectors.toList()); // filter column disable field Map desensitizationList = new HashMap<>(); - List datasetTableFieldDTOS = permissionManage.filterColumnPermissions(collect, desensitizationList, id, null); +// List datasetTableFieldDTOS = permissionManage.filterColumnPermissions(collect, desensitizationList, id, null); + List datasetTableFieldDTOS = collect; datasetTableFieldDTOS.forEach(ele -> ele.setDesensitized(desensitizationList.containsKey(ele.getDataeaseName()))); datasetTableFieldDTOS.add(createCountField(id)); List list = transFieldDTO(datasetTableFieldDTOS); diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewOldDataMergeService.java b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewOldDataMergeService.java similarity index 94% rename from core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewOldDataMergeService.java rename to core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewOldDataMergeService.java index 16592f0..a892ff2 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewOldDataMergeService.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewOldDataMergeService.java @@ -1,14 +1,14 @@ -package io.dataease.chart.manage; +package io.gisbi.chart.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; -import io.dataease.chart.dao.auto.entity.CoreChartView; -import io.dataease.chart.dao.auto.mapper.CoreChartViewMapper; -import io.dataease.extensions.view.dto.ChartCustomFilterItemDTO; -import io.dataease.extensions.view.dto.ChartFieldCustomFilterDTO; -import io.dataease.extensions.view.filter.FilterTreeItem; -import io.dataease.extensions.view.filter.FilterTreeObj; -import io.dataease.utils.JsonUtil; +import io.gisbi.chart.dao.auto.entity.CoreChartView; +import io.gisbi.chart.dao.auto.mapper.CoreChartViewMapper; +import io.gisbi.extensions.view.dto.ChartCustomFilterItemDTO; +import io.gisbi.extensions.view.dto.ChartFieldCustomFilterDTO; +import io.gisbi.extensions.view.filter.FilterTreeItem; +import io.gisbi.extensions.view.filter.FilterTreeObj; +import io.gisbi.utils.JsonUtil; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; /** - * @Author Junjun + * @Author bi-coder */ @Service public class ChartViewOldDataMergeService { diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewThresholdManage.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java rename to core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewThresholdManage.java index 0c35a4e..a77a680 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewThresholdManage.java @@ -1,18 +1,18 @@ -package io.dataease.chart.manage; +package io.gisbi.chart.manage; -import io.dataease.api.chart.request.ThresholdCheckRequest; -import io.dataease.api.chart.vo.ThresholdCheckVO; -import io.dataease.constant.DeTypeConstants; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.view.dto.ChartViewDTO; -import io.dataease.extensions.view.dto.ChartViewFieldDTO; -import io.dataease.extensions.view.filter.FilterTreeItem; -import io.dataease.extensions.view.filter.FilterTreeObj; -import io.dataease.i18n.Translator; -import io.dataease.utils.DateUtils; -import io.dataease.utils.JsonUtil; -import io.dataease.utils.LogUtil; +import io.gisbi.api.chart.request.ThresholdCheckRequest; +import io.gisbi.api.chart.vo.ThresholdCheckVO; +import io.gisbi.constant.DeTypeConstants; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import io.gisbi.extensions.view.dto.ChartViewFieldDTO; +import io.gisbi.extensions.view.filter.FilterTreeItem; +import io.gisbi.extensions.view.filter.FilterTreeObj; +import io.gisbi.i18n.Translator; +import io.gisbi.utils.DateUtils; +import io.gisbi.utils.JsonUtil; +import io.gisbi.utils.LogUtil; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/gisbi/chart/server/ChartDataServer.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java rename to core/core-backend/src/main/java/io/gisbi/chart/server/ChartDataServer.java index 9aa8f2a..2675930 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/server/ChartDataServer.java @@ -1,28 +1,28 @@ -package io.dataease.chart.server; +package io.gisbi.chart.server; import com.fasterxml.jackson.core.type.TypeReference; -import io.dataease.api.chart.ChartDataApi; -import io.dataease.api.chart.dto.ViewDetailField; -import io.dataease.api.chart.request.ChartExcelRequest; -import io.dataease.api.chart.request.ChartExcelRequestInner; -import io.dataease.auth.DeLinkPermit; -import io.dataease.chart.constant.ChartConstants; -import io.dataease.chart.manage.ChartDataManage; -import io.dataease.constant.AuthConstant; -import io.dataease.constant.CommonConstants; -import io.dataease.dataset.manage.PermissionManage; -import io.dataease.dataset.server.DatasetFieldServer; -import io.dataease.constant.DeTypeConstants; -import io.dataease.exception.DEException; -import io.dataease.exportCenter.manage.ExportCenterManage; -import io.dataease.exportCenter.util.ExportCenterUtils; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.view.dto.*; -import io.dataease.license.manage.F2CLicLimitedManage; -import io.dataease.result.ResultCode; -import io.dataease.utils.JsonUtil; -import io.dataease.utils.LogUtil; -import io.dataease.visualization.manage.VisualizationTemplateExtendDataManage; +import io.gisbi.api.chart.ChartDataApi; +import io.gisbi.api.chart.dto.ViewDetailField; +import io.gisbi.api.chart.request.ChartExcelRequest; +import io.gisbi.api.chart.request.ChartExcelRequestInner; +import io.gisbi.auth.DeLinkPermit; +import io.gisbi.chart.constant.ChartConstants; +import io.gisbi.chart.manage.ChartDataManage; +import io.gisbi.constant.AuthConstant; +import io.gisbi.constant.CommonConstants; + +import io.gisbi.dataset.server.DatasetFieldServer; +import io.gisbi.dataset.manage.PermissionManage; +import io.gisbi.constant.DeTypeConstants; +import io.gisbi.exception.DEException; +import io.gisbi.exportCenter.manage.ExportCenterManage; +import io.gisbi.exportCenter.util.ExportCenterUtils; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.view.dto.*; +import io.gisbi.result.ResultCode; +import io.gisbi.utils.JsonUtil; +import io.gisbi.utils.LogUtil; +import io.gisbi.visualization.manage.VisualizationTemplateExtendDataManage; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -33,6 +33,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.streaming.SXSSFWorkbook; + import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -50,7 +51,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; /** - * @Author Junjun + * @Author bi-coder */ @RestController @RequestMapping("/chartData") @@ -68,8 +69,6 @@ public class ChartDataServer implements ChartDataApi { @Resource private DatasetFieldServer datasetFieldServer; - @Resource(name = "f2CLicLimitedManage") - private F2CLicLimitedManage f2CLicLimitedManage; @Value("${dataease.export.page.size:50000}") private Integer extractPageSize; private final Long sheetLimit = 1000000L; diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java b/core/core-backend/src/main/java/io/gisbi/chart/server/ChartViewServer.java similarity index 81% rename from core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java rename to core/core-backend/src/main/java/io/gisbi/chart/server/ChartViewServer.java index 12f06f4..076d986 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/server/ChartViewServer.java @@ -1,13 +1,13 @@ -package io.dataease.chart.server; +package io.gisbi.chart.server; -import io.dataease.api.chart.ChartViewApi; -import io.dataease.api.chart.vo.ChartBaseVO; -import io.dataease.extensions.view.dto.ChartViewDTO; -import io.dataease.extensions.view.dto.ChartViewFieldDTO; -import io.dataease.api.chart.vo.ViewSelectorVO; -import io.dataease.chart.manage.ChartViewManege; -import io.dataease.exception.DEException; -import io.dataease.result.ResultCode; +import io.gisbi.api.chart.ChartViewApi; +import io.gisbi.api.chart.vo.ChartBaseVO; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import io.gisbi.extensions.view.dto.ChartViewFieldDTO; +import io.gisbi.api.chart.vo.ViewSelectorVO; +import io.gisbi.chart.manage.ChartViewManege; +import io.gisbi.exception.DEException; +import io.gisbi.result.ResultCode; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -16,7 +16,7 @@ import java.util.List; import java.util.Map; /** - * @Author Junjun + * @Author bi-coder */ @RestController @RequestMapping("chart") diff --git a/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java b/core/core-backend/src/main/java/io/gisbi/chart/utils/ChartDataBuild.java similarity index 99% rename from core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java rename to core/core-backend/src/main/java/io/gisbi/chart/utils/ChartDataBuild.java index 191edf9..4d46e38 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java +++ b/core/core-backend/src/main/java/io/gisbi/chart/utils/ChartDataBuild.java @@ -1,12 +1,12 @@ -package io.dataease.chart.utils; +package io.gisbi.chart.utils; -import io.dataease.api.chart.dto.ScatterChartDataDTO; -import io.dataease.api.chart.dto.Series; -import io.dataease.extensions.view.dto.*; -import io.dataease.i18n.Lang; -import io.dataease.i18n.Translator; -import io.dataease.utils.IDUtils; -import io.dataease.utils.JsonUtil; +import io.gisbi.api.chart.dto.ScatterChartDataDTO; +import io.gisbi.api.chart.dto.Series; +import io.gisbi.extensions.view.dto.*; +import io.gisbi.i18n.Lang; +import io.gisbi.i18n.Translator; +import io.gisbi.utils.IDUtils; +import io.gisbi.utils.JsonUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.BooleanUtils; @@ -1375,7 +1375,7 @@ public class ChartDataBuild { axisChartDataDTO.setName(xField.toString()); List dimensionList = new ArrayList<>(); - List quotaList = new ArrayList<>(); + List quotaList = new ArrayList<>(); for (int j = 0; j < xAxis.size(); j++) { ChartDimensionDTO chartDimensionDTO = new ChartDimensionDTO(); diff --git a/core/core-backend/src/main/java/io/dataease/commons/UUIDUtils.java b/core/core-backend/src/main/java/io/gisbi/commons/UUIDUtils.java similarity index 83% rename from core/core-backend/src/main/java/io/dataease/commons/UUIDUtils.java rename to core/core-backend/src/main/java/io/gisbi/commons/UUIDUtils.java index f7c1833..1b258a8 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/UUIDUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/commons/UUIDUtils.java @@ -1,4 +1,4 @@ -package io.dataease.commons; +package io.gisbi.commons; import java.util.UUID; diff --git a/core/core-backend/src/main/java/io/dataease/commons/constants/DataVisualizationConstants.java b/core/core-backend/src/main/java/io/gisbi/commons/constants/DataVisualizationConstants.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/commons/constants/DataVisualizationConstants.java rename to core/core-backend/src/main/java/io/gisbi/commons/constants/DataVisualizationConstants.java index 081d4c9..d5e47b7 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/constants/DataVisualizationConstants.java +++ b/core/core-backend/src/main/java/io/gisbi/commons/constants/DataVisualizationConstants.java @@ -1,4 +1,4 @@ -package io.dataease.commons.constants; +package io.gisbi.commons.constants; public class DataVisualizationConstants { diff --git a/core/core-backend/src/main/java/io/dataease/commons/constants/OptConstants.java b/core/core-backend/src/main/java/io/gisbi/commons/constants/OptConstants.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/commons/constants/OptConstants.java rename to core/core-backend/src/main/java/io/gisbi/commons/constants/OptConstants.java index b917051..ccfaef2 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/constants/OptConstants.java +++ b/core/core-backend/src/main/java/io/gisbi/commons/constants/OptConstants.java @@ -1,7 +1,7 @@ -package io.dataease.commons.constants; +package io.gisbi.commons.constants; /** - * @author : WangJiaHao + * @Author bi-coder * @date : 2023/10/8 09:37 */ public class OptConstants { diff --git a/core/core-backend/src/main/java/io/dataease/commons/constants/TaskStatus.java b/core/core-backend/src/main/java/io/gisbi/commons/constants/TaskStatus.java similarity index 87% rename from core/core-backend/src/main/java/io/dataease/commons/constants/TaskStatus.java rename to core/core-backend/src/main/java/io/gisbi/commons/constants/TaskStatus.java index b5fbe28..2ab9cd9 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/constants/TaskStatus.java +++ b/core/core-backend/src/main/java/io/gisbi/commons/constants/TaskStatus.java @@ -1,4 +1,4 @@ -package io.dataease.commons.constants; +package io.gisbi.commons.constants; public enum TaskStatus { WaitingForExecution, // 等待执行 diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/CodingUtil.java b/core/core-backend/src/main/java/io/gisbi/commons/utils/CodingUtil.java similarity index 99% rename from core/core-backend/src/main/java/io/dataease/commons/utils/CodingUtil.java rename to core/core-backend/src/main/java/io/gisbi/commons/utils/CodingUtil.java index 714392e..4eaf13c 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/utils/CodingUtil.java +++ b/core/core-backend/src/main/java/io/gisbi/commons/utils/CodingUtil.java @@ -1,4 +1,4 @@ -package io.dataease.commons.utils; +package io.gisbi.commons.utils; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; @@ -12,7 +12,7 @@ import java.util.UUID; /** * 加密解密工具 * - * @author kun.mo + * @Author bi-coder */ public class CodingUtil { diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/CoreTreeUtils.java b/core/core-backend/src/main/java/io/gisbi/commons/utils/CoreTreeUtils.java similarity index 88% rename from core/core-backend/src/main/java/io/dataease/commons/utils/CoreTreeUtils.java rename to core/core-backend/src/main/java/io/gisbi/commons/utils/CoreTreeUtils.java index 0b964cc..89e1b75 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/utils/CoreTreeUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/commons/utils/CoreTreeUtils.java @@ -1,7 +1,7 @@ -package io.dataease.commons.utils; +package io.gisbi.commons.utils; -import io.dataease.constant.SortConstants; -import io.dataease.visualization.dto.VisualizationNodeBO; +import io.gisbi.constant.SortConstants; +import io.gisbi.visualization.dto.VisualizationNodeBO; import org.apache.commons.lang3.StringUtils; import java.text.Collator; @@ -9,7 +9,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @author : WangJiaHao + * @Author bi-coder * @date : 2024/3/18 10:53 */ public class CoreTreeUtils { diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/CronUtils.java b/core/core-backend/src/main/java/io/gisbi/commons/utils/CronUtils.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/commons/utils/CronUtils.java rename to core/core-backend/src/main/java/io/gisbi/commons/utils/CronUtils.java index 41c38ac..f63572f 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/utils/CronUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/commons/utils/CronUtils.java @@ -1,6 +1,6 @@ -package io.dataease.commons.utils; +package io.gisbi.commons.utils; -import io.dataease.utils.LogUtil; +import io.gisbi.utils.LogUtil; import org.apache.commons.lang3.ObjectUtils; import org.quartz.CronExpression; import org.quartz.CronScheduleBuilder; diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/EncryptUtils.java b/core/core-backend/src/main/java/io/gisbi/commons/utils/EncryptUtils.java similarity index 94% rename from core/core-backend/src/main/java/io/dataease/commons/utils/EncryptUtils.java rename to core/core-backend/src/main/java/io/gisbi/commons/utils/EncryptUtils.java index 21fddea..bf1ab08 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/utils/EncryptUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/commons/utils/EncryptUtils.java @@ -1,6 +1,6 @@ -package io.dataease.commons.utils; +package io.gisbi.commons.utils; -import io.dataease.utils.BeanUtils; +import io.gisbi.utils.BeanUtils; import java.util.List; import java.util.stream.Collectors; diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/ExcelWatermarkUtils.java b/core/core-backend/src/main/java/io/gisbi/commons/utils/ExcelWatermarkUtils.java similarity index 74% rename from core/core-backend/src/main/java/io/dataease/commons/utils/ExcelWatermarkUtils.java rename to core/core-backend/src/main/java/io/gisbi/commons/utils/ExcelWatermarkUtils.java index a11cddd..56529fc 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/utils/ExcelWatermarkUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/commons/utils/ExcelWatermarkUtils.java @@ -1,9 +1,8 @@ -package io.dataease.commons.utils; +package io.gisbi.commons.utils; -import io.dataease.api.permissions.user.vo.UserFormVO; -import io.dataease.i18n.Translator; -import io.dataease.utils.IPUtils; -import io.dataease.visualization.dto.WatermarkContentDTO; +import io.gisbi.i18n.Translator; +import io.gisbi.utils.IPUtils; +import io.gisbi.visualization.dto.WatermarkContentDTO; import org.apache.poi.ss.usermodel.*; import java.awt.Color; @@ -21,31 +20,31 @@ public class ExcelWatermarkUtils { private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - public static String transContent(WatermarkContentDTO watermarkContent, UserFormVO userInfo) { - String content = ""; - switch (watermarkContent.getType()) { - case "custom" -> content = watermarkContent.getContent(); - case "nickName" -> content = "${nickName}"; - case "ip" -> content = "${ip}"; - case "time" -> content = "${time}"; - default -> content = "${username}"; - } - String nickName = userInfo.getName().contains("i18n_") ?Translator.get(userInfo.getName()):userInfo.getName(); - content = content.replaceAll("\\$\\{ip}", IPUtils.get() == null ? "127.0.0.1" : IPUtils.get()); - content = content.replaceAll("\\$\\{username}", userInfo.getAccount()); - content = content.replaceAll("\\$\\{nickName}", nickName); - content = content.replaceAll("\\$\\{time}", sdf.format(new Date())); - return content; - } +// public static String transContent(WatermarkContentDTO watermarkContent, UserFormVO userInfo) { +// String content = ""; +// switch (watermarkContent.getType()) { +// case "custom" -> content = watermarkContent.getContent(); +// case "nickName" -> content = "${nickName}"; +// case "ip" -> content = "${ip}"; +// case "time" -> content = "${time}"; +// default -> content = "${username}"; +// } +// String nickName = userInfo.getName().contains("i18n_") ?Translator.get(userInfo.getName()):userInfo.getName(); +// content = content.replaceAll("\\$\\{ip}", IPUtils.get() == null ? "127.0.0.1" : IPUtils.get()); +// content = content.replaceAll("\\$\\{username}", userInfo.getAccount()); +// content = content.replaceAll("\\$\\{nickName}", nickName); +// content = content.replaceAll("\\$\\{time}", sdf.format(new Date())); +// return content; +// } /** * 添加水印图片到工作簿并返回图片 ID */ - public static int addWatermarkImage(Workbook wb, WatermarkContentDTO watermarkContent, UserFormVO userInfo) { - byte[] imageBytes = createTextImage(transContent(watermarkContent, userInfo), watermarkContent); // 生成文字水印图片 - return wb.addPicture(imageBytes, Workbook.PICTURE_TYPE_PNG); // 添加到工作簿并返回 ID - } +// public static int addWatermarkImage(Workbook wb, WatermarkContentDTO watermarkContent, UserFormVO userInfo) { +// byte[] imageBytes = createTextImage(transContent(watermarkContent, userInfo), watermarkContent); // 生成文字水印图片 +// return wb.addPicture(imageBytes, Workbook.PICTURE_TYPE_PNG); // 添加到工作簿并返回 ID +// } public static void addWatermarkToSheet(Sheet sheet, Integer pictureIdx) { Drawing drawing = sheet.createDrawingPatriarch(); diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/MybatisInterceptorConfig.java b/core/core-backend/src/main/java/io/gisbi/commons/utils/MybatisInterceptorConfig.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/commons/utils/MybatisInterceptorConfig.java rename to core/core-backend/src/main/java/io/gisbi/commons/utils/MybatisInterceptorConfig.java index 54f652e..f35fec7 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/utils/MybatisInterceptorConfig.java +++ b/core/core-backend/src/main/java/io/gisbi/commons/utils/MybatisInterceptorConfig.java @@ -1,4 +1,4 @@ -package io.dataease.commons.utils; +package io.gisbi.commons.utils; import lombok.Getter; diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java b/core/core-backend/src/main/java/io/gisbi/commons/utils/SqlparserUtils.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java rename to core/core-backend/src/main/java/io/gisbi/commons/utils/SqlparserUtils.java index 7230b98..47b0b9c 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/commons/utils/SqlparserUtils.java @@ -1,19 +1,16 @@ -package io.dataease.commons.utils; +package io.gisbi.commons.utils; import com.fasterxml.jackson.core.type.TypeReference; -import io.dataease.api.permissions.user.vo.UserFormVO; -import io.dataease.api.permissions.variable.dto.SysVariableValueDto; -import io.dataease.api.permissions.variable.dto.SysVariableValueItem; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; -import io.dataease.extensions.datasource.vo.XpackPluginsDatasourceVO; -import io.dataease.extensions.view.dto.SqlVariableDetails; -import io.dataease.i18n.Translator; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.vo.XpackPluginsDatasourceVO; +import io.gisbi.extensions.view.dto.SqlVariableDetails; +import io.gisbi.i18n.Translator; import io.dataease.license.utils.LicenseUtil; -import io.dataease.utils.JsonUtil; -import io.dataease.utils.LogUtil; +import io.gisbi.utils.JsonUtil; +import io.gisbi.utils.LogUtil; import net.sf.jsqlparser.expression.*; import net.sf.jsqlparser.expression.operators.conditional.AndExpression; import net.sf.jsqlparser.expression.operators.conditional.OrExpression; @@ -30,14 +27,13 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.checkerframework.checker.nullness.qual.Nullable; -import org.junit.jupiter.params.provider.CsvSource; import java.text.SimpleDateFormat; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static io.dataease.chart.manage.ChartDataManage.START_END_SEPARATOR; +import static io.gisbi.chart.manage.ChartDataManage.START_END_SEPARATOR; import static org.apache.calcite.sql.SqlKind.*; public class SqlparserUtils { @@ -47,15 +43,13 @@ public class SqlparserUtils { private static final String SysParamsSubstitutedParams = "DeSysParams_"; private static final String SubstitutedSql = " 'DE-BI' = 'DE-BI' "; private boolean removeSysParams; - private UserFormVO userEntity; private final List> sysParams = new ArrayList<>(); - public String handleVariableDefaultValue(String sql, String sqlVariableDetails, boolean isEdit, boolean isFromDataSet, List parameters, boolean isCross, Map dsMap, PluginManageApi pluginManage, UserFormVO userEntity) { + public String handleVariableDefaultValue(String sql, String sqlVariableDetails, boolean isEdit, boolean isFromDataSet, List parameters, boolean isCross, Map dsMap, PluginManageApi pluginManage) { DatasourceSchemaDTO ds = dsMap.entrySet().iterator().next().getValue(); if (StringUtils.isEmpty(sql)) { DEException.throwException(Translator.get("i18n_sql_not_empty")); } - this.userEntity = userEntity; try { this.removeSysParams = true; removeVariables(sql, ds.getType()); @@ -699,59 +693,61 @@ public class SqlparserUtils { } private String handleSubstitutedSql(String sql) { - if (sql.contains(SysParamsSubstitutedParams) && userEntity != null) { - sql = sql.replace(SysParamsSubstitutedParams + "sysParams.userId", userEntity.getAccount()); - sql = sql.replace(SysParamsSubstitutedParams + "sysParams.userEmail", userEntity.getEmail()); - sql = sql.replace(SysParamsSubstitutedParams + "sysParams.userName", userEntity.getName()); - for (SysVariableValueItem variable : userEntity.getVariables()) { - String value = null; - if (!variable.isValid()) { - continue; - } - if (variable.getSysVariableDto().getType().equalsIgnoreCase("text")) { - for (SysVariableValueDto sysVariableValueDto : variable.getValueList()) { - if (variable.getVariableValueIds().contains(sysVariableValueDto.getId().toString())) { - value = sysVariableValueDto.getValue(); - break; - } - } - } else { - value = variable.getVariableValue(); - } - if (StringUtils.isNotEmpty(value)) { - sql = sql.replace(SysParamsSubstitutedParams + variable.getVariableId(), value); - } - } - return sql; - } else { - return SubstitutedSql; - } +// if (sql.contains(SysParamsSubstitutedParams) && userEntity != null) { +// sql = sql.replace(SysParamsSubstitutedParams + "sysParams.userId", userEntity.getAccount()); +// sql = sql.replace(SysParamsSubstitutedParams + "sysParams.userEmail", userEntity.getEmail()); +// sql = sql.replace(SysParamsSubstitutedParams + "sysParams.userName", userEntity.getName()); +// for (SysVariableValueItem variable : userEntity.getVariables()) { +// String value = null; +// if (!variable.isValid()) { +// continue; +// } +// if (variable.getSysVariableDto().getType().equalsIgnoreCase("text")) { +// for (SysVariableValueDto sysVariableValueDto : variable.getValueList()) { +// if (variable.getVariableValueIds().contains(sysVariableValueDto.getId().toString())) { +// value = sysVariableValueDto.getValue(); +// break; +// } +// } +// } else { +// value = variable.getVariableValue(); +// } +// if (StringUtils.isNotEmpty(value)) { +// sql = sql.replace(SysParamsSubstitutedParams + variable.getVariableId(), value); +// } +// } +// return sql; +// } else { +// return SubstitutedSql; +// } + return sql; } private String handleSubstitutedSqlForIn(String sql) { - if (sql.contains(SysParamsSubstitutedParams) && userEntity != null) { - for (SysVariableValueItem variable : userEntity.getVariables()) { - List values = new ArrayList<>(); - if (!variable.isValid()) { - continue; - } - if (variable.getSysVariableDto().getType().equalsIgnoreCase("text")) { - - for (SysVariableValueDto sysVariableValueDto : variable.getValueList()) { - if (variable.getVariableValueIds().contains(sysVariableValueDto.getId().toString())) { - values.add(sysVariableValueDto.getValue()); - } - } - } - if (CollectionUtils.isNotEmpty(values)) { - sql = sql.replace(SysParamsSubstitutedParams + variable.getVariableId(), "'" + String.join("','", values) + "'"); - } - } - return sql; - } else { - return SubstitutedSql; - } +// if (sql.contains(SysParamsSubstitutedParams) && userEntity != null) { +// for (SysVariableValueItem variable : userEntity.getVariables()) { +// List values = new ArrayList<>(); +// if (!variable.isValid()) { +// continue; +// } +// if (variable.getSysVariableDto().getType().equalsIgnoreCase("text")) { +// +// for (SysVariableValueDto sysVariableValueDto : variable.getValueList()) { +// if (variable.getVariableValueIds().contains(sysVariableValueDto.getId().toString())) { +// values.add(sysVariableValueDto.getValue()); +// } +// } +// } +// if (CollectionUtils.isNotEmpty(values)) { +// sql = sql.replace(SysParamsSubstitutedParams + variable.getVariableId(), "'" + String.join("','", values) + "'"); +// } +// } +// return sql; +// } else { +// return SubstitutedSql; +// } + return sql; } } diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/UrlTestUtils.java b/core/core-backend/src/main/java/io/gisbi/commons/utils/UrlTestUtils.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/commons/utils/UrlTestUtils.java rename to core/core-backend/src/main/java/io/gisbi/commons/utils/UrlTestUtils.java index 0a4a920..096176b 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/utils/UrlTestUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/commons/utils/UrlTestUtils.java @@ -1,4 +1,4 @@ -package io.dataease.commons.utils; +package io.gisbi.commons.utils; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/core/core-backend/src/main/java/io/dataease/config/CommonConfig.java b/core/core-backend/src/main/java/io/gisbi/config/CommonConfig.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/config/CommonConfig.java rename to core/core-backend/src/main/java/io/gisbi/config/CommonConfig.java index c3a3107..e9e5fd9 100644 --- a/core/core-backend/src/main/java/io/dataease/config/CommonConfig.java +++ b/core/core-backend/src/main/java/io/gisbi/config/CommonConfig.java @@ -1,7 +1,7 @@ -package io.dataease.config; +package io.gisbi.config; import com.fit2cloud.autoconfigure.QuartzAutoConfiguration; -import io.dataease.utils.CommonThreadPool; +import io.gisbi.utils.CommonThreadPool; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/core-backend/src/main/java/io/dataease/config/DeMvcConfig.java b/core/core-backend/src/main/java/io/gisbi/config/DeMvcConfig.java similarity index 85% rename from core/core-backend/src/main/java/io/dataease/config/DeMvcConfig.java rename to core/core-backend/src/main/java/io/gisbi/config/DeMvcConfig.java index 7893027..199a348 100644 --- a/core/core-backend/src/main/java/io/dataease/config/DeMvcConfig.java +++ b/core/core-backend/src/main/java/io/gisbi/config/DeMvcConfig.java @@ -1,16 +1,16 @@ -package io.dataease.config; +package io.gisbi.config; -import io.dataease.constant.AuthConstant; -import io.dataease.share.interceptor.LinkInterceptor; +import io.gisbi.constant.AuthConstant; +import io.gisbi.share.interceptor.LinkInterceptor; import jakarta.annotation.Resource; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import static io.dataease.constant.StaticResourceConstants.*; -import static io.dataease.utils.StaticResourceUtils.ensureBoth; -import static io.dataease.utils.StaticResourceUtils.ensureSuffix; +import static io.gisbi.constant.StaticResourceConstants.*; +import static io.gisbi.utils.StaticResourceUtils.ensureBoth; +import static io.gisbi.utils.StaticResourceUtils.ensureSuffix; @Configuration public class DeMvcConfig implements WebMvcConfigurer { diff --git a/core/core-backend/src/main/java/io/dataease/config/MybatisConfig.java b/core/core-backend/src/main/java/io/gisbi/config/MybatisConfig.java similarity index 77% rename from core/core-backend/src/main/java/io/dataease/config/MybatisConfig.java rename to core/core-backend/src/main/java/io/gisbi/config/MybatisConfig.java index bf8ec58..6887575 100644 --- a/core/core-backend/src/main/java/io/dataease/config/MybatisConfig.java +++ b/core/core-backend/src/main/java/io/gisbi/config/MybatisConfig.java @@ -1,10 +1,10 @@ -package io.dataease.config; +package io.gisbi.config; -import io.dataease.commons.utils.MybatisInterceptorConfig; -import io.dataease.datasource.dao.auto.entity.CoreDatasource; -import io.dataease.datasource.dao.auto.entity.CoreDeEngine; -import io.dataease.interceptor.MybatisInterceptor; +import io.gisbi.commons.utils.MybatisInterceptorConfig; +import io.gisbi.datasource.dao.auto.entity.CoreDatasource; +import io.gisbi.datasource.dao.auto.entity.CoreDeEngine; +import io.gisbi.interceptor.MybatisInterceptor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/constant/DatasetTableType.java b/core/core-backend/src/main/java/io/gisbi/dataset/constant/DatasetTableType.java similarity index 73% rename from core/core-backend/src/main/java/io/dataease/dataset/constant/DatasetTableType.java rename to core/core-backend/src/main/java/io/gisbi/dataset/constant/DatasetTableType.java index 047df2c..90fd17e 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/constant/DatasetTableType.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/constant/DatasetTableType.java @@ -1,7 +1,7 @@ -package io.dataease.dataset.constant; +package io.gisbi.dataset.constant; /** - * @Author Junjun + * @Author bi-coder */ public class DatasetTableType { public static String DB = "db"; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetGroup.java b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetGroup.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetGroup.java rename to core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetGroup.java index 5cebd39..f9205db 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetGroup.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetGroup.java @@ -1,4 +1,4 @@ -package io.dataease.dataset.dao.auto.entity; +package io.gisbi.dataset.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-08-28 */ @TableName("core_dataset_group") diff --git a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTable.java b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetTable.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTable.java rename to core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetTable.java index 2eae79e..48ac7f8 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTable.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetTable.java @@ -1,4 +1,4 @@ -package io.dataease.dataset.dao.auto.entity; +package io.gisbi.dataset.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-04-14 */ @TableName("core_dataset_table") diff --git a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetTableField.java similarity index 99% rename from core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java rename to core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetTableField.java index b1c0654..140030b 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetTableField.java @@ -1,4 +1,4 @@ -package io.dataease.dataset.dao.auto.entity; +package io.gisbi.dataset.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * table数据集表字段 *

* - * @author fit2cloud + * @Author bi-coder * @since 2025-02-06 */ @TableName("core_dataset_table_field") diff --git a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableSqlLog.java b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetTableSqlLog.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableSqlLog.java rename to core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetTableSqlLog.java index 3980912..fdc5148 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableSqlLog.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetTableSqlLog.java @@ -1,4 +1,4 @@ -package io.dataease.dataset.dao.auto.entity; +package io.gisbi.dataset.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-08-08 */ @TableName("core_dataset_table_sql_log") diff --git a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetGroupMapper.java b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetGroupMapper.java similarity index 67% rename from core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetGroupMapper.java rename to core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetGroupMapper.java index ca53bb0..d812216 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetGroupMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetGroupMapper.java @@ -1,6 +1,6 @@ -package io.dataease.dataset.dao.auto.mapper; +package io.gisbi.dataset.dao.auto.mapper; -import io.dataease.dataset.dao.auto.entity.CoreDatasetGroup; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetGroup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-08-28 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetTableFieldMapper.java b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetTableFieldMapper.java similarity index 68% rename from core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetTableFieldMapper.java rename to core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetTableFieldMapper.java index 16d3de3..abe53c0 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetTableFieldMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetTableFieldMapper.java @@ -1,6 +1,6 @@ -package io.dataease.dataset.dao.auto.mapper; +package io.gisbi.dataset.dao.auto.mapper; -import io.dataease.dataset.dao.auto.entity.CoreDatasetTableField; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetTableField; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * table数据集表字段 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2025-02-06 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetTableMapper.java b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetTableMapper.java similarity index 67% rename from core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetTableMapper.java rename to core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetTableMapper.java index eb147e8..23dbc25 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetTableMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetTableMapper.java @@ -1,6 +1,6 @@ -package io.dataease.dataset.dao.auto.mapper; +package io.gisbi.dataset.dao.auto.mapper; -import io.dataease.dataset.dao.auto.entity.CoreDatasetTable; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetTable; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-04-14 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetTableSqlLogMapper.java b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetTableSqlLogMapper.java similarity index 66% rename from core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetTableSqlLogMapper.java rename to core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetTableSqlLogMapper.java index 627efcc..ae77c8c 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetTableSqlLogMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetTableSqlLogMapper.java @@ -1,6 +1,6 @@ -package io.dataease.dataset.dao.auto.mapper; +package io.gisbi.dataset.dao.auto.mapper; -import io.dataease.dataset.dao.auto.entity.CoreDatasetTableSqlLog; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetTableSqlLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-08-08 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/dataset/dao/ext/mapper/CoreDataSetExtMapper.java b/core/core-backend/src/main/java/io/gisbi/dataset/dao/ext/mapper/CoreDataSetExtMapper.java similarity index 78% rename from core/core-backend/src/main/java/io/dataease/dataset/dao/ext/mapper/CoreDataSetExtMapper.java rename to core/core-backend/src/main/java/io/gisbi/dataset/dao/ext/mapper/CoreDataSetExtMapper.java index f48ec23..6f932cc 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/dao/ext/mapper/CoreDataSetExtMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/dao/ext/mapper/CoreDataSetExtMapper.java @@ -1,9 +1,9 @@ -package io.dataease.dataset.dao.ext.mapper; +package io.gisbi.dataset.dao.ext.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.api.dataset.vo.DataSetBarVO; -import io.dataease.dataset.dao.ext.po.DataSetNodePO; -import io.dataease.model.BusiNodeRequest; +import io.gisbi.api.dataset.vo.DataSetBarVO; +import io.gisbi.dataset.dao.ext.po.DataSetNodePO; +import io.gisbi.model.BusiNodeRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/dao/ext/po/DataSetNodePO.java b/core/core-backend/src/main/java/io/gisbi/dataset/dao/ext/po/DataSetNodePO.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/dataset/dao/ext/po/DataSetNodePO.java rename to core/core-backend/src/main/java/io/gisbi/dataset/dao/ext/po/DataSetNodePO.java index ead5147..d03a8d3 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/dao/ext/po/DataSetNodePO.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/dao/ext/po/DataSetNodePO.java @@ -1,4 +1,4 @@ -package io.dataease.dataset.dao.ext.po; +package io.gisbi.dataset.dao.ext.po; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/dto/DataSetNodeBO.java b/core/core-backend/src/main/java/io/gisbi/dataset/dto/DataSetNodeBO.java similarity index 86% rename from core/core-backend/src/main/java/io/dataease/dataset/dto/DataSetNodeBO.java rename to core/core-backend/src/main/java/io/gisbi/dataset/dto/DataSetNodeBO.java index 2fa0269..8050339 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/dto/DataSetNodeBO.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/dto/DataSetNodeBO.java @@ -1,6 +1,6 @@ -package io.dataease.dataset.dto; +package io.gisbi.dataset.dto; -import io.dataease.model.TreeBaseModel; +import io.gisbi.model.TreeBaseModel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java similarity index 88% rename from core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java rename to core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java index 27b34ee..fc6bed6 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java @@ -1,50 +1,42 @@ -package io.dataease.dataset.manage; +package io.gisbi.dataset.manage; -import io.dataease.api.chart.dto.DeSortField; -import io.dataease.api.dataset.dto.*; -import io.dataease.api.dataset.union.DatasetGroupInfoDTO; -import io.dataease.api.dataset.union.DatasetTableInfoDTO; -import io.dataease.api.permissions.auth.dto.BusiPerCheckDTO; -import io.dataease.api.permissions.dataset.api.RowPermissionsApi; -import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO; -import io.dataease.api.permissions.user.vo.UserFormVO; -import io.dataease.auth.bo.TokenUserBO; -import io.dataease.chart.utils.ChartDataBuild; -import io.dataease.commons.utils.SqlparserUtils; -import io.dataease.constant.AuthEnum; -import io.dataease.dataset.constant.DatasetTableType; -import io.dataease.dataset.utils.DatasetUtils; -import io.dataease.dataset.utils.FieldUtils; -import io.dataease.dataset.utils.TableUtils; -import io.dataease.datasource.dao.auto.entity.CoreDatasource; -import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper; -import io.dataease.datasource.manage.DataSourceManage; -import io.dataease.datasource.manage.EngineManage; -import io.dataease.datasource.utils.DatasourceUtils; -import io.dataease.engine.constant.ExtFieldConstant; -import io.dataease.constant.SQLConstants; -import io.dataease.engine.sql.SQLProvider; -import io.dataease.engine.trans.*; -import io.dataease.engine.utils.SQLUtils; -import io.dataease.engine.utils.Utils; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.constant.SqlPlaceholderConstants; -import io.dataease.extensions.datasource.dto.*; -import io.dataease.extensions.datasource.factory.ProviderFactory; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; -import io.dataease.extensions.view.dto.ChartExtFilterDTO; -import io.dataease.extensions.view.dto.ChartExtRequest; -import io.dataease.extensions.view.dto.ColumnPermissionItem; -import io.dataease.extensions.view.dto.SqlVariableDetails; -import io.dataease.i18n.Translator; -import io.dataease.system.manage.CorePermissionManage; -import io.dataease.utils.AuthUtils; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.JsonUtil; -import io.dataease.utils.TreeUtils; +import io.gisbi.api.chart.dto.DeSortField; +import io.gisbi.api.dataset.dto.*; +import io.gisbi.api.dataset.union.DatasetGroupInfoDTO; +import io.gisbi.api.dataset.union.DatasetTableInfoDTO; +import io.gisbi.chart.utils.ChartDataBuild; +import io.gisbi.commons.utils.SqlparserUtils; +import io.gisbi.dataset.constant.DatasetTableType; +import io.gisbi.dataset.utils.DatasetUtils; +import io.gisbi.dataset.utils.FieldUtils; +import io.gisbi.dataset.utils.TableUtils; +import io.gisbi.datasource.dao.auto.entity.CoreDatasource; +import io.gisbi.datasource.dao.auto.mapper.CoreDatasourceMapper; +import io.gisbi.datasource.manage.DataSourceManage; +import io.gisbi.datasource.manage.EngineManage; +import io.gisbi.datasource.utils.DatasourceUtils; +import io.gisbi.engine.constant.ExtFieldConstant; +import io.gisbi.constant.SQLConstants; +import io.gisbi.engine.sql.SQLProvider; +import io.gisbi.engine.trans.*; +import io.gisbi.engine.utils.SQLUtils; +import io.gisbi.engine.utils.Utils; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.constant.SqlPlaceholderConstants; +import io.gisbi.extensions.datasource.dto.*; +import io.gisbi.extensions.datasource.factory.ProviderFactory; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.view.dto.ChartExtFilterDTO; +import io.gisbi.extensions.view.dto.ChartExtRequest; +import io.gisbi.extensions.view.dto.ColumnPermissionItem; +import io.gisbi.extensions.view.dto.SqlVariableDetails; +import io.gisbi.i18n.Translator; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.JsonUtil; +import io.gisbi.utils.TreeUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -58,10 +50,10 @@ import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; -import static io.dataease.chart.manage.ChartDataManage.START_END_SEPARATOR; +import static io.gisbi.chart.manage.ChartDataManage.START_END_SEPARATOR; /** - * @Author Junjun + * @Author bi-coder */ @Component public class DatasetDataManage { @@ -76,24 +68,15 @@ public class DatasetDataManage { @Resource private DatasetGroupManage datasetGroupManage; @Resource - private PermissionManage permissionManage; - @Resource private DatasetTableSqlLogManage datasetTableSqlLogManage; @Autowired(required = false) private PluginManageApi pluginManage; - @Resource - private CorePermissionManage corePermissionManage; - @Autowired(required = false) - private RowPermissionsApi rowPermissionsApi; + @Resource private DataSourceManage dataSourceManage; private static Logger logger = LoggerFactory.getLogger(DatasetDataManage.class); - private RowPermissionsApi getRowPermissionsApi() { - return rowPermissionsApi; - } - public static final List notFullDs = List.of("mysql", "mariadb", "Excel", "API"); public List getTableFields(DatasetTableDTO datasetTableDTO) throws Exception { @@ -131,7 +114,7 @@ public class DatasetDataManage { } else { // parser sql params and replace default value String s = new String(Base64.getDecoder().decode(tableInfoDTO.getSql())); - String originSql = new SqlparserUtils().handleVariableDefaultValue(s, datasetTableDTO.getSqlVariableDetails(), false, false, null, false, datasourceRequest.getDsList(), pluginManage, getUserEntity()); + String originSql = new SqlparserUtils().handleVariableDefaultValue(s, datasetTableDTO.getSqlVariableDetails(), false, false, null, false, datasourceRequest.getDsList(), pluginManage); originSql = provider.replaceComment(originSql); // add sql table schema @@ -207,12 +190,12 @@ public class DatasetDataManage { } Map desensitizationList = new HashMap<>(); - if (checkPermission) { - fields = permissionManage.filterColumnPermissions(fields, desensitizationList, datasetGroupInfoDTO.getId(), null); - if (ObjectUtils.isEmpty(fields)) { - DEException.throwException(Translator.get("i18n_no_column_permission")); - } - } +// if (checkPermission) { +// fields = permissionManage.filterColumnPermissions(fields, desensitizationList, datasetGroupInfoDTO.getId(), null); +// if (ObjectUtils.isEmpty(fields)) { +// DEException.throwException(Translator.get("i18n_no_column_permission")); +// } +// } buildFieldName(sqlMap, fields); Map dsMap = (Map) sqlMap.get("dsMap"); DatasourceUtils.checkDsStatus(dsMap); @@ -228,11 +211,11 @@ public class DatasetDataManage { } sql = Utils.replaceSchemaAlias(sql, dsMap); } - List rowPermissionsTree = new ArrayList<>(); - TokenUserBO user = AuthUtils.getUser(); - if (user != null && checkPermission) { - rowPermissionsTree = permissionManage.getRowPermissionsTree(datasetGroupInfoDTO.getId(), user.getUserId()); - } +// List rowPermissionsTree = new ArrayList<>(); +// TokenUserBO user = AuthUtils.getUser(); +// if (user != null && checkPermission) { +// rowPermissionsTree = permissionManage.getRowPermissionsTree(datasetGroupInfoDTO.getId(), user.getUserId()); +// } Provider provider; if (crossDs) { provider = ProviderFactory.getDefaultProvider(); @@ -244,7 +227,7 @@ public class DatasetDataManage { SQLMeta sqlMeta = new SQLMeta(); Table2SQLObj.table2sqlobj(sqlMeta, null, "(" + sql + ")", crossDs); Field2SQLObj.field2sqlObj(sqlMeta, fields, fields, crossDs, dsMap, Utils.getParams(fields), null, pluginManage); - WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, fields, crossDs, dsMap, Utils.getParams(fields), null, pluginManage); +// WhereTree2Str.transFilterTrees(sqlMeta, null, fields, crossDs, dsMap, Utils.getParams(fields), null, pluginManage); Order2SQLObj.getOrders(sqlMeta, datasetGroupInfoDTO.getSortFields(), fields, crossDs, dsMap, Utils.getParams(fields), null, pluginManage); String querySQL; if (start == null || count == null) { @@ -312,11 +295,11 @@ public class DatasetDataManage { sql = Utils.replaceSchemaAlias(sql, dsMap); } - List rowPermissionsTree = new ArrayList<>(); - TokenUserBO user = AuthUtils.getUser(); - if (user != null) { - rowPermissionsTree = permissionManage.getRowPermissionsTree(datasetGroupInfoDTO.getId(), user.getUserId()); - } +// List rowPermissionsTree = new ArrayList<>(); +// TokenUserBO user = AuthUtils.getUser(); +// if (user != null) { +// rowPermissionsTree = permissionManage.getRowPermissionsTree(datasetGroupInfoDTO.getId(), user.getUserId()); +// } Provider provider; if (crossDs) { @@ -329,7 +312,7 @@ public class DatasetDataManage { SQLMeta sqlMeta = new SQLMeta(); Table2SQLObj.table2sqlobj(sqlMeta, null, "(" + sql + ")", crossDs); Field2SQLObj.field2sqlObj(sqlMeta, fields, fields, crossDs, dsMap, Utils.getParams(fields), null, pluginManage); - WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, fields, crossDs, dsMap, Utils.getParams(fields), null, pluginManage); +// WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, fields, crossDs, dsMap, Utils.getParams(fields), null, pluginManage); Order2SQLObj.getOrders(sqlMeta, datasetGroupInfoDTO.getSortFields(), fields, crossDs, dsMap, Utils.getParams(fields), null, pluginManage); String replaceSql = provider.rebuildSQL(SQLProvider.createQuerySQL(sqlMeta, false, false, false), sqlMeta, crossDs, dsMap); return getDatasetTotal(datasetGroupInfoDTO, replaceSql, null); @@ -397,12 +380,12 @@ public class DatasetDataManage { return map; } - private UserFormVO getUserEntity() { - if (getRowPermissionsApi() == null) { - return null; - } - return getRowPermissionsApi().getUserById(AuthUtils.getUser().getUserId()); - } +// private UserFormVO getUserEntity() { +// if (getRowPermissionsApi() == null) { +// return null; +// } +// return getRowPermissionsApi().getUserById(AuthUtils.getUser().getUserId()); +// } public Map previewSql(PreviewSqlDTO dto) throws DEException { CoreDatasource coreDatasource = dataSourceManage.getCoreDatasource(dto.getDatasourceId()); @@ -429,7 +412,7 @@ public class DatasetDataManage { // parser sql params and replace default value String s = new String(Base64.getDecoder().decode(dto.getSql())); - String originSql = new SqlparserUtils().handleVariableDefaultValue(datasetSQLManage.subPrefixSuffixChar(s), dto.getSqlVariableDetails(), true, true, null, false, dsMap, pluginManage, getUserEntity()); + String originSql = new SqlparserUtils().handleVariableDefaultValue(datasetSQLManage.subPrefixSuffixChar(s), dto.getSqlVariableDetails(), true, true, null, false, dsMap, pluginManage); originSql = provider.replaceComment(originSql); // sql 作为临时表,外层加上limit @@ -586,7 +569,7 @@ public class DatasetDataManage { } Field2SQLObj.field2sqlObj(sqlMeta, fields, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); - WhereTree2Str.transFilterTrees(sqlMeta, null, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); +// WhereTree2Str.transFilterTrees(sqlMeta, null, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); Order2SQLObj.getOrders(sqlMeta, datasetGroupInfoDTO.getSortFields(), allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); String querySQL; querySQL = SQLProvider.createQuerySQL(sqlMeta, false, needOrder, !StringUtils.equalsIgnoreCase(dsType, "es")); @@ -642,13 +625,13 @@ public class DatasetDataManage { Long datasetGroupId = field.getDatasetGroupId(); // check permission - BusiPerCheckDTO dto = new BusiPerCheckDTO(); - dto.setId(datasetGroupId); - dto.setAuthEnum(AuthEnum.READ); - boolean checked = corePermissionManage.checkAuth(dto); - if (!checked) { - DEException.throwException(Translator.get("i18n_no_dataset_permission")); - } +// BusiPerCheckDTO dto = new BusiPerCheckDTO(); +// dto.setId(datasetGroupId); +// dto.setAuthEnum(AuthEnum.READ); +// boolean checked = corePermissionManage.checkAuth(dto); +// if (!checked) { +// DEException.throwException(Translator.get("i18n_no_dataset_permission")); +// } if (field.getChartId() != null) { allFields.addAll(datasetTableFieldManage.getChartCalcFields(field.getChartId())); } @@ -672,7 +655,7 @@ public class DatasetDataManage { // 获取allFields List fields = Collections.singletonList(field); Map desensitizationList = new HashMap<>(); - fields = permissionManage.filterColumnPermissions(fields, desensitizationList, datasetGroupInfoDTO.getId(), null); +// fields = permissionManage.filterColumnPermissions(fields, desensitizationList, datasetGroupInfoDTO.getId(), null); if (ObjectUtils.isEmpty(fields)) { DEException.throwException(Translator.get("i18n_no_column_permission")); } @@ -684,11 +667,11 @@ public class DatasetDataManage { } boolean needOrder = Utils.isNeedOrder(dsList); - List rowPermissionsTree = new ArrayList<>(); - TokenUserBO user = AuthUtils.getUser(); - if (user != null) { - rowPermissionsTree = permissionManage.getRowPermissionsTree(datasetGroupInfoDTO.getId(), user.getUserId()); - } +// List rowPermissionsTree = new ArrayList<>(); +// TokenUserBO user = AuthUtils.getUser(); +// if (user != null) { +// rowPermissionsTree = permissionManage.getRowPermissionsTree(datasetGroupInfoDTO.getId(), user.getUserId()); +// } Provider provider; if (crossDs) { @@ -704,7 +687,7 @@ public class DatasetDataManage { } Field2SQLObj.field2sqlObj(sqlMeta, fields, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); - WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); +// WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); Order2SQLObj.getOrders(sqlMeta, datasetGroupInfoDTO.getSortFields(), allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); String querySQL; if (multFieldValuesRequest.getResultMode() == 0) { @@ -807,13 +790,13 @@ public class DatasetDataManage { Long datasetGroupId = field.getDatasetGroupId(); // check permission - BusiPerCheckDTO dto = new BusiPerCheckDTO(); - dto.setId(datasetGroupId); - dto.setAuthEnum(AuthEnum.READ); - boolean checked = corePermissionManage.checkAuth(dto); - if (!checked) { - DEException.throwException(Translator.get("i18n_no_dataset_permission")); - } +// BusiPerCheckDTO dto = new BusiPerCheckDTO(); +// dto.setId(datasetGroupId); +// dto.setAuthEnum(AuthEnum.READ); +// boolean checked = corePermissionManage.checkAuth(dto); +// if (!checked) { +// DEException.throwException(Translator.get("i18n_no_dataset_permission")); +// } if (field.getChartId() != null) { allFields.addAll(datasetTableFieldManage.getChartCalcFields(field.getChartId())); @@ -838,7 +821,7 @@ public class DatasetDataManage { // 获取allFields Map desensitizationList = new HashMap<>(); - fields = permissionManage.filterColumnPermissions(fields, desensitizationList, datasetGroupInfoDTO.getId(), null); +// fields = permissionManage.filterColumnPermissions(fields, desensitizationList, datasetGroupInfoDTO.getId(), null); if (ObjectUtils.isEmpty(fields)) { DEException.throwException(Translator.get("i18n_no_column_permission")); } @@ -850,11 +833,11 @@ public class DatasetDataManage { } boolean needOrder = Utils.isNeedOrder(dsList); - List rowPermissionsTree = new ArrayList<>(); - TokenUserBO user = AuthUtils.getUser(); - if (user != null) { - rowPermissionsTree = permissionManage.getRowPermissionsTree(datasetGroupInfoDTO.getId(), user.getUserId()); - } +// List rowPermissionsTree = new ArrayList<>(); +// TokenUserBO user = AuthUtils.getUser(); +// if (user != null) { +// rowPermissionsTree = permissionManage.getRowPermissionsTree(datasetGroupInfoDTO.getId(), user.getUserId()); +// } //组件过滤条件 List extFilterList = new ArrayList<>(); @@ -966,7 +949,7 @@ public class DatasetDataManage { Field2SQLObj.field2sqlObj(sqlMeta, fields, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); ExtWhere2Str.extWhere2sqlOjb(sqlMeta, extFilterList, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); - WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); +// WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); Order2SQLObj.getOrders(sqlMeta, datasetGroupInfoDTO.getSortFields(), allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); String querySQL; if (request.getResultMode() == 0) { @@ -1075,7 +1058,7 @@ public class DatasetDataManage { } Map desensitizationList = new HashMap<>(); - fields = permissionManage.filterColumnPermissions(fields, desensitizationList, datasetGroupInfoDTO.getId(), null); +// fields = permissionManage.filterColumnPermissions(fields, desensitizationList, datasetGroupInfoDTO.getId(), null); if (ObjectUtils.isEmpty(fields)) { DEException.throwException(Translator.get("i18n_no_column_permission")); } @@ -1087,11 +1070,11 @@ public class DatasetDataManage { } boolean needOrder = Utils.isNeedOrder(dsList); - List rowPermissionsTree = new ArrayList<>(); - TokenUserBO user = AuthUtils.getUser(); - if (user != null) { - rowPermissionsTree = permissionManage.getRowPermissionsTree(datasetGroupInfoDTO.getId(), user.getUserId()); - } +// List rowPermissionsTree = new ArrayList<>(); +// TokenUserBO user = AuthUtils.getUser(); +// if (user != null) { +// rowPermissionsTree = permissionManage.getRowPermissionsTree(datasetGroupInfoDTO.getId(), user.getUserId()); +// } Provider provider; if (crossDs) { @@ -1101,7 +1084,7 @@ public class DatasetDataManage { } Field2SQLObj.field2sqlObj(sqlMeta, fields, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); - WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); +// WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); Order2SQLObj.getOrders(sqlMeta, datasetGroupInfoDTO.getSortFields(), allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); String querySQL; if (multFieldValuesRequest.getResultMode() == 0) { diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetGroupManage.java similarity index 88% rename from core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java rename to core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetGroupManage.java index a22b9d0..d76bbfa 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetGroupManage.java @@ -1,37 +1,34 @@ -package io.dataease.dataset.manage; +package io.gisbi.dataset.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; -import io.dataease.api.dataset.union.DatasetGroupInfoDTO; -import io.dataease.api.dataset.union.UnionDTO; -import io.dataease.api.dataset.vo.DataSetBarVO; -import io.dataease.api.permissions.relation.api.RelationApi; -import io.dataease.commons.constants.OptConstants; -import io.dataease.dataset.dao.auto.entity.CoreDatasetGroup; -import io.dataease.dataset.dao.auto.entity.CoreDatasetTable; -import io.dataease.dataset.dao.auto.mapper.CoreDatasetGroupMapper; -import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableMapper; -import io.dataease.dataset.dao.ext.mapper.CoreDataSetExtMapper; -import io.dataease.dataset.dao.ext.po.DataSetNodePO; -import io.dataease.dataset.dto.DataSetNodeBO; -import io.dataease.dataset.utils.FieldUtils; -import io.dataease.dataset.utils.TableUtils; -import io.dataease.datasource.dao.auto.entity.CoreDatasource; -import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper; -import io.dataease.engine.constant.ExtFieldConstant; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.DatasetTableDTO; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceDTO; -import io.dataease.extensions.view.dto.SqlVariableDetails; -import io.dataease.i18n.Translator; -import io.dataease.license.config.XpackInteract; -import io.dataease.license.utils.LicenseUtil; -import io.dataease.model.BusiNodeRequest; -import io.dataease.model.BusiNodeVO; -import io.dataease.operation.manage.CoreOptRecentManage; -import io.dataease.system.manage.CoreUserManage; -import io.dataease.utils.*; +import io.gisbi.api.dataset.union.DatasetGroupInfoDTO; +import io.gisbi.api.dataset.union.UnionDTO; +import io.gisbi.api.dataset.vo.DataSetBarVO; +import io.gisbi.commons.constants.OptConstants; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetGroup; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetTable; +import io.gisbi.dataset.dao.auto.mapper.CoreDatasetGroupMapper; +import io.gisbi.dataset.dao.auto.mapper.CoreDatasetTableMapper; +import io.gisbi.dataset.dao.ext.mapper.CoreDataSetExtMapper; +import io.gisbi.dataset.dao.ext.po.DataSetNodePO; +import io.gisbi.dataset.dto.DataSetNodeBO; +import io.gisbi.dataset.utils.FieldUtils; +import io.gisbi.dataset.utils.TableUtils; +import io.gisbi.datasource.dao.auto.entity.CoreDatasource; +import io.gisbi.datasource.dao.auto.mapper.CoreDatasourceMapper; +import io.gisbi.engine.constant.ExtFieldConstant; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.DatasetTableDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasourceDTO; +import io.gisbi.extensions.view.dto.SqlVariableDetails; +import io.gisbi.i18n.Translator; +import io.gisbi.model.BusiNodeRequest; +import io.gisbi.model.BusiNodeVO; +import io.gisbi.operation.manage.CoreOptRecentManage; +import io.gisbi.system.manage.CoreUserManage; +import io.gisbi.utils.*; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -46,7 +43,7 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; /** - * @Author Junjun + * @Author bi-coder */ @Component @Transactional(rollbackFor = Exception.class) @@ -61,8 +58,7 @@ public class DatasetGroupManage { private DatasetTableManage datasetTableManage; @Resource private DatasetTableFieldManage datasetTableFieldManage; - @Resource - private PermissionManage permissionManage; + @Resource private CoreDataSetExtMapper coreDataSetExtMapper; @Resource @@ -77,8 +73,6 @@ public class DatasetGroupManage { @Resource private CoreOptRecentManage coreOptRecentManage; - @Autowired(required = false) - private RelationApi relationManage; private static final String leafType = "dataset"; @@ -147,7 +141,6 @@ public class DatasetGroupManage { return null; } - @XpackInteract(value = "authResourceTree", before = false) public void innerEdit(DatasetGroupInfoDTO datasetGroupInfoDTO) { checkName(datasetGroupInfoDTO); CoreDatasetGroup coreDatasetGroup = BeanUtils.copyBean(new CoreDatasetGroup(), datasetGroupInfoDTO); @@ -156,15 +149,12 @@ public class DatasetGroupManage { coreOptRecentManage.saveOpt(datasetGroupInfoDTO.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASET, OptConstants.OPT_TYPE.UPDATE); } - @XpackInteract(value = "authResourceTree", before = false) public void innerSave(DatasetGroupInfoDTO datasetGroupInfoDTO) { checkName(datasetGroupInfoDTO); CoreDatasetGroup coreDatasetGroup = BeanUtils.copyBean(new CoreDatasetGroup(), datasetGroupInfoDTO); coreDatasetGroupMapper.insert(coreDatasetGroup); coreOptRecentManage.saveOpt(coreDatasetGroup.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASET, OptConstants.OPT_TYPE.NEW); } - - @XpackInteract(value = "authResourceTree", before = false) public DatasetGroupInfoDTO move(DatasetGroupInfoDTO datasetGroupInfoDTO) { checkName(datasetGroupInfoDTO); if (datasetGroupInfoDTO.getPid() != 0) { @@ -182,21 +172,21 @@ public class DatasetGroupManage { } public boolean perDelete(Long id) { - if (LicenseUtil.licenseValid()) { - try { - relationManage.checkAuth(); - } catch (Exception e) { - return false; - } - Long count = relationManage.getDatasetResource(id); - if (count > 0) { - return true; - } - } - return false; +// if (LicenseUtil.licenseValid()) { +// try { +// relationManage.checkAuth(); +// } catch (Exception e) { +// return false; +// } +// Long count = relationManage.getDatasetResource(id); +// if (count > 0) { +// return true; +// } +// } + return true; } - @XpackInteract(value = "authResourceTree", before = false) + public void delete(Long id) { CoreDatasetGroup coreDatasetGroup = coreDatasetGroupMapper.selectById(id); if (ObjectUtils.isEmpty(coreDatasetGroup)) { @@ -222,9 +212,8 @@ public class DatasetGroupManage { } - @XpackInteract(value = "authResourceTree", replace = true, invalid = true) - public List tree(BusiNodeRequest request) { + public List tree(BusiNodeRequest request) { QueryWrapper queryWrapper = new QueryWrapper<>(); if (ObjectUtils.isNotEmpty(request.getLeaf())) { queryWrapper.eq("node_type", request.getLeaf() ? "dataset" : "folder"); @@ -292,27 +281,25 @@ public class DatasetGroupManage { } public void checkName(DatasetGroupInfoDTO dto) { - if (!LicenseUtil.licenseValid()) { - QueryWrapper wrapper = new QueryWrapper<>(); - if (ObjectUtils.isNotEmpty(dto.getPid())) { - wrapper.eq("pid", dto.getPid()); - } - if (StringUtils.isNotEmpty(dto.getName())) { - wrapper.eq("name", dto.getName()); - } - if (ObjectUtils.isNotEmpty(dto.getId())) { - wrapper.ne("id", dto.getId()); - } - if (ObjectUtils.isNotEmpty(dto.getLevel())) { - wrapper.eq("level", dto.getLevel()); - } - if (ObjectUtils.isNotEmpty(dto.getNodeType())) { - wrapper.eq("node_type", dto.getNodeType()); - } - List list = coreDatasetGroupMapper.selectList(wrapper); - if (list.size() > 0) { - DEException.throwException(Translator.get("i18n_ds_name_exists")); - } + QueryWrapper wrapper = new QueryWrapper<>(); + if (ObjectUtils.isNotEmpty(dto.getPid())) { + wrapper.eq("pid", dto.getPid()); + } + if (StringUtils.isNotEmpty(dto.getName())) { + wrapper.eq("name", dto.getName()); + } + if (ObjectUtils.isNotEmpty(dto.getId())) { + wrapper.ne("id", dto.getId()); + } + if (ObjectUtils.isNotEmpty(dto.getLevel())) { + wrapper.eq("level", dto.getLevel()); + } + if (ObjectUtils.isNotEmpty(dto.getNodeType())) { + wrapper.eq("node_type", dto.getNodeType()); + } + List list = coreDatasetGroupMapper.selectList(wrapper); + if (list.size() > 0) { + DEException.throwException(Translator.get("i18n_ds_name_exists")); } } diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetSQLManage.java similarity index 89% rename from core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java rename to core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetSQLManage.java index 81dcdfa..36f22e2 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetSQLManage.java @@ -1,41 +1,35 @@ -package io.dataease.dataset.manage; +package io.gisbi.dataset.manage; -import io.dataease.api.dataset.union.*; -import io.dataease.api.permissions.auth.dto.BusiPerCheckDTO; -import io.dataease.api.permissions.dataset.api.RowPermissionsApi; -import io.dataease.api.permissions.user.vo.UserFormVO; -import io.dataease.commons.utils.SqlparserUtils; -import io.dataease.constant.AuthEnum; -import io.dataease.dataset.constant.DatasetTableType; -import io.dataease.dataset.utils.DatasetTableTypeConstants; -import io.dataease.dataset.utils.SqlUtils; -import io.dataease.dataset.utils.TableUtils; -import io.dataease.datasource.dao.auto.entity.CoreDatasource; -import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper; -import io.dataease.datasource.manage.DataSourceManage; -import io.dataease.datasource.manage.EngineManage; -import io.dataease.engine.constant.ExtFieldConstant; -import io.dataease.constant.SQLConstants; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.dto.DatasetTableDTO; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.dto.DsTypeDTO; -import io.dataease.extensions.datasource.factory.ProviderFactory; -import io.dataease.extensions.datasource.model.SQLObj; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; -import io.dataease.extensions.datasource.vo.XpackPluginsDatasourceVO; -import io.dataease.extensions.view.dto.ChartExtFilterDTO; -import io.dataease.extensions.view.dto.ChartExtRequest; -import io.dataease.extensions.view.dto.SqlVariableDetails; -import io.dataease.i18n.Translator; +import io.gisbi.api.dataset.union.*; +import io.gisbi.commons.utils.SqlparserUtils; +import io.gisbi.dataset.constant.DatasetTableType; +import io.gisbi.dataset.utils.DatasetTableTypeConstants; +import io.gisbi.dataset.utils.SqlUtils; +import io.gisbi.dataset.utils.TableUtils; +import io.gisbi.datasource.dao.auto.entity.CoreDatasource; +import io.gisbi.datasource.dao.auto.mapper.CoreDatasourceMapper; +import io.gisbi.datasource.manage.DataSourceManage; +import io.gisbi.datasource.manage.EngineManage; +import io.gisbi.engine.constant.ExtFieldConstant; +import io.gisbi.constant.SQLConstants; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.dto.DatasetTableDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.dto.DsTypeDTO; +import io.gisbi.extensions.datasource.factory.ProviderFactory; +import io.gisbi.extensions.datasource.model.SQLObj; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.vo.XpackPluginsDatasourceVO; +import io.gisbi.extensions.view.dto.ChartExtFilterDTO; +import io.gisbi.extensions.view.dto.ChartExtRequest; +import io.gisbi.extensions.view.dto.SqlVariableDetails; +import io.gisbi.i18n.Translator; import io.dataease.license.utils.LicenseUtil; -import io.dataease.system.manage.CorePermissionManage; -import io.dataease.utils.AuthUtils; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.JsonUtil; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.JsonUtil; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -50,7 +44,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Author Junjun + * @Author bi-coder */ @Component public class DatasetSQLManage { @@ -60,20 +54,11 @@ public class DatasetSQLManage { @Resource private EngineManage engineManage; - @Resource - private CorePermissionManage corePermissionManage; - @Autowired(required = false) private PluginManageApi pluginManage; - @Autowired(required = false) - private RowPermissionsApi rowPermissionsApi; @Resource private DataSourceManage dataSourceManage; - private RowPermissionsApi getRowPermissionsApi() { - return rowPermissionsApi; - } - private static Logger logger = LoggerFactory.getLogger(DatasetSQLManage.class); private List filterParameters(ChartExtRequest chartExtRequest, Long datasetTableId) { @@ -463,12 +448,6 @@ public class DatasetSQLManage { } } - private UserFormVO getUserEntity() { - if (getRowPermissionsApi() == null) { - return null; - } - return getRowPermissionsApi().getUserById(AuthUtils.getUser().getUserId()); - } private SQLObj getUnionTable(DatasetTableDTO currentDs, DatasetTableInfoDTO infoDTO, String tableSchema, int index, List parameters, boolean isFromDataSet, boolean isCross, Map dsMap) { SQLObj tableObj; @@ -479,7 +458,7 @@ public class DatasetSQLManage { Provider provider = ProviderFactory.getProvider(dsMap.entrySet().iterator().next().getValue().getType()); // parser sql params and replace default value String s = new String(Base64.getDecoder().decode(infoDTO.getSql())); - String sql = new SqlparserUtils().handleVariableDefaultValue(s, currentDs.getSqlVariableDetails(), false, isFromDataSet, parameters, isCross, dsMap, pluginManage, getUserEntity()); + String sql = new SqlparserUtils().handleVariableDefaultValue(s, currentDs.getSqlVariableDetails(), false, isFromDataSet, parameters, isCross, dsMap, pluginManage); sql = provider.replaceComment(sql); // add table schema if (isCross) { @@ -495,15 +474,13 @@ public class DatasetSQLManage { private String putObj2Map(Map dsMap, DatasetTableDTO ds, boolean isCross) throws Exception { // 通过datasource id校验数据源权限 - BusiPerCheckDTO dto = new BusiPerCheckDTO(); - dto.setId(ds.getDatasourceId()); - dto.setAuthEnum(AuthEnum.READ); - boolean checked = corePermissionManage.checkAuth(dto); - if (!checked) { - DEException.throwException(Translator.get("i18n_no_datasource_permission")); - } - - +// BusiPerCheckDTO dto = new BusiPerCheckDTO(); +// dto.setId(ds.getDatasourceId()); +// dto.setAuthEnum(AuthEnum.READ); +// boolean checked = corePermissionManage.checkAuth(dto); +// if (!checked) { +// DEException.throwException(Translator.get("i18n_no_datasource_permission")); +// } String schemaAlias; if (StringUtils.equalsIgnoreCase(ds.getType(), DatasetTableType.DB) || StringUtils.equalsIgnoreCase(ds.getType(), DatasetTableType.SQL)) { CoreDatasource coreDatasource = dataSourceManage.getCoreDatasource(ds.getDatasourceId()); diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetTableFieldManage.java similarity index 79% rename from core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java rename to core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetTableFieldManage.java index 813b5a2..6db1d9b 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetTableFieldManage.java @@ -1,27 +1,27 @@ -package io.dataease.dataset.manage; +package io.gisbi.dataset.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; -import io.dataease.api.dataset.union.DatasetGroupInfoDTO; -import io.dataease.dataset.dao.auto.entity.CoreDatasetTableField; -import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper; -import io.dataease.dataset.utils.TableUtils; -import io.dataease.engine.constant.ExtFieldConstant; -import io.dataease.engine.func.FunctionConstant; -import io.dataease.engine.utils.Utils; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.dto.CalParam; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.dto.FieldGroupDTO; -import io.dataease.extensions.datasource.model.SQLObj; -import io.dataease.extensions.view.dto.ColumnPermissionItem; -import io.dataease.i18n.Translator; -import io.dataease.utils.AuthUtils; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.IDUtils; -import io.dataease.utils.JsonUtil; +import io.gisbi.api.dataset.union.DatasetGroupInfoDTO; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetTableField; +import io.gisbi.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper; +import io.gisbi.dataset.utils.TableUtils; +import io.gisbi.engine.constant.ExtFieldConstant; +import io.gisbi.engine.func.FunctionConstant; +import io.gisbi.engine.utils.Utils; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.dto.CalParam; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.dto.FieldGroupDTO; +import io.gisbi.extensions.datasource.model.SQLObj; +import io.gisbi.extensions.view.dto.ColumnPermissionItem; +import io.gisbi.i18n.Translator; +import io.gisbi.utils.AuthUtils; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.IDUtils; +import io.gisbi.utils.JsonUtil; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -34,15 +34,14 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Author Junjun + * @Author bi-coder */ @Component @Transactional public class DatasetTableFieldManage { @Resource private CoreDatasetTableFieldMapper coreDatasetTableFieldMapper; - @Resource - private PermissionManage permissionManage; + @Resource private DatasetSQLManage datasetSQLManage; @Resource @@ -229,7 +228,7 @@ public class DatasetTableFieldManage { List list = transDTO(coreDatasetTableFieldMapper.selectList(wrapper)); Map desensitizationList = new HashMap<>(); - list = permissionManage.filterColumnPermissions(list, desensitizationList, id, null); +// list = permissionManage.filterColumnPermissions(list, desensitizationList, id, null); List dimensionList = list.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getGroupType(), "d")).collect(Collectors.toList()); List quotaList = list.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getGroupType(), "q")).collect(Collectors.toList()); @@ -241,43 +240,43 @@ public class DatasetTableFieldManage { public List listFieldsWithPermissions(Long id) { List fields = selectByDatasetGroupId(id); - Map desensitizationList = new HashMap<>(); - Long userId = AuthUtils.getUser() == null ? null : AuthUtils.getUser().getUserId(); - List tmp = permissionManage - .filterColumnPermissions(fields, desensitizationList, id, userId) - .stream() - .sorted(Comparator.comparing(DatasetTableFieldDTO::getGroupType)) - .toList(); - tmp.forEach(ele -> ele.setDesensitized(desensitizationList.containsKey(ele.getDataeaseName()))); - return tmp; +// Map desensitizationList = new HashMap<>(); +// Long userId = AuthUtils.getUser() == null ? null : AuthUtils.getUser().getUserId(); +// List tmp = permissionManage +// .filterColumnPermissions(fields, desensitizationList, id, userId) +// .stream() +// .sorted(Comparator.comparing(DatasetTableFieldDTO::getGroupType)) +// .toList(); +// tmp.forEach(ele -> ele.setDesensitized(desensitizationList.containsKey(ele.getDataeaseName()))); + return fields; } public List listFieldsWithPermissionsRemoveAgg(Long id) { List fields = selectByDatasetGroupId(id); - Map desensitizationList = new HashMap<>(); - Long userId = AuthUtils.getUser() == null ? null : AuthUtils.getUser().getUserId(); - SQLObj tableObj = new SQLObj(); - tableObj.setTableAlias(""); - List tmp = permissionManage - .filterColumnPermissions(fields, desensitizationList, id, userId) - .stream() - .filter(ele -> { - boolean flag = true; - if (Objects.equals(ele.getExtField(), ExtFieldConstant.EXT_CALC)) { - String originField = Utils.calcFieldRegex(ele, tableObj, fields, true, null, Utils.mergeParam(Utils.getParams(fields), null), pluginManage); - for (String func : FunctionConstant.AGG_FUNC) { - if (Utils.matchFunction(func, originField)) { - flag = false; - break; - } - } - } - return flag; - }) - .sorted(Comparator.comparing(DatasetTableFieldDTO::getGroupType)) - .toList(); - tmp.forEach(ele -> ele.setDesensitized(desensitizationList.containsKey(ele.getDataeaseName()))); - return tmp; +// Map desensitizationList = new HashMap<>(); +// Long userId = AuthUtils.getUser() == null ? null : AuthUtils.getUser().getUserId(); +// SQLObj tableObj = new SQLObj(); +// tableObj.setTableAlias(""); +// List tmp = permissionManage +// .filterColumnPermissions(fields, desensitizationList, id, userId) +// .stream() +// .filter(ele -> { +// boolean flag = true; +// if (Objects.equals(ele.getExtField(), ExtFieldConstant.EXT_CALC)) { +// String originField = Utils.calcFieldRegex(ele, tableObj, fields, true, null, Utils.mergeParam(Utils.getParams(fields), null), pluginManage); +// for (String func : FunctionConstant.AGG_FUNC) { +// if (Utils.matchFunction(func, originField)) { +// flag = false; +// break; +// } +// } +// } +// return flag; +// }) +// .sorted(Comparator.comparing(DatasetTableFieldDTO::getGroupType)) +// .toList(); +// tmp.forEach(ele -> ele.setDesensitized(desensitizationList.containsKey(ele.getDataeaseName()))); + return fields; } public DatasetTableFieldDTO transObj(CoreDatasetTableField ele) { diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableManage.java b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetTableManage.java similarity index 86% rename from core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableManage.java rename to core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetTableManage.java index aff4d42..94583c2 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableManage.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetTableManage.java @@ -1,13 +1,13 @@ -package io.dataease.dataset.manage; +package io.gisbi.dataset.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.dataset.dao.auto.entity.CoreDatasetTable; -import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableMapper; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.DatasetTableDTO; -import io.dataease.i18n.Translator; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.IDUtils; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetTable; +import io.gisbi.dataset.dao.auto.mapper.CoreDatasetTableMapper; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.DatasetTableDTO; +import io.gisbi.i18n.Translator; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.IDUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ import org.springframework.util.CollectionUtils; import java.util.List; /** - * @Author Junjun + * @Author bi-coder */ @Component public class DatasetTableManage { diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableSqlLogManage.java b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetTableSqlLogManage.java similarity index 87% rename from core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableSqlLogManage.java rename to core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetTableSqlLogManage.java index 9a1f818..9b70771 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableSqlLogManage.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetTableSqlLogManage.java @@ -1,10 +1,10 @@ -package io.dataease.dataset.manage; +package io.gisbi.dataset.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.api.dataset.dto.SqlLogDTO; -import io.dataease.dataset.dao.auto.entity.CoreDatasetTableSqlLog; -import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableSqlLogMapper; -import io.dataease.utils.BeanUtils; +import io.gisbi.api.dataset.dto.SqlLogDTO; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetTableSqlLog; +import io.gisbi.dataset.dao.auto.mapper.CoreDatasetTableSqlLogMapper; +import io.gisbi.utils.BeanUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Component; @@ -15,7 +15,7 @@ import java.util.UUID; import java.util.stream.Collectors; /** - * @Author Junjun + * @Author bi-coder */ @Component @Transactional(rollbackFor = Exception.class) diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java b/core/core-backend/src/main/java/io/gisbi/dataset/manage/PermissionManage.java similarity index 94% rename from core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java rename to core/core-backend/src/main/java/io/gisbi/dataset/manage/PermissionManage.java index cf62ff9..862991b 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/manage/PermissionManage.java @@ -1,21 +1,21 @@ -package io.dataease.dataset.manage; +package io.gisbi.dataset.manage; import com.fasterxml.jackson.core.type.TypeReference; -import io.dataease.api.permissions.dataset.api.ColumnPermissionsApi; -import io.dataease.api.permissions.dataset.api.RowPermissionsApi; -import io.dataease.api.permissions.dataset.dto.*; -import io.dataease.api.permissions.user.vo.UserFormVO; -import io.dataease.api.permissions.variable.dto.SysVariableValueDto; -import io.dataease.api.permissions.variable.dto.SysVariableValueItem; -import io.dataease.constant.ColumnPermissionConstants; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.view.dto.ColumnPermissionItem; -import io.dataease.extensions.view.dto.ColumnPermissions; -import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeItem; -import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeObj; -import io.dataease.utils.AuthUtils; -import io.dataease.utils.JsonUtil; +import io.gisbi.api.permissions.dataset.api.ColumnPermissionsApi; +import io.gisbi.api.permissions.dataset.api.RowPermissionsApi; +import io.gisbi.api.permissions.dataset.dto.*; +import io.gisbi.api.permissions.user.vo.UserFormVO; +import io.gisbi.api.permissions.variable.dto.SysVariableValueDto; +import io.gisbi.api.permissions.variable.dto.SysVariableValueItem; +import io.gisbi.constant.ColumnPermissionConstants; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.view.dto.ColumnPermissionItem; +import io.gisbi.extensions.view.dto.ColumnPermissions; +import io.gisbi.extensions.view.dto.DatasetRowPermissionsTreeItem; +import io.gisbi.extensions.view.dto.DatasetRowPermissionsTreeObj; +import io.gisbi.utils.AuthUtils; +import io.gisbi.utils.JsonUtil; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -29,10 +29,8 @@ import java.util.stream.Collectors; @Service public class PermissionManage { - @Autowired(required = false) private RowPermissionsApi rowPermissionsApi; - @Autowired(required = false) private ColumnPermissionsApi columnPermissionsApi = null; @Resource diff --git a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java b/core/core-backend/src/main/java/io/gisbi/dataset/server/DatasetDataServer.java similarity index 81% rename from core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java rename to core/core-backend/src/main/java/io/gisbi/dataset/server/DatasetDataServer.java index 9e73d90..c8b2317 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/server/DatasetDataServer.java @@ -1,16 +1,16 @@ -package io.dataease.dataset.server; +package io.gisbi.dataset.server; -import io.dataease.api.dataset.DatasetDataApi; -import io.dataease.api.dataset.dto.BaseTreeNodeDTO; -import io.dataease.api.dataset.dto.EnumValueRequest; -import io.dataease.api.dataset.dto.MultFieldValuesRequest; -import io.dataease.api.dataset.dto.PreviewSqlDTO; -import io.dataease.api.dataset.union.DatasetGroupInfoDTO; -import io.dataease.api.dataset.dto.EnumObj; -import io.dataease.dataset.manage.DatasetDataManage; -import io.dataease.extensions.datasource.dto.DatasetTableDTO; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.utils.LogUtil; +import io.gisbi.api.dataset.DatasetDataApi; +import io.gisbi.api.dataset.dto.BaseTreeNodeDTO; +import io.gisbi.api.dataset.dto.EnumValueRequest; +import io.gisbi.api.dataset.dto.MultFieldValuesRequest; +import io.gisbi.api.dataset.dto.PreviewSqlDTO; +import io.gisbi.api.dataset.union.DatasetGroupInfoDTO; +import io.gisbi.api.dataset.dto.EnumObj; +import io.gisbi.dataset.manage.DatasetDataManage; +import io.gisbi.extensions.datasource.dto.DatasetTableDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.utils.LogUtil; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; /** - * @Author Junjun + * @Author bi-coder */ @RestController @RequestMapping("datasetData") diff --git a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetFieldServer.java b/core/core-backend/src/main/java/io/gisbi/dataset/server/DatasetFieldServer.java similarity index 85% rename from core/core-backend/src/main/java/io/dataease/dataset/server/DatasetFieldServer.java rename to core/core-backend/src/main/java/io/gisbi/dataset/server/DatasetFieldServer.java index 4a413fd..ae1d83d 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetFieldServer.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/server/DatasetFieldServer.java @@ -1,12 +1,12 @@ -package io.dataease.dataset.server; +package io.gisbi.dataset.server; -import io.dataease.api.dataset.DatasetTableApi; -import io.dataease.api.dataset.dto.MultFieldValuesRequest; -import io.dataease.api.dataset.engine.SQLFunctionDTO; -import io.dataease.api.dataset.engine.SQLFunctionsEnum; -import io.dataease.dataset.manage.DatasetDataManage; -import io.dataease.dataset.manage.DatasetTableFieldManage; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.api.dataset.DatasetTableApi; +import io.gisbi.api.dataset.dto.MultFieldValuesRequest; +import io.gisbi.api.dataset.engine.SQLFunctionDTO; +import io.gisbi.api.dataset.engine.SQLFunctionsEnum; +import io.gisbi.dataset.manage.DatasetDataManage; +import io.gisbi.dataset.manage.DatasetTableFieldManage; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -18,7 +18,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @Author Junjun + * @Author bi-coder */ @RestController @RequestMapping("datasetField") diff --git a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTableSqlLogServer.java b/core/core-backend/src/main/java/io/gisbi/dataset/server/DatasetTableSqlLogServer.java similarity index 79% rename from core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTableSqlLogServer.java rename to core/core-backend/src/main/java/io/gisbi/dataset/server/DatasetTableSqlLogServer.java index ec0aad7..730555f 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTableSqlLogServer.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/server/DatasetTableSqlLogServer.java @@ -1,8 +1,8 @@ -package io.dataease.dataset.server; +package io.gisbi.dataset.server; -import io.dataease.api.dataset.DatasetTableSqlLogApi; -import io.dataease.api.dataset.dto.SqlLogDTO; -import io.dataease.dataset.manage.DatasetTableSqlLogManage; +import io.gisbi.api.dataset.DatasetTableSqlLogApi; +import io.gisbi.api.dataset.dto.SqlLogDTO; +import io.gisbi.dataset.manage.DatasetTableSqlLogManage; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - * @Author Junjun + * @Author bi-coder */ @RestController @RequestMapping("datasetTableSqlLog") diff --git a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTreeServer.java b/core/core-backend/src/main/java/io/gisbi/dataset/server/DatasetTreeServer.java similarity index 78% rename from core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTreeServer.java rename to core/core-backend/src/main/java/io/gisbi/dataset/server/DatasetTreeServer.java index d886cb6..8315044 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTreeServer.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/server/DatasetTreeServer.java @@ -1,20 +1,19 @@ -package io.dataease.dataset.server; +package io.gisbi.dataset.server; -import io.dataease.api.dataset.DatasetTreeApi; -import io.dataease.api.dataset.dto.DataSetExportRequest; -import io.dataease.api.dataset.dto.DatasetNodeDTO; -import io.dataease.api.dataset.union.DatasetGroupInfoDTO; -import io.dataease.api.dataset.vo.DataSetBarVO; -import io.dataease.constant.LogOT; -import io.dataease.constant.LogST; -import io.dataease.dataset.manage.DatasetGroupManage; -import io.dataease.exportCenter.manage.ExportCenterManage; -import io.dataease.exportCenter.server.ExportCenterServer; -import io.dataease.extensions.datasource.dto.DatasetTableDTO; -import io.dataease.extensions.view.dto.SqlVariableDetails; -import io.dataease.log.DeLog; -import io.dataease.model.BusiNodeRequest; -import io.dataease.model.BusiNodeVO; +import io.gisbi.api.dataset.DatasetTreeApi; +import io.gisbi.api.dataset.dto.DataSetExportRequest; +import io.gisbi.api.dataset.dto.DatasetNodeDTO; +import io.gisbi.api.dataset.union.DatasetGroupInfoDTO; +import io.gisbi.api.dataset.vo.DataSetBarVO; +import io.gisbi.constant.LogOT; +import io.gisbi.constant.LogST; +import io.gisbi.dataset.manage.DatasetGroupManage; +import io.gisbi.exportCenter.manage.ExportCenterManage; +import io.gisbi.extensions.datasource.dto.DatasetTableDTO; +import io.gisbi.extensions.view.dto.SqlVariableDetails; +import io.gisbi.log.DeLog; +import io.gisbi.model.BusiNodeRequest; +import io.gisbi.model.BusiNodeVO; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/utils/DatasetTableTypeConstants.java b/core/core-backend/src/main/java/io/gisbi/dataset/utils/DatasetTableTypeConstants.java similarity index 74% rename from core/core-backend/src/main/java/io/dataease/dataset/utils/DatasetTableTypeConstants.java rename to core/core-backend/src/main/java/io/gisbi/dataset/utils/DatasetTableTypeConstants.java index 32e008c..fef2636 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/utils/DatasetTableTypeConstants.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/utils/DatasetTableTypeConstants.java @@ -1,7 +1,7 @@ -package io.dataease.dataset.utils; +package io.gisbi.dataset.utils; /** - * @Author Junjun + * @Author bi-coder */ public class DatasetTableTypeConstants { public static String DATASET_TABLE_DB = "db"; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/utils/DatasetUtils.java b/core/core-backend/src/main/java/io/gisbi/dataset/utils/DatasetUtils.java similarity index 93% rename from core/core-backend/src/main/java/io/dataease/dataset/utils/DatasetUtils.java rename to core/core-backend/src/main/java/io/gisbi/dataset/utils/DatasetUtils.java index d11571a..763c3bd 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/utils/DatasetUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/utils/DatasetUtils.java @@ -1,7 +1,7 @@ -package io.dataease.dataset.utils; +package io.gisbi.dataset.utils; -import io.dataease.api.dataset.dto.BaseTreeNodeDTO; -import io.dataease.utils.TreeUtils; +import io.gisbi.api.dataset.dto.BaseTreeNodeDTO; +import io.gisbi.utils.TreeUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.util.Assert; @@ -13,7 +13,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @Author Junjun + * @Author bi-coder */ public class DatasetUtils { public final static String SEPARATOR = "-de-"; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/utils/FieldUtils.java b/core/core-backend/src/main/java/io/gisbi/dataset/utils/FieldUtils.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/dataset/utils/FieldUtils.java rename to core/core-backend/src/main/java/io/gisbi/dataset/utils/FieldUtils.java index c6f84f2..8f88bd6 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/utils/FieldUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/utils/FieldUtils.java @@ -1,11 +1,10 @@ -package io.dataease.dataset.utils; +package io.gisbi.dataset.utils; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; /** - * @Author Junjun + * @Author bi-coder */ public class FieldUtils { public static int transType2DeType(final String type) { diff --git a/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java b/core/core-backend/src/main/java/io/gisbi/dataset/utils/SqlUtils.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java rename to core/core-backend/src/main/java/io/gisbi/dataset/utils/SqlUtils.java index e7749dd..6716082 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/utils/SqlUtils.java @@ -1,7 +1,7 @@ -package io.dataease.dataset.utils; +package io.gisbi.dataset.utils; import com.google.common.collect.ImmutableList; -import io.dataease.exception.DEException; +import io.gisbi.exception.DEException; import org.apache.calcite.config.Lex; import org.apache.calcite.sql.*; import org.apache.calcite.sql.parser.SqlParseException; @@ -14,7 +14,7 @@ import java.util.List; import static org.apache.calcite.sql.SqlKind.*; /** - * @Author Junjun + * @Author bi-coder */ public class SqlUtils { public static Logger logger = LoggerFactory.getLogger(SqlUtils.class); diff --git a/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java b/core/core-backend/src/main/java/io/gisbi/dataset/utils/TableUtils.java similarity index 87% rename from core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java rename to core/core-backend/src/main/java/io/gisbi/dataset/utils/TableUtils.java index 7fec9dc..118f7a6 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/dataset/utils/TableUtils.java @@ -1,9 +1,9 @@ -package io.dataease.dataset.utils; +package io.gisbi.dataset.utils; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.dto.DsTypeDTO; -import io.dataease.extensions.datasource.model.SQLObj; -import io.dataease.utils.Md5Utils; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.dto.DsTypeDTO; +import io.gisbi.extensions.datasource.model.SQLObj; +import io.gisbi.utils.Md5Utils; import org.apache.calcite.avatica.util.Quoting; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDatasource.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDatasource.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDatasource.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDatasource.java index ddf6d34..4855bb0 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDatasource.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDatasource.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.dao.auto.entity; +package io.gisbi.datasource.dao.auto.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -10,7 +10,7 @@ import java.io.Serializable; * 数据源表 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-07-09 */ @TableName("core_datasource") diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDatasourceTask.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDatasourceTask.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDatasourceTask.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDatasourceTask.java index 3c1d550..b4a2741 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDatasourceTask.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDatasourceTask.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.dao.auto.entity; +package io.gisbi.datasource.dao.auto.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,7 +11,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-09-28 */ @TableName("core_datasource_task") diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDatasourceTaskLog.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDatasourceTaskLog.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDatasourceTaskLog.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDatasourceTaskLog.java index 981f58a..f2918a2 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDatasourceTaskLog.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDatasourceTaskLog.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.dao.auto.entity; +package io.gisbi.datasource.dao.auto.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -10,7 +10,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-09-28 */ @TableName("core_datasource_task_log") diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDeEngine.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDeEngine.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDeEngine.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDeEngine.java index 44f6c06..d70830e 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDeEngine.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDeEngine.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.dao.auto.entity; +package io.gisbi.datasource.dao.auto.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -10,7 +10,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-04-18 */ @TableName("core_de_engine") diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDriver.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDriver.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDriver.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDriver.java index 2caf3cf..a4fbc8e 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDriver.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDriver.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.dao.auto.entity; +package io.gisbi.datasource.dao.auto.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -10,7 +10,7 @@ import java.io.Serializable; * 驱动 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-04-18 */ @TableName("core_driver") diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDriverJar.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDriverJar.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDriverJar.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDriverJar.java index f6f5c14..d48f919 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDriverJar.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDriverJar.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.dao.auto.entity; +package io.gisbi.datasource.dao.auto.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -10,7 +10,7 @@ import java.io.Serializable; * 驱动详情 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-04-17 */ @TableName("core_driver_jar") diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDsFinishPage.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDsFinishPage.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDsFinishPage.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDsFinishPage.java index 98183d8..40bacf8 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/CoreDsFinishPage.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/CoreDsFinishPage.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.dao.auto.entity; +package io.gisbi.datasource.dao.auto.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -10,7 +10,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-10-08 */ @TableName("core_ds_finish_page") diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/QrtzSchedulerState.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/QrtzSchedulerState.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/QrtzSchedulerState.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/QrtzSchedulerState.java index 27ad845..4c5db42 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/QrtzSchedulerState.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/entity/QrtzSchedulerState.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.dao.auto.entity; +package io.gisbi.datasource.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-09-28 */ @TableName("QRTZ_SCHEDULER_STATE") diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDatasourceMapper.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDatasourceMapper.java similarity index 67% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDatasourceMapper.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDatasourceMapper.java index a27bc9a..ca2344b 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDatasourceMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDatasourceMapper.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.dao.auto.mapper; +package io.gisbi.datasource.dao.auto.mapper; -import io.dataease.datasource.dao.auto.entity.CoreDatasource; +import io.gisbi.datasource.dao.auto.entity.CoreDatasource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 数据源表 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-07-09 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDatasourceTaskLogMapper.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDatasourceTaskLogMapper.java similarity index 66% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDatasourceTaskLogMapper.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDatasourceTaskLogMapper.java index a27a200..dbfe3b3 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDatasourceTaskLogMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDatasourceTaskLogMapper.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.dao.auto.mapper; +package io.gisbi.datasource.dao.auto.mapper; -import io.dataease.datasource.dao.auto.entity.CoreDatasourceTaskLog; +import io.gisbi.datasource.dao.auto.entity.CoreDatasourceTaskLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-09-28 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDatasourceTaskMapper.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDatasourceTaskMapper.java similarity index 65% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDatasourceTaskMapper.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDatasourceTaskMapper.java index 8b132f9..ce5bdee 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDatasourceTaskMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDatasourceTaskMapper.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.dao.auto.mapper; +package io.gisbi.datasource.dao.auto.mapper; -import io.dataease.datasource.dao.auto.entity.CoreDatasourceTask; +import io.gisbi.datasource.dao.auto.entity.CoreDatasourceTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-09-28 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDeEngineMapper.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDeEngineMapper.java similarity index 65% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDeEngineMapper.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDeEngineMapper.java index f619c3f..1f1f28a 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDeEngineMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDeEngineMapper.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.dao.auto.mapper; +package io.gisbi.datasource.dao.auto.mapper; -import io.dataease.datasource.dao.auto.entity.CoreDeEngine; +import io.gisbi.datasource.dao.auto.entity.CoreDeEngine; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-04-18 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDriverJarMapper.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDriverJarMapper.java similarity index 67% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDriverJarMapper.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDriverJarMapper.java index c08a13a..1cb1cce 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDriverJarMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDriverJarMapper.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.dao.auto.mapper; +package io.gisbi.datasource.dao.auto.mapper; -import io.dataease.datasource.dao.auto.entity.CoreDriverJar; +import io.gisbi.datasource.dao.auto.entity.CoreDriverJar; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 驱动详情 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-04-17 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDriverMapper.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDriverMapper.java similarity index 66% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDriverMapper.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDriverMapper.java index 4fd312c..990a8bc 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDriverMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDriverMapper.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.dao.auto.mapper; +package io.gisbi.datasource.dao.auto.mapper; -import io.dataease.datasource.dao.auto.entity.CoreDriver; +import io.gisbi.datasource.dao.auto.entity.CoreDriver; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 驱动 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-04-18 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDsFinishPageMapper.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDsFinishPageMapper.java similarity index 65% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDsFinishPageMapper.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDsFinishPageMapper.java index fa91dab..5a39717 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/CoreDsFinishPageMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/CoreDsFinishPageMapper.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.dao.auto.mapper; +package io.gisbi.datasource.dao.auto.mapper; -import io.dataease.datasource.dao.auto.entity.CoreDsFinishPage; +import io.gisbi.datasource.dao.auto.entity.CoreDsFinishPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-10-08 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/QrtzSchedulerStateMapper.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/QrtzSchedulerStateMapper.java similarity index 65% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/QrtzSchedulerStateMapper.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/QrtzSchedulerStateMapper.java index db34ffd..b6e407a 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/mapper/QrtzSchedulerStateMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/auto/mapper/QrtzSchedulerStateMapper.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.dao.auto.mapper; +package io.gisbi.datasource.dao.auto.mapper; -import io.dataease.datasource.dao.auto.entity.QrtzSchedulerState; +import io.gisbi.datasource.dao.auto.entity.QrtzSchedulerState; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-09-28 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/CoreDatasourceExtMapper.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/mapper/CoreDatasourceExtMapper.java similarity index 80% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/CoreDatasourceExtMapper.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/mapper/CoreDatasourceExtMapper.java index 514341d..eb6eca9 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/CoreDatasourceExtMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/mapper/CoreDatasourceExtMapper.java @@ -1,8 +1,8 @@ -package io.dataease.datasource.dao.ext.mapper; +package io.gisbi.datasource.dao.ext.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.datasource.dao.ext.po.DsItem; -import io.dataease.datasource.dto.DatasourceNodePO; +import io.gisbi.datasource.dao.ext.po.DsItem; +import io.gisbi.datasource.dto.DatasourceNodePO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/DataSourceExtMapper.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/mapper/DataSourceExtMapper.java similarity index 75% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/DataSourceExtMapper.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/mapper/DataSourceExtMapper.java index 93d0574..72c2c63 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/DataSourceExtMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/mapper/DataSourceExtMapper.java @@ -1,8 +1,8 @@ -package io.dataease.datasource.dao.ext.mapper; +package io.gisbi.datasource.dao.ext.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.dataease.datasource.dao.ext.po.Ctimestamp; -import io.dataease.datasource.dao.ext.po.DataSourceNodePO; +import io.gisbi.datasource.dao.ext.po.Ctimestamp; +import io.gisbi.datasource.dao.ext.po.DataSourceNodePO; import org.apache.ibatis.annotations.*; @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/ExtDatasourceTaskMapper.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/mapper/ExtDatasourceTaskMapper.java similarity index 88% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/ExtDatasourceTaskMapper.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/mapper/ExtDatasourceTaskMapper.java index 17deed4..28528e2 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/ExtDatasourceTaskMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/mapper/ExtDatasourceTaskMapper.java @@ -1,13 +1,13 @@ -package io.dataease.datasource.dao.ext.mapper; +package io.gisbi.datasource.dao.ext.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.datasource.dto.CoreDatasourceTaskDTO; +import io.gisbi.datasource.dto.CoreDatasourceTaskDTO; import org.apache.ibatis.annotations.*; import java.util.List; /** - * @Author gin + * @Author bi-coder * @Date 2021/3/9 3:26 下午 */ @Mapper diff --git a/core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/mapper/TaskLogExtMapper.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/mapper/TaskLogExtMapper.java new file mode 100644 index 0000000..ebe7a51 --- /dev/null +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/mapper/TaskLogExtMapper.java @@ -0,0 +1 @@ +package io.gisbi.datasource.dao.ext.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.gisbi.api.ds.vo.CoreDatasourceTaskLogDTO; import org.apache.ibatis.annotations.*; @Mapper public interface TaskLogExtMapper extends BaseMapper { @Select( """ select * from core_datasource_task_log ${ew.customSqlSegment} """ ) @Results( id = "taskLog", value = { @Result(property = "id", column = "id"), @Result(property = "ds_id", column = "dsId"), @Result(property = "task_id", column = "taskId"), @Result(property = "start_time", column = "startTime"), @Result(property = "end_time", column = "endTime"), @Result(property = "task_status", column = "taskStatus"), @Result(property = "trigger_type", column = "triggerType"), @Result(property = "table_name", column = "tableName"), @Result(property = "info", column = "info") } ) IPage pager(IPage page, @Param("ew") QueryWrapper queryWrapper); } \ No newline at end of file diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/po/Ctimestamp.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/po/Ctimestamp.java similarity index 67% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/ext/po/Ctimestamp.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/po/Ctimestamp.java index 5719e5a..7ef24a5 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/po/Ctimestamp.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/po/Ctimestamp.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.dao.ext.po; +package io.gisbi.datasource.dao.ext.po; import lombok.Data; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/po/DataSourceNodePO.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/po/DataSourceNodePO.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/ext/po/DataSourceNodePO.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/po/DataSourceNodePO.java index 93d8239..3981b14 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/po/DataSourceNodePO.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/po/DataSourceNodePO.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.dao.ext.po; +package io.gisbi.datasource.dao.ext.po; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/po/DsItem.java b/core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/po/DsItem.java similarity index 85% rename from core/core-backend/src/main/java/io/dataease/datasource/dao/ext/po/DsItem.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/po/DsItem.java index d5b7a43..e95624f 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/po/DsItem.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dao/ext/po/DsItem.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.dao.ext.po; +package io.gisbi.datasource.dao.ext.po; import lombok.Data; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dto/CoreDatasourceTaskDTO.java b/core/core-backend/src/main/java/io/gisbi/datasource/dto/CoreDatasourceTaskDTO.java similarity index 73% rename from core/core-backend/src/main/java/io/dataease/datasource/dto/CoreDatasourceTaskDTO.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dto/CoreDatasourceTaskDTO.java index 2a6dcdc..db04c1d 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dto/CoreDatasourceTaskDTO.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dto/CoreDatasourceTaskDTO.java @@ -1,11 +1,11 @@ -package io.dataease.datasource.dto; +package io.gisbi.datasource.dto; -import io.dataease.datasource.dao.auto.entity.CoreDatasourceTask; +import io.gisbi.datasource.dao.auto.entity.CoreDatasourceTask; import lombok.Getter; import lombok.Setter; /** - * @Author gin + * @Author bi-coder * @Date 2021/3/9 3:19 下午 */ @Getter diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dto/DatasourceNodeBO.java b/core/core-backend/src/main/java/io/gisbi/datasource/dto/DatasourceNodeBO.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/datasource/dto/DatasourceNodeBO.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dto/DatasourceNodeBO.java index 33ee0c8..0c47a2c 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dto/DatasourceNodeBO.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dto/DatasourceNodeBO.java @@ -1,8 +1,8 @@ -package io.dataease.datasource.dto; +package io.gisbi.datasource.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.model.TreeBaseModel; +import io.gisbi.model.TreeBaseModel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dto/DatasourceNodePO.java b/core/core-backend/src/main/java/io/gisbi/datasource/dto/DatasourceNodePO.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/datasource/dto/DatasourceNodePO.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dto/DatasourceNodePO.java index 1ed2db9..aa63aac 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dto/DatasourceNodePO.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dto/DatasourceNodePO.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.dto; +package io.gisbi.datasource.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dto/es/EsResponse.java b/core/core-backend/src/main/java/io/gisbi/datasource/dto/es/EsResponse.java similarity index 93% rename from core/core-backend/src/main/java/io/dataease/datasource/dto/es/EsResponse.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dto/es/EsResponse.java index 45e4a42..4dfc3bb 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dto/es/EsResponse.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dto/es/EsResponse.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.dto.es; +package io.gisbi.datasource.dto.es; import lombok.Data; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dto/es/Request.java b/core/core-backend/src/main/java/io/gisbi/datasource/dto/es/Request.java similarity index 81% rename from core/core-backend/src/main/java/io/dataease/datasource/dto/es/Request.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dto/es/Request.java index 6a79b1a..ca20a93 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dto/es/Request.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dto/es/Request.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.dto.es; +package io.gisbi.datasource.dto.es; import lombok.Data; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dto/es/RequestWithCursor.java b/core/core-backend/src/main/java/io/gisbi/datasource/dto/es/RequestWithCursor.java similarity index 73% rename from core/core-backend/src/main/java/io/dataease/datasource/dto/es/RequestWithCursor.java rename to core/core-backend/src/main/java/io/gisbi/datasource/dto/es/RequestWithCursor.java index d67519a..974e753 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dto/es/RequestWithCursor.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/dto/es/RequestWithCursor.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.dto.es; +package io.gisbi.datasource.dto.es; import lombok.Data; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java b/core/core-backend/src/main/java/io/gisbi/datasource/manage/DataSourceManage.java similarity index 89% rename from core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java rename to core/core-backend/src/main/java/io/gisbi/datasource/manage/DataSourceManage.java index 970f934..81de977 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/manage/DataSourceManage.java @@ -1,28 +1,27 @@ -package io.dataease.datasource.manage; +package io.gisbi.datasource.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import io.dataease.api.lark.vo.LarkInfoVO; -import io.dataease.commons.constants.OptConstants; -import io.dataease.commons.constants.TaskStatus; -import io.dataease.constant.DataSourceType; -import io.dataease.constant.MessageEnum; -import io.dataease.datasource.dao.auto.entity.CoreDatasource; -import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper; -import io.dataease.datasource.dao.ext.mapper.CoreDatasourceExtMapper; -import io.dataease.datasource.dao.ext.mapper.DataSourceExtMapper; -import io.dataease.datasource.dao.ext.po.DataSourceNodePO; -import io.dataease.datasource.dao.ext.po.DsItem; -import io.dataease.datasource.dto.DatasourceNodeBO; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.DatasourceDTO; -import io.dataease.i18n.Translator; +import io.gisbi.commons.constants.OptConstants; +import io.gisbi.commons.constants.TaskStatus; +import io.gisbi.constant.DataSourceType; +import io.gisbi.constant.MessageEnum; +import io.gisbi.datasource.dao.auto.entity.CoreDatasource; +import io.gisbi.datasource.dao.auto.mapper.CoreDatasourceMapper; +import io.gisbi.datasource.dao.ext.mapper.CoreDatasourceExtMapper; +import io.gisbi.datasource.dao.ext.mapper.DataSourceExtMapper; +import io.gisbi.datasource.dao.ext.po.DataSourceNodePO; +import io.gisbi.datasource.dao.ext.po.DsItem; +import io.gisbi.datasource.dto.DatasourceNodeBO; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.DatasourceDTO; +import io.gisbi.i18n.Translator; import io.dataease.license.config.XpackInteract; import io.dataease.license.utils.LicenseUtil; -import io.dataease.model.BusiNodeRequest; -import io.dataease.model.BusiNodeVO; -import io.dataease.operation.manage.CoreOptRecentManage; -import io.dataease.utils.*; +import io.gisbi.model.BusiNodeRequest; +import io.gisbi.model.BusiNodeVO; +import io.gisbi.operation.manage.CoreOptRecentManage; +import io.gisbi.utils.*; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/manage/DatasourceSyncManage.java b/core/core-backend/src/main/java/io/gisbi/datasource/manage/DatasourceSyncManage.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/datasource/manage/DatasourceSyncManage.java rename to core/core-backend/src/main/java/io/gisbi/datasource/manage/DatasourceSyncManage.java index 2ff97d9..ce9d1dc 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/manage/DatasourceSyncManage.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/manage/DatasourceSyncManage.java @@ -1,27 +1,27 @@ -package io.dataease.datasource.manage; +package io.gisbi.datasource.manage; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import io.dataease.commons.constants.TaskStatus; -import io.dataease.dataset.utils.TableUtils; -import io.dataease.datasource.dao.auto.entity.CoreDatasource; -import io.dataease.datasource.dao.auto.entity.CoreDatasourceTask; -import io.dataease.datasource.dao.auto.entity.CoreDatasourceTaskLog; -import io.dataease.datasource.dao.auto.entity.CoreDeEngine; -import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper; -import io.dataease.datasource.provider.*; -import io.dataease.datasource.request.EngineRequest; -import io.dataease.datasource.server.DatasourceServer; -import io.dataease.datasource.server.DatasourceTaskServer; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.DatasetTableDTO; -import io.dataease.extensions.datasource.dto.DatasourceDTO; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.TableField; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; -import io.dataease.job.schedule.ExtractDataJob; -import io.dataease.job.schedule.ScheduleManager; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.LogUtil; +import io.gisbi.commons.constants.TaskStatus; +import io.gisbi.dataset.utils.TableUtils; +import io.gisbi.datasource.dao.auto.entity.CoreDatasource; +import io.gisbi.datasource.dao.auto.entity.CoreDatasourceTask; +import io.gisbi.datasource.dao.auto.entity.CoreDatasourceTaskLog; +import io.gisbi.datasource.dao.auto.entity.CoreDeEngine; +import io.gisbi.datasource.dao.auto.mapper.CoreDatasourceMapper; +import io.gisbi.datasource.provider.*; +import io.gisbi.datasource.request.EngineRequest; +import io.gisbi.datasource.server.DatasourceServer; +import io.gisbi.datasource.server.DatasourceTaskServer; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.DatasetTableDTO; +import io.gisbi.extensions.datasource.dto.DatasourceDTO; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.TableField; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.job.schedule.ExtractDataJob; +import io.gisbi.job.schedule.ScheduleManager; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.LogUtil; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.quartz.JobExecutionContext; @@ -31,8 +31,8 @@ import org.springframework.stereotype.Component; import java.util.*; -import static io.dataease.datasource.server.DatasourceTaskServer.ScheduleType.CRON; -import static io.dataease.datasource.server.DatasourceTaskServer.ScheduleType.MANUAL; +import static io.gisbi.datasource.server.DatasourceTaskServer.ScheduleType.CRON; +import static io.gisbi.datasource.server.DatasourceTaskServer.ScheduleType.MANUAL; @Component public class DatasourceSyncManage { diff --git a/core/core-backend/src/main/java/io/dataease/datasource/manage/EngineManage.java b/core/core-backend/src/main/java/io/gisbi/datasource/manage/EngineManage.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/datasource/manage/EngineManage.java rename to core/core-backend/src/main/java/io/gisbi/datasource/manage/EngineManage.java index 4a0810a..8e99a66 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/manage/EngineManage.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/manage/EngineManage.java @@ -1,20 +1,20 @@ -package io.dataease.datasource.manage; +package io.gisbi.datasource.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.datasource.dao.auto.entity.CoreDatasource; -import io.dataease.datasource.dao.auto.entity.CoreDeEngine; -import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper; -import io.dataease.datasource.dao.auto.mapper.CoreDeEngineMapper; -import io.dataease.datasource.type.H2; -import io.dataease.datasource.type.Mysql; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.DatasourceDTO; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.factory.ProviderFactory; -import io.dataease.result.ResultMessage; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.JsonUtil; -import io.dataease.utils.ModelUtils; +import io.gisbi.datasource.dao.auto.entity.CoreDatasource; +import io.gisbi.datasource.dao.auto.entity.CoreDeEngine; +import io.gisbi.datasource.dao.auto.mapper.CoreDatasourceMapper; +import io.gisbi.datasource.dao.auto.mapper.CoreDeEngineMapper; +import io.gisbi.datasource.type.H2; +import io.gisbi.datasource.type.Mysql; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.DatasourceDTO; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.factory.ProviderFactory; +import io.gisbi.result.ResultMessage; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.JsonUtil; +import io.gisbi.utils.ModelUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java b/core/core-backend/src/main/java/io/gisbi/datasource/provider/ApiUtils.java similarity index 99% rename from core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java rename to core/core-backend/src/main/java/io/gisbi/datasource/provider/ApiUtils.java index c1c43eb..2d6e508 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/provider/ApiUtils.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.provider; +package io.gisbi.datasource.provider; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,13 +6,13 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.jayway.jsonpath.JsonPath; -import io.dataease.extensions.datasource.dto.ApiDefinition; -import io.dataease.extensions.datasource.dto.ApiDefinitionRequest; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.DatasetTableDTO; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.TableField; -import io.dataease.utils.*; +import io.gisbi.extensions.datasource.dto.ApiDefinition; +import io.gisbi.extensions.datasource.dto.ApiDefinitionRequest; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.DatasetTableDTO; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.TableField; +import io.gisbi.utils.*; import org.apache.commons.lang3.StringUtils; import org.json.simple.JSONArray; import org.springframework.util.CollectionUtils; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/gisbi/datasource/provider/CalciteProvider.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java rename to core/core-backend/src/main/java/io/gisbi/datasource/provider/CalciteProvider.java index b37c9eb..aacb77d 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/provider/CalciteProvider.java @@ -1,23 +1,23 @@ -package io.dataease.datasource.provider; +package io.gisbi.datasource.provider; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jcraft.jsch.Session; -import io.dataease.dataset.utils.FieldUtils; -import io.dataease.datasource.dao.auto.entity.CoreDatasource; -import io.dataease.datasource.dao.auto.entity.CoreDriver; -import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper; -import io.dataease.datasource.manage.EngineManage; -import io.dataease.datasource.request.EngineRequest; -import io.dataease.datasource.type.*; -import io.dataease.constant.SQLConstants; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.*; -import io.dataease.extensions.datasource.provider.DriverShim; -import io.dataease.extensions.datasource.provider.ExtendedJdbcClassLoader; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; -import io.dataease.i18n.Translator; -import io.dataease.utils.*; +import io.gisbi.dataset.utils.FieldUtils; +import io.gisbi.datasource.dao.auto.entity.CoreDatasource; +import io.gisbi.datasource.dao.auto.entity.CoreDriver; +import io.gisbi.datasource.dao.auto.mapper.CoreDatasourceMapper; +import io.gisbi.datasource.manage.EngineManage; +import io.gisbi.datasource.request.EngineRequest; +import io.gisbi.datasource.type.*; +import io.gisbi.constant.SQLConstants; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.*; +import io.gisbi.extensions.datasource.provider.DriverShim; +import io.gisbi.extensions.datasource.provider.ExtendedJdbcClassLoader; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.i18n.Translator; +import io.gisbi.utils.*; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import org.apache.calcite.adapter.jdbc.JdbcSchema; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/EngineProvider.java b/core/core-backend/src/main/java/io/gisbi/datasource/provider/EngineProvider.java similarity index 69% rename from core/core-backend/src/main/java/io/dataease/datasource/provider/EngineProvider.java rename to core/core-backend/src/main/java/io/gisbi/datasource/provider/EngineProvider.java index 2b21ca4..b651955 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/EngineProvider.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/provider/EngineProvider.java @@ -1,14 +1,13 @@ -package io.dataease.datasource.provider; +package io.gisbi.datasource.provider; -import io.dataease.datasource.dao.auto.entity.CoreDeEngine; -import io.dataease.datasource.request.EngineRequest; -import io.dataease.datasource.server.DatasourceServer; -import io.dataease.extensions.datasource.dto.TableField; +import io.gisbi.datasource.dao.auto.entity.CoreDeEngine; +import io.gisbi.datasource.server.DatasourceServer; +import io.gisbi.extensions.datasource.dto.TableField; import java.util.List; /** - * @Author gin + * @Author bi-coder * @Date 2021/5/17 4:19 下午 */ public abstract class EngineProvider { diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/EsProvider.java b/core/core-backend/src/main/java/io/gisbi/datasource/provider/EsProvider.java similarity index 94% rename from core/core-backend/src/main/java/io/dataease/datasource/provider/EsProvider.java rename to core/core-backend/src/main/java/io/gisbi/datasource/provider/EsProvider.java index baf6e6f..e7c8258 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/EsProvider.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/provider/EsProvider.java @@ -1,18 +1,18 @@ -package io.dataease.datasource.provider; +package io.gisbi.datasource.provider; import com.google.gson.Gson; import com.google.gson.JsonParser; -import io.dataease.dataset.utils.FieldUtils; -import io.dataease.datasource.dto.es.EsResponse; -import io.dataease.datasource.dto.es.Request; -import io.dataease.datasource.type.Es; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.*; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.i18n.Translator; -import io.dataease.utils.HttpClientConfig; -import io.dataease.utils.HttpClientUtil; -import io.dataease.utils.JsonUtil; +import io.gisbi.dataset.utils.FieldUtils; +import io.gisbi.datasource.dto.es.EsResponse; +import io.gisbi.datasource.dto.es.Request; +import io.gisbi.datasource.type.Es; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.*; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.i18n.Translator; +import io.gisbi.utils.HttpClientConfig; +import io.gisbi.utils.HttpClientUtil; +import io.gisbi.utils.JsonUtil; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpHeaders; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java b/core/core-backend/src/main/java/io/gisbi/datasource/provider/ExcelUtils.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java rename to core/core-backend/src/main/java/io/gisbi/datasource/provider/ExcelUtils.java index 61df60c..c6edc0e 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/provider/ExcelUtils.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.provider; +package io.gisbi.datasource.provider; import com.alibaba.excel.EasyExcel; @@ -10,16 +10,16 @@ import com.alibaba.excel.read.metadata.ReadSheet; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.dataease.api.ds.vo.ExcelFileData; -import io.dataease.api.ds.vo.ExcelSheetData; -import io.dataease.commons.utils.EncryptUtils; -import io.dataease.datasource.dao.auto.entity.CoreDatasource; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.DatasetTableDTO; -import io.dataease.extensions.datasource.dto.DatasourceDTO; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.TableField; -import io.dataease.utils.*; +import io.gisbi.api.ds.vo.ExcelFileData; +import io.gisbi.api.ds.vo.ExcelSheetData; +import io.gisbi.commons.utils.EncryptUtils; +import io.gisbi.datasource.dao.auto.entity.CoreDatasource; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.DatasetTableDTO; +import io.gisbi.extensions.datasource.dto.DatasourceDTO; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.TableField; +import io.gisbi.utils.*; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java b/core/core-backend/src/main/java/io/gisbi/datasource/provider/H2EngineProvider.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java rename to core/core-backend/src/main/java/io/gisbi/datasource/provider/H2EngineProvider.java index ed25d01..55d6b3c 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/provider/H2EngineProvider.java @@ -1,10 +1,10 @@ -package io.dataease.datasource.provider; +package io.gisbi.datasource.provider; -import io.dataease.dataset.utils.TableUtils; -import io.dataease.datasource.dao.auto.entity.CoreDeEngine; -import io.dataease.datasource.server.DatasourceServer; -import io.dataease.extensions.datasource.dto.TableField; +import io.gisbi.dataset.utils.TableUtils; +import io.gisbi.datasource.dao.auto.entity.CoreDeEngine; +import io.gisbi.datasource.server.DatasourceServer; +import io.gisbi.extensions.datasource.dto.TableField; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java b/core/core-backend/src/main/java/io/gisbi/datasource/provider/MysqlEngineProvider.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java rename to core/core-backend/src/main/java/io/gisbi/datasource/provider/MysqlEngineProvider.java index b1843b9..1cafd6f 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/provider/MysqlEngineProvider.java @@ -1,11 +1,11 @@ -package io.dataease.datasource.provider; +package io.gisbi.datasource.provider; -import io.dataease.dataset.utils.TableUtils; -import io.dataease.datasource.dao.auto.entity.CoreDeEngine; -import io.dataease.datasource.server.DatasourceServer; -import io.dataease.extensions.datasource.dto.TableField; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.dataset.utils.TableUtils; +import io.gisbi.datasource.dao.auto.entity.CoreDeEngine; +import io.gisbi.datasource.server.DatasourceServer; +import io.gisbi.extensions.datasource.dto.TableField; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; import java.util.stream.Collectors; /** - * @Author gin + * @Author bi-coder * @Date 2021/5/17 4:27 下午 */ @Service("mysqlEngine") diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ProviderUtil.java b/core/core-backend/src/main/java/io/gisbi/datasource/provider/ProviderUtil.java similarity index 82% rename from core/core-backend/src/main/java/io/dataease/datasource/provider/ProviderUtil.java rename to core/core-backend/src/main/java/io/gisbi/datasource/provider/ProviderUtil.java index b594466..8e60fce 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ProviderUtil.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/provider/ProviderUtil.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.provider; +package io.gisbi.datasource.provider; -import io.dataease.utils.CommonBeanFactory; +import io.gisbi.utils.CommonBeanFactory; import io.micrometer.common.util.StringUtils; public class ProviderUtil { diff --git a/core/core-backend/src/main/java/io/dataease/datasource/request/EngineRequest.java b/core/core-backend/src/main/java/io/gisbi/datasource/request/EngineRequest.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/datasource/request/EngineRequest.java rename to core/core-backend/src/main/java/io/gisbi/datasource/request/EngineRequest.java index 769fd15..8b6f2d9 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/request/EngineRequest.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/request/EngineRequest.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.request; +package io.gisbi.datasource.request; -import io.dataease.datasource.dao.auto.entity.CoreDeEngine; +import io.gisbi.datasource.dao.auto.entity.CoreDeEngine; import lombok.Data; import org.springframework.util.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceDriverServer.java b/core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceDriverServer.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceDriverServer.java rename to core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceDriverServer.java index 29bea05..8800938 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceDriverServer.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceDriverServer.java @@ -1,17 +1,17 @@ -package io.dataease.datasource.server; +package io.gisbi.datasource.server; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.api.ds.DatasourceDriverApi; -import io.dataease.api.ds.vo.DriveDTO; -import io.dataease.api.ds.vo.DriveJarDTO; -import io.dataease.datasource.dao.auto.entity.CoreDriver; -import io.dataease.datasource.dao.auto.entity.CoreDriverJar; -import io.dataease.datasource.dao.auto.mapper.CoreDriverJarMapper; -import io.dataease.datasource.dao.auto.mapper.CoreDriverMapper; -import io.dataease.extensions.datasource.dto.DatasourceDTO; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.FileUtils; -import io.dataease.utils.Md5Utils; +import io.gisbi.api.ds.DatasourceDriverApi; +import io.gisbi.api.ds.vo.DriveDTO; +import io.gisbi.api.ds.vo.DriveJarDTO; +import io.gisbi.datasource.dao.auto.entity.CoreDriver; +import io.gisbi.datasource.dao.auto.entity.CoreDriverJar; +import io.gisbi.datasource.dao.auto.mapper.CoreDriverJarMapper; +import io.gisbi.datasource.dao.auto.mapper.CoreDriverMapper; +import io.gisbi.extensions.datasource.dto.DatasourceDTO; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.FileUtils; +import io.gisbi.utils.Md5Utils; import jakarta.annotation.Resource; import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceServer.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java rename to core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceServer.java index 919e59f..c69822e 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceServer.java @@ -1,4 +1,4 @@ -package io.dataease.datasource.server; +package io.gisbi.datasource.server; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -7,46 +7,45 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.dataease.api.dataset.dto.PreviewSqlDTO; -import io.dataease.api.ds.DatasourceApi; -import io.dataease.api.ds.vo.*; -import io.dataease.api.permissions.relation.api.RelationApi; -import io.dataease.commons.constants.TaskStatus; -import io.dataease.constant.DataSourceType; -import io.dataease.constant.LogOT; -import io.dataease.constant.LogST; -import io.dataease.dataset.manage.DatasetDataManage; -import io.dataease.dataset.utils.TableUtils; -import io.dataease.datasource.dao.auto.entity.*; -import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper; -import io.dataease.datasource.dao.auto.mapper.CoreDsFinishPageMapper; -import io.dataease.datasource.dao.auto.mapper.QrtzSchedulerStateMapper; -import io.dataease.datasource.dao.ext.mapper.DataSourceExtMapper; -import io.dataease.datasource.dao.ext.mapper.TaskLogExtMapper; -import io.dataease.datasource.manage.DataSourceManage; -import io.dataease.datasource.manage.DatasourceSyncManage; -import io.dataease.datasource.manage.EngineManage; -import io.dataease.datasource.provider.CalciteProvider; -import io.dataease.datasource.provider.ExcelUtils; -import io.dataease.constant.SQLConstants; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.dto.*; -import io.dataease.extensions.datasource.factory.ProviderFactory; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; -import io.dataease.extensions.datasource.vo.XpackPluginsDatasourceVO; -import io.dataease.i18n.Translator; -import io.dataease.job.schedule.CheckDsStatusJob; -import io.dataease.job.schedule.ScheduleManager; +import io.gisbi.api.dataset.dto.PreviewSqlDTO; +import io.gisbi.api.ds.DatasourceApi; +import io.gisbi.api.ds.vo.*; +import io.gisbi.commons.constants.TaskStatus; +import io.gisbi.constant.DataSourceType; +import io.gisbi.constant.LogOT; +import io.gisbi.constant.LogST; +import io.gisbi.dataset.manage.DatasetDataManage; +import io.gisbi.dataset.utils.TableUtils; +import io.gisbi.datasource.dao.auto.entity.*; +import io.gisbi.datasource.dao.auto.mapper.CoreDatasourceMapper; +import io.gisbi.datasource.dao.auto.mapper.CoreDsFinishPageMapper; +import io.gisbi.datasource.dao.auto.mapper.QrtzSchedulerStateMapper; +import io.gisbi.datasource.dao.ext.mapper.DataSourceExtMapper; +import io.gisbi.datasource.dao.ext.mapper.TaskLogExtMapper; +import io.gisbi.datasource.manage.DataSourceManage; +import io.gisbi.datasource.manage.DatasourceSyncManage; +import io.gisbi.datasource.manage.EngineManage; +import io.gisbi.datasource.provider.CalciteProvider; +import io.gisbi.datasource.provider.ExcelUtils; +import io.gisbi.constant.SQLConstants; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.dto.*; +import io.gisbi.extensions.datasource.factory.ProviderFactory; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.vo.XpackPluginsDatasourceVO; +import io.gisbi.i18n.Translator; +import io.gisbi.job.schedule.CheckDsStatusJob; +import io.gisbi.job.schedule.ScheduleManager; import io.dataease.license.config.XpackInteract; import io.dataease.license.utils.LicenseUtil; -import io.dataease.log.DeLog; -import io.dataease.model.BusiNodeRequest; -import io.dataease.model.BusiNodeVO; -import io.dataease.system.dao.auto.entity.CoreSysSetting; -import io.dataease.system.manage.CoreUserManage; -import io.dataease.utils.*; +import io.gisbi.log.DeLog; +import io.gisbi.model.BusiNodeRequest; +import io.gisbi.model.BusiNodeVO; +import io.gisbi.system.dao.auto.entity.CoreSysSetting; +import io.gisbi.system.manage.CoreUserManage; +import io.gisbi.utils.*; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -70,8 +69,8 @@ import java.lang.reflect.Method; import java.util.*; import java.util.stream.Collectors; -import static io.dataease.datasource.server.DatasourceTaskServer.ScheduleType.MANUAL; -import static io.dataease.datasource.server.DatasourceTaskServer.ScheduleType.RIGHTNOW; +import static io.gisbi.datasource.server.DatasourceTaskServer.ScheduleType.MANUAL; +import static io.gisbi.datasource.server.DatasourceTaskServer.ScheduleType.RIGHTNOW; @RestController @@ -106,8 +105,6 @@ public class DatasourceServer implements DatasourceApi { private CoreUserManage coreUserManage; @Autowired(required = false) private PluginManageApi pluginManage; - @Autowired(required = false) - private RelationApi relationManage; public enum UpdateType { all_scope, add_scope @@ -558,18 +555,7 @@ public class DatasourceServer implements DatasourceApi { @Override public boolean perDelete(Long id) { - if (LicenseUtil.licenseValid()) { - try { - relationManage.checkAuth(); - } catch (Exception e) { - return false; - } - Long count = relationManage.getDsResource(id); - if (count > 0) { - return true; - } - } - return false; + return true; } @Transactional diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceTaskServer.java b/core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceTaskServer.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceTaskServer.java rename to core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceTaskServer.java index 1a75e80..5a11444 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceTaskServer.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceTaskServer.java @@ -1,18 +1,18 @@ -package io.dataease.datasource.server; +package io.gisbi.datasource.server; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import io.dataease.commons.constants.TaskStatus; -import io.dataease.datasource.dao.auto.entity.CoreDatasource; -import io.dataease.datasource.dao.auto.entity.CoreDatasourceTask; -import io.dataease.datasource.dao.auto.entity.CoreDatasourceTaskLog; -import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper; -import io.dataease.datasource.dao.auto.mapper.CoreDatasourceTaskLogMapper; -import io.dataease.datasource.dao.auto.mapper.CoreDatasourceTaskMapper; -import io.dataease.datasource.dto.CoreDatasourceTaskDTO; -import io.dataease.datasource.dao.ext.mapper.ExtDatasourceTaskMapper; -import io.dataease.datasource.manage.DatasourceSyncManage; -import io.dataease.utils.IDUtils; +import io.gisbi.commons.constants.TaskStatus; +import io.gisbi.datasource.dao.auto.entity.CoreDatasource; +import io.gisbi.datasource.dao.auto.entity.CoreDatasourceTask; +import io.gisbi.datasource.dao.auto.entity.CoreDatasourceTaskLog; +import io.gisbi.datasource.dao.auto.mapper.CoreDatasourceMapper; +import io.gisbi.datasource.dao.auto.mapper.CoreDatasourceTaskLogMapper; +import io.gisbi.datasource.dao.auto.mapper.CoreDatasourceTaskMapper; +import io.gisbi.datasource.dto.CoreDatasourceTaskDTO; +import io.gisbi.datasource.dao.ext.mapper.ExtDatasourceTaskMapper; +import io.gisbi.datasource.manage.DatasourceSyncManage; +import io.gisbi.utils.IDUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/EngineServer.java b/core/core-backend/src/main/java/io/gisbi/datasource/server/EngineServer.java similarity index 85% rename from core/core-backend/src/main/java/io/dataease/datasource/server/EngineServer.java rename to core/core-backend/src/main/java/io/gisbi/datasource/server/EngineServer.java index 25ca063..8013f9d 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/EngineServer.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/server/EngineServer.java @@ -1,16 +1,16 @@ -package io.dataease.datasource.server; +package io.gisbi.datasource.server; -import io.dataease.api.ds.EngineApi; -import io.dataease.datasource.dao.auto.entity.CoreDeEngine; -import io.dataease.datasource.dao.auto.mapper.CoreDeEngineMapper; -import io.dataease.datasource.manage.EngineManage; -import io.dataease.datasource.provider.CalciteProvider; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.DatasourceDTO; -import io.dataease.utils.AuthUtils; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.IDUtils; -import io.dataease.utils.RsaUtils; +import io.gisbi.api.ds.EngineApi; +import io.gisbi.datasource.dao.auto.entity.CoreDeEngine; +import io.gisbi.datasource.dao.auto.mapper.CoreDeEngineMapper; +import io.gisbi.datasource.manage.EngineManage; +import io.gisbi.datasource.provider.CalciteProvider; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.DatasourceDTO; +import io.gisbi.utils.AuthUtils; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.IDUtils; +import io.gisbi.utils.RsaUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.transaction.annotation.Transactional; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/CK.java b/core/core-backend/src/main/java/io/gisbi/datasource/type/CK.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/datasource/type/CK.java rename to core/core-backend/src/main/java/io/gisbi/datasource/type/CK.java index 8b65006..8d25d08 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/CK.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/type/CK.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.type; +package io.gisbi.datasource.type; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Db2.java b/core/core-backend/src/main/java/io/gisbi/datasource/type/Db2.java similarity index 93% rename from core/core-backend/src/main/java/io/dataease/datasource/type/Db2.java rename to core/core-backend/src/main/java/io/gisbi/datasource/type/Db2.java index 9a7d146..2648dcd 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Db2.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/type/Db2.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.type; +package io.gisbi.datasource.type; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Es.java b/core/core-backend/src/main/java/io/gisbi/datasource/type/Es.java similarity index 68% rename from core/core-backend/src/main/java/io/dataease/datasource/type/Es.java rename to core/core-backend/src/main/java/io/gisbi/datasource/type/Es.java index fdc1bc2..42b6ae7 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Es.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/type/Es.java @@ -1,8 +1,7 @@ -package io.dataease.datasource.type; +package io.gisbi.datasource.type; import lombok.Data; -import org.springframework.stereotype.Component; @Data public class Es { diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/H2.java b/core/core-backend/src/main/java/io/gisbi/datasource/type/H2.java similarity index 64% rename from core/core-backend/src/main/java/io/dataease/datasource/type/H2.java rename to core/core-backend/src/main/java/io/gisbi/datasource/type/H2.java index 8836303..5058cbf 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/H2.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/type/H2.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.type; +package io.gisbi.datasource.type; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Impala.java b/core/core-backend/src/main/java/io/gisbi/datasource/type/Impala.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/datasource/type/Impala.java rename to core/core-backend/src/main/java/io/gisbi/datasource/type/Impala.java index 5d5f0d9..bdcaa13 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Impala.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/type/Impala.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.type; +package io.gisbi.datasource.type; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Mongo.java b/core/core-backend/src/main/java/io/gisbi/datasource/type/Mongo.java similarity index 94% rename from core/core-backend/src/main/java/io/dataease/datasource/type/Mongo.java rename to core/core-backend/src/main/java/io/gisbi/datasource/type/Mongo.java index 885cacd..29098c9 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Mongo.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/type/Mongo.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.type; +package io.gisbi.datasource.type; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java b/core/core-backend/src/main/java/io/gisbi/datasource/type/Mysql.java similarity index 94% rename from core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java rename to core/core-backend/src/main/java/io/gisbi/datasource/type/Mysql.java index 3ecad86..306f015 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/type/Mysql.java @@ -1,7 +1,7 @@ -package io.dataease.datasource.type; +package io.gisbi.datasource.type; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Oracle.java b/core/core-backend/src/main/java/io/gisbi/datasource/type/Oracle.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/datasource/type/Oracle.java rename to core/core-backend/src/main/java/io/gisbi/datasource/type/Oracle.java index 885f1b6..30e679b 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Oracle.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/type/Oracle.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.type; +package io.gisbi.datasource.type; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Pg.java b/core/core-backend/src/main/java/io/gisbi/datasource/type/Pg.java similarity index 93% rename from core/core-backend/src/main/java/io/dataease/datasource/type/Pg.java rename to core/core-backend/src/main/java/io/gisbi/datasource/type/Pg.java index 4bd0383..810a410 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Pg.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/type/Pg.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.type; +package io.gisbi.datasource.type; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Redshift.java b/core/core-backend/src/main/java/io/gisbi/datasource/type/Redshift.java similarity index 87% rename from core/core-backend/src/main/java/io/dataease/datasource/type/Redshift.java rename to core/core-backend/src/main/java/io/gisbi/datasource/type/Redshift.java index e8bd8ec..830a994 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Redshift.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/type/Redshift.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.type; +package io.gisbi.datasource.type; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Sqlserver.java b/core/core-backend/src/main/java/io/gisbi/datasource/type/Sqlserver.java similarity index 93% rename from core/core-backend/src/main/java/io/dataease/datasource/type/Sqlserver.java rename to core/core-backend/src/main/java/io/gisbi/datasource/type/Sqlserver.java index 075ca69..fdc7522 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Sqlserver.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/type/Sqlserver.java @@ -1,6 +1,6 @@ -package io.dataease.datasource.type; +package io.gisbi.datasource.type; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/utils/DatasourceUtils.java b/core/core-backend/src/main/java/io/gisbi/datasource/utils/DatasourceUtils.java similarity index 77% rename from core/core-backend/src/main/java/io/dataease/datasource/utils/DatasourceUtils.java rename to core/core-backend/src/main/java/io/gisbi/datasource/utils/DatasourceUtils.java index 13a4553..387d22f 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/utils/DatasourceUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/utils/DatasourceUtils.java @@ -1,15 +1,15 @@ -package io.dataease.datasource.utils; +package io.gisbi.datasource.utils; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.i18n.Translator; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.i18n.Translator; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import java.util.Map; /** - * @Author Junjun + * @Author bi-coder */ public class DatasourceUtils { public static void checkDsStatus(Map dsMap) { diff --git a/core/core-backend/src/main/java/io/dataease/engine/constant/ExtFieldConstant.java b/core/core-backend/src/main/java/io/gisbi/engine/constant/ExtFieldConstant.java similarity index 80% rename from core/core-backend/src/main/java/io/dataease/engine/constant/ExtFieldConstant.java rename to core/core-backend/src/main/java/io/gisbi/engine/constant/ExtFieldConstant.java index 9676eb7..789ee8e 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/constant/ExtFieldConstant.java +++ b/core/core-backend/src/main/java/io/gisbi/engine/constant/ExtFieldConstant.java @@ -1,7 +1,7 @@ -package io.dataease.engine.constant; +package io.gisbi.engine.constant; /** - * @Author Junjun + * @Author bi-coder */ public class ExtFieldConstant { public final static Integer EXT_NORMAL = 0; diff --git a/core/core-backend/src/main/java/io/dataease/engine/func/FunctionConstant.java b/core/core-backend/src/main/java/io/gisbi/engine/func/FunctionConstant.java similarity index 82% rename from core/core-backend/src/main/java/io/dataease/engine/func/FunctionConstant.java rename to core/core-backend/src/main/java/io/gisbi/engine/func/FunctionConstant.java index a6b12bf..5e9d24a 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/func/FunctionConstant.java +++ b/core/core-backend/src/main/java/io/gisbi/engine/func/FunctionConstant.java @@ -1,7 +1,7 @@ -package io.dataease.engine.func; +package io.gisbi.engine.func; /** - * @Author Junjun + * @Author bi-coder */ public class FunctionConstant { /** diff --git a/core/core-backend/src/main/java/io/dataease/engine/sql/SQLProvider.java b/core/core-backend/src/main/java/io/gisbi/engine/sql/SQLProvider.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/engine/sql/SQLProvider.java rename to core/core-backend/src/main/java/io/gisbi/engine/sql/SQLProvider.java index 77c5b2f..17e2d59 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/sql/SQLProvider.java +++ b/core/core-backend/src/main/java/io/gisbi/engine/sql/SQLProvider.java @@ -1,10 +1,10 @@ -package io.dataease.engine.sql; +package io.gisbi.engine.sql; -import io.dataease.constant.SQLConstants; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.model.SQLObj; -import io.dataease.extensions.view.dto.ChartViewDTO; -import io.dataease.extensions.view.dto.SortAxis; +import io.gisbi.constant.SQLConstants; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.model.SQLObj; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import io.gisbi.extensions.view.dto.SortAxis; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -17,7 +17,7 @@ import java.util.HashSet; import java.util.List; /** - * @Author Junjun + * @Author bi-coder *

* 将SQLMeta各个部分先构建完毕,然后在这个类中拼接 */ diff --git a/core/core-backend/src/main/java/io/dataease/engine/sql/SqlTemplate.java b/core/core-backend/src/main/java/io/gisbi/engine/sql/SqlTemplate.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/engine/sql/SqlTemplate.java rename to core/core-backend/src/main/java/io/gisbi/engine/sql/SqlTemplate.java index 43ee362..f1c4e3d 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/sql/SqlTemplate.java +++ b/core/core-backend/src/main/java/io/gisbi/engine/sql/SqlTemplate.java @@ -1,7 +1,7 @@ -package io.dataease.engine.sql; +package io.gisbi.engine.sql; /** - * @Author Junjun + * @Author bi-coder */ public class SqlTemplate { public static String QUERY_SQL = "querySql(limitFiled, groups, aggregators, filters, orders, table, notUseAs, useAliasForGroup)\n" + diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java b/core/core-backend/src/main/java/io/gisbi/engine/trans/CustomWhere2Str.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java rename to core/core-backend/src/main/java/io/gisbi/engine/trans/CustomWhere2Str.java index bbea93a..3311cd6 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java +++ b/core/core-backend/src/main/java/io/gisbi/engine/trans/CustomWhere2Str.java @@ -1,17 +1,17 @@ -package io.dataease.engine.trans; +package io.gisbi.engine.trans; -import io.dataease.constant.SQLConstants; -import io.dataease.engine.utils.Utils; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.constant.SqlPlaceholderConstants; -import io.dataease.extensions.datasource.dto.CalParam; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.model.SQLObj; -import io.dataease.extensions.view.filter.DynamicTimeSetting; -import io.dataease.extensions.view.filter.FilterTreeItem; -import io.dataease.extensions.view.filter.FilterTreeObj; +import io.gisbi.constant.SQLConstants; +import io.gisbi.engine.utils.Utils; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.constant.SqlPlaceholderConstants; +import io.gisbi.extensions.datasource.dto.CalParam; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.model.SQLObj; +import io.gisbi.extensions.view.filter.DynamicTimeSetting; +import io.gisbi.extensions.view.filter.FilterTreeItem; +import io.gisbi.extensions.view.filter.FilterTreeObj; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -20,7 +20,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Author Junjun + * @Author bi-coder */ public class CustomWhere2Str { diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/Dimension2SQLObj.java b/core/core-backend/src/main/java/io/gisbi/engine/trans/Dimension2SQLObj.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/engine/trans/Dimension2SQLObj.java rename to core/core-backend/src/main/java/io/gisbi/engine/trans/Dimension2SQLObj.java index 2081155..25b8fb8 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/Dimension2SQLObj.java +++ b/core/core-backend/src/main/java/io/gisbi/engine/trans/Dimension2SQLObj.java @@ -1,17 +1,17 @@ -package io.dataease.engine.trans; +package io.gisbi.engine.trans; -import io.dataease.constant.DeTypeConstants; -import io.dataease.engine.constant.ExtFieldConstant; -import io.dataease.constant.SQLConstants; -import io.dataease.engine.utils.Utils; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.constant.SqlPlaceholderConstants; -import io.dataease.extensions.datasource.dto.CalParam; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.model.SQLObj; -import io.dataease.extensions.view.dto.ChartViewFieldDTO; +import io.gisbi.constant.DeTypeConstants; +import io.gisbi.engine.constant.ExtFieldConstant; +import io.gisbi.constant.SQLConstants; +import io.gisbi.engine.utils.Utils; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.constant.SqlPlaceholderConstants; +import io.gisbi.extensions.datasource.dto.CalParam; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.model.SQLObj; +import io.gisbi.extensions.view.dto.ChartViewFieldDTO; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; @@ -19,7 +19,7 @@ import org.springframework.util.CollectionUtils; import java.util.*; /** - * @Author Junjun + * @Author bi-coder */ public class Dimension2SQLObj { diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java b/core/core-backend/src/main/java/io/gisbi/engine/trans/ExtWhere2Str.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java rename to core/core-backend/src/main/java/io/gisbi/engine/trans/ExtWhere2Str.java index 3ee5ab8..1fef90e 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java +++ b/core/core-backend/src/main/java/io/gisbi/engine/trans/ExtWhere2Str.java @@ -1,15 +1,15 @@ -package io.dataease.engine.trans; +package io.gisbi.engine.trans; -import io.dataease.constant.SQLConstants; -import io.dataease.engine.utils.Utils; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.constant.SqlPlaceholderConstants; -import io.dataease.extensions.datasource.dto.CalParam; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.model.SQLObj; -import io.dataease.extensions.view.dto.ChartExtFilterDTO; +import io.gisbi.constant.SQLConstants; +import io.gisbi.engine.utils.Utils; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.constant.SqlPlaceholderConstants; +import io.gisbi.extensions.datasource.dto.CalParam; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.model.SQLObj; +import io.gisbi.extensions.view.dto.ChartExtFilterDTO; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -20,7 +20,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @Author Junjun + * @Author bi-coder */ public class ExtWhere2Str { diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/Field2SQLObj.java b/core/core-backend/src/main/java/io/gisbi/engine/trans/Field2SQLObj.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/engine/trans/Field2SQLObj.java rename to core/core-backend/src/main/java/io/gisbi/engine/trans/Field2SQLObj.java index 4a17ad3..c7630de 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/Field2SQLObj.java +++ b/core/core-backend/src/main/java/io/gisbi/engine/trans/Field2SQLObj.java @@ -1,24 +1,24 @@ -package io.dataease.engine.trans; +package io.gisbi.engine.trans; -import io.dataease.constant.DeTypeConstants; -import io.dataease.engine.constant.ExtFieldConstant; -import io.dataease.constant.SQLConstants; -import io.dataease.engine.func.FunctionConstant; -import io.dataease.engine.utils.Utils; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.constant.SqlPlaceholderConstants; -import io.dataease.extensions.datasource.dto.CalParam; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.model.SQLObj; +import io.gisbi.constant.DeTypeConstants; +import io.gisbi.engine.constant.ExtFieldConstant; +import io.gisbi.constant.SQLConstants; +import io.gisbi.engine.func.FunctionConstant; +import io.gisbi.engine.utils.Utils; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.constant.SqlPlaceholderConstants; +import io.gisbi.extensions.datasource.dto.CalParam; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.model.SQLObj; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import java.util.*; /** - * @Author Junjun + * @Author bi-coder */ public class Field2SQLObj { diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java b/core/core-backend/src/main/java/io/gisbi/engine/trans/Order2SQLObj.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java rename to core/core-backend/src/main/java/io/gisbi/engine/trans/Order2SQLObj.java index 2baf985..ce6c12b 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java +++ b/core/core-backend/src/main/java/io/gisbi/engine/trans/Order2SQLObj.java @@ -1,24 +1,24 @@ -package io.dataease.engine.trans; +package io.gisbi.engine.trans; -import io.dataease.api.chart.dto.DeSortField; -import io.dataease.constant.DeTypeConstants; -import io.dataease.engine.constant.ExtFieldConstant; -import io.dataease.constant.SQLConstants; -import io.dataease.engine.utils.Utils; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.constant.SqlPlaceholderConstants; -import io.dataease.extensions.datasource.dto.CalParam; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.model.SQLObj; +import io.gisbi.api.chart.dto.DeSortField; +import io.gisbi.constant.DeTypeConstants; +import io.gisbi.engine.constant.ExtFieldConstant; +import io.gisbi.constant.SQLConstants; +import io.gisbi.engine.utils.Utils; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.constant.SqlPlaceholderConstants; +import io.gisbi.extensions.datasource.dto.CalParam; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.model.SQLObj; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import java.util.*; /** - * @Author Junjun + * @Author bi-coder */ public class Order2SQLObj { diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/Quota2SQLObj.java b/core/core-backend/src/main/java/io/gisbi/engine/trans/Quota2SQLObj.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/engine/trans/Quota2SQLObj.java rename to core/core-backend/src/main/java/io/gisbi/engine/trans/Quota2SQLObj.java index 5a9e0f7..012f1e2 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/Quota2SQLObj.java +++ b/core/core-backend/src/main/java/io/gisbi/engine/trans/Quota2SQLObj.java @@ -1,17 +1,17 @@ -package io.dataease.engine.trans; +package io.gisbi.engine.trans; -import io.dataease.constant.DeTypeConstants; -import io.dataease.engine.constant.ExtFieldConstant; -import io.dataease.constant.SQLConstants; -import io.dataease.engine.utils.Utils; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.constant.SqlPlaceholderConstants; -import io.dataease.extensions.datasource.dto.CalParam; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.model.SQLObj; -import io.dataease.extensions.view.dto.ChartViewFieldDTO; +import io.gisbi.constant.DeTypeConstants; +import io.gisbi.engine.constant.ExtFieldConstant; +import io.gisbi.constant.SQLConstants; +import io.gisbi.engine.utils.Utils; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.constant.SqlPlaceholderConstants; +import io.gisbi.extensions.datasource.dto.CalParam; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.model.SQLObj; +import io.gisbi.extensions.view.dto.ChartViewFieldDTO; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; @@ -19,7 +19,7 @@ import org.springframework.util.CollectionUtils; import java.util.*; /** - * @Author Junjun + * @Author bi-coder */ public class Quota2SQLObj { diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/Table2SQLObj.java b/core/core-backend/src/main/java/io/gisbi/engine/trans/Table2SQLObj.java similarity index 73% rename from core/core-backend/src/main/java/io/dataease/engine/trans/Table2SQLObj.java rename to core/core-backend/src/main/java/io/gisbi/engine/trans/Table2SQLObj.java index e8baca9..cf1e05f 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/Table2SQLObj.java +++ b/core/core-backend/src/main/java/io/gisbi/engine/trans/Table2SQLObj.java @@ -1,12 +1,12 @@ -package io.dataease.engine.trans; +package io.gisbi.engine.trans; -import io.dataease.constant.SQLConstants; -import io.dataease.extensions.datasource.constant.SqlPlaceholderConstants; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.model.SQLObj; +import io.gisbi.constant.SQLConstants; +import io.gisbi.extensions.datasource.constant.SqlPlaceholderConstants; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.model.SQLObj; /** - * @Author Junjun + * @Author bi-coder */ public class Table2SQLObj { public static void table2sqlobj(SQLMeta meta, String tablePrefix, String table, boolean crossDs) { diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java b/core/core-backend/src/main/java/io/gisbi/engine/trans/WhereTree2Str.java similarity index 94% rename from core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java rename to core/core-backend/src/main/java/io/gisbi/engine/trans/WhereTree2Str.java index f556781..a3a4bc9 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java +++ b/core/core-backend/src/main/java/io/gisbi/engine/trans/WhereTree2Str.java @@ -1,18 +1,18 @@ -package io.dataease.engine.trans; +package io.gisbi.engine.trans; -import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO; -import io.dataease.engine.constant.ExtFieldConstant; -import io.dataease.constant.SQLConstants; -import io.dataease.engine.utils.Utils; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.constant.SqlPlaceholderConstants; -import io.dataease.extensions.datasource.dto.CalParam; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.model.SQLObj; -import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeItem; -import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeObj; +import io.gisbi.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO; +import io.gisbi.engine.constant.ExtFieldConstant; +import io.gisbi.constant.SQLConstants; +import io.gisbi.engine.utils.Utils; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.constant.SqlPlaceholderConstants; +import io.gisbi.extensions.datasource.dto.CalParam; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.model.SQLObj; +import io.gisbi.extensions.view.dto.DatasetRowPermissionsTreeItem; +import io.gisbi.extensions.view.dto.DatasetRowPermissionsTreeObj; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -21,7 +21,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Author Junjun + * @Author bi-coder */ public class WhereTree2Str { public static void transFilterTrees(SQLMeta meta, List requestList, List originFields, boolean isCross, Map dsMap, List fieldParam, List chartParam, PluginManageApi pluginManage) { diff --git a/core/core-backend/src/main/java/io/dataease/engine/utils/DateUtils.java b/core/core-backend/src/main/java/io/gisbi/engine/utils/DateUtils.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/engine/utils/DateUtils.java rename to core/core-backend/src/main/java/io/gisbi/engine/utils/DateUtils.java index e3926ba..643e523 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/utils/DateUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/engine/utils/DateUtils.java @@ -1,9 +1,9 @@ -package io.dataease.engine.utils; +package io.gisbi.engine.utils; import java.text.SimpleDateFormat; /** - * @Author Junjun + * @Author bi-coder */ public class DateUtils { private static final String format = "yyyy-MM-dd HH:mm:ss"; diff --git a/core/core-backend/src/main/java/io/dataease/engine/utils/SQLUtils.java b/core/core-backend/src/main/java/io/gisbi/engine/utils/SQLUtils.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/engine/utils/SQLUtils.java rename to core/core-backend/src/main/java/io/gisbi/engine/utils/SQLUtils.java index cbe7366..26208f3 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/utils/SQLUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/engine/utils/SQLUtils.java @@ -1,9 +1,9 @@ -package io.dataease.engine.utils; +package io.gisbi.engine.utils; import java.util.Optional; /** - * @Author Junjun + * @Author bi-coder */ public class SQLUtils { public static String transKeyword(String value) { diff --git a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java b/core/core-backend/src/main/java/io/gisbi/engine/utils/Utils.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java rename to core/core-backend/src/main/java/io/gisbi/engine/utils/Utils.java index 6a6e027..31ef6f9 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java +++ b/core/core-backend/src/main/java/io/gisbi/engine/utils/Utils.java @@ -1,16 +1,16 @@ -package io.dataease.engine.utils; +package io.gisbi.engine.utils; -import io.dataease.engine.constant.ExtFieldConstant; -import io.dataease.constant.SQLConstants; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.constant.SqlPlaceholderConstants; -import io.dataease.extensions.datasource.dto.*; -import io.dataease.extensions.datasource.model.SQLObj; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; -import io.dataease.extensions.datasource.vo.XpackPluginsDatasourceVO; -import io.dataease.i18n.Translator; -import io.dataease.utils.JsonUtil; +import io.gisbi.engine.constant.ExtFieldConstant; +import io.gisbi.constant.SQLConstants; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.constant.SqlPlaceholderConstants; +import io.gisbi.extensions.datasource.dto.*; +import io.gisbi.extensions.datasource.model.SQLObj; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.vo.XpackPluginsDatasourceVO; +import io.gisbi.i18n.Translator; +import io.gisbi.utils.JsonUtil; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/dao/auto/entity/CoreExportTask.java b/core/core-backend/src/main/java/io/gisbi/exportCenter/dao/auto/entity/CoreExportTask.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/exportCenter/dao/auto/entity/CoreExportTask.java rename to core/core-backend/src/main/java/io/gisbi/exportCenter/dao/auto/entity/CoreExportTask.java index 0ae560d..9a2ce50 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/dao/auto/entity/CoreExportTask.java +++ b/core/core-backend/src/main/java/io/gisbi/exportCenter/dao/auto/entity/CoreExportTask.java @@ -1,4 +1,4 @@ -package io.dataease.exportCenter.dao.auto.entity; +package io.gisbi.exportCenter.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * 导出任务表 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-06-12 */ @TableName("core_export_task") diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/dao/auto/mapper/CoreExportTaskMapper.java b/core/core-backend/src/main/java/io/gisbi/exportCenter/dao/auto/mapper/CoreExportTaskMapper.java similarity index 66% rename from core/core-backend/src/main/java/io/dataease/exportCenter/dao/auto/mapper/CoreExportTaskMapper.java rename to core/core-backend/src/main/java/io/gisbi/exportCenter/dao/auto/mapper/CoreExportTaskMapper.java index 3362953..f0be2d2 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/dao/auto/mapper/CoreExportTaskMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/exportCenter/dao/auto/mapper/CoreExportTaskMapper.java @@ -1,6 +1,6 @@ -package io.dataease.exportCenter.dao.auto.mapper; +package io.gisbi.exportCenter.dao.auto.mapper; -import io.dataease.exportCenter.dao.auto.entity.CoreExportTask; +import io.gisbi.exportCenter.dao.auto.entity.CoreExportTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 导出任务表 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-06-12 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterLimitManage.java b/core/core-backend/src/main/java/io/gisbi/exportCenter/manage/ExportCenterLimitManage.java similarity index 93% rename from core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterLimitManage.java rename to core/core-backend/src/main/java/io/gisbi/exportCenter/manage/ExportCenterLimitManage.java index 54ba904..09eca65 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterLimitManage.java +++ b/core/core-backend/src/main/java/io/gisbi/exportCenter/manage/ExportCenterLimitManage.java @@ -1,4 +1,4 @@ -package io.dataease.exportCenter.manage; +package io.gisbi.exportCenter.manage; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/gisbi/exportCenter/manage/ExportCenterManage.java similarity index 88% rename from core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java rename to core/core-backend/src/main/java/io/gisbi/exportCenter/manage/ExportCenterManage.java index e724db7..bcd2971 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java +++ b/core/core-backend/src/main/java/io/gisbi/exportCenter/manage/ExportCenterManage.java @@ -1,59 +1,56 @@ -package io.dataease.exportCenter.manage; +package io.gisbi.exportCenter.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; import com.google.gson.Gson; -import io.dataease.api.chart.dto.ViewDetailField; -import io.dataease.api.chart.request.ChartExcelRequest; -import io.dataease.api.chart.request.ChartExcelRequestInner; -import io.dataease.api.dataset.dto.DataSetExportRequest; -import io.dataease.api.dataset.union.DatasetGroupInfoDTO; -import io.dataease.api.dataset.union.UnionDTO; -import io.dataease.api.export.BaseExportApi; -import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO; -import io.dataease.api.xpack.dataFilling.DataFillingApi; -import io.dataease.api.xpack.dataFilling.dto.DataFillFormTableDataRequest; -import io.dataease.auth.bo.TokenUserBO; -import io.dataease.chart.dao.auto.mapper.CoreChartViewMapper; -import io.dataease.chart.server.ChartDataServer; -import io.dataease.commons.utils.ExcelWatermarkUtils; -import io.dataease.dataset.dao.auto.entity.CoreDatasetGroup; -import io.dataease.dataset.dao.auto.mapper.CoreDatasetGroupMapper; -import io.dataease.dataset.manage.*; -import io.dataease.datasource.utils.DatasourceUtils; -import io.dataease.constant.DeTypeConstants; -import io.dataease.engine.sql.SQLProvider; -import io.dataease.engine.trans.Field2SQLObj; -import io.dataease.engine.trans.Order2SQLObj; -import io.dataease.engine.trans.Table2SQLObj; -import io.dataease.engine.trans.WhereTree2Str; -import io.dataease.engine.utils.Utils; -import io.dataease.exception.DEException; -import io.dataease.exportCenter.dao.auto.entity.CoreExportTask; -import io.dataease.exportCenter.dao.auto.mapper.CoreExportTaskMapper; -import io.dataease.exportCenter.util.ExportCenterUtils; -import io.dataease.extensions.datasource.api.PluginManageApi; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.datasource.factory.ProviderFactory; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; -import io.dataease.i18n.Translator; -import io.dataease.license.config.XpackInteract; -import io.dataease.license.utils.LicenseUtil; -import io.dataease.model.ExportTaskDTO; -import io.dataease.system.manage.CoreUserManage; -import io.dataease.system.manage.SysParameterManage; -import io.dataease.utils.*; -import io.dataease.visualization.dao.auto.entity.VisualizationWatermark; -import io.dataease.visualization.dao.auto.mapper.VisualizationWatermarkMapper; -import io.dataease.visualization.dao.ext.mapper.ExtDataVisualizationMapper; -import io.dataease.visualization.server.DataVisualizationServer; -import io.dataease.websocket.WsMessage; -import io.dataease.websocket.WsService; +import io.gisbi.api.chart.dto.ViewDetailField; +import io.gisbi.api.chart.request.ChartExcelRequest; +import io.gisbi.api.chart.request.ChartExcelRequestInner; +import io.gisbi.api.dataset.dto.DataSetExportRequest; +import io.gisbi.api.dataset.union.DatasetGroupInfoDTO; +import io.gisbi.api.dataset.union.UnionDTO; +import io.gisbi.api.export.BaseExportApi; +import io.gisbi.api.xpack.dataFilling.DataFillingApi; +import io.gisbi.api.xpack.dataFilling.dto.DataFillFormTableDataRequest; +import io.gisbi.auth.bo.TokenUserBO; +import io.gisbi.chart.dao.auto.mapper.CoreChartViewMapper; +import io.gisbi.chart.server.ChartDataServer; +import io.gisbi.commons.utils.ExcelWatermarkUtils; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetGroup; +import io.gisbi.dataset.dao.auto.mapper.CoreDatasetGroupMapper; +import io.gisbi.dataset.manage.*; +import io.gisbi.datasource.utils.DatasourceUtils; +import io.gisbi.constant.DeTypeConstants; +import io.gisbi.engine.sql.SQLProvider; +import io.gisbi.engine.trans.Field2SQLObj; +import io.gisbi.engine.trans.Order2SQLObj; +import io.gisbi.engine.trans.Table2SQLObj; +import io.gisbi.engine.trans.WhereTree2Str; +import io.gisbi.engine.utils.Utils; +import io.gisbi.exception.DEException; +import io.gisbi.exportCenter.dao.auto.entity.CoreExportTask; +import io.gisbi.exportCenter.dao.auto.mapper.CoreExportTaskMapper; +import io.gisbi.exportCenter.util.ExportCenterUtils; +import io.gisbi.extensions.datasource.api.PluginManageApi; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.factory.ProviderFactory; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; +import io.gisbi.i18n.Translator; +import io.gisbi.model.ExportTaskDTO; +import io.gisbi.system.manage.CoreUserManage; +import io.gisbi.system.manage.SysParameterManage; +import io.gisbi.utils.*; +import io.gisbi.visualization.dao.auto.entity.VisualizationWatermark; +import io.gisbi.visualization.dao.auto.mapper.VisualizationWatermarkMapper; +import io.gisbi.visualization.dao.ext.mapper.ExtDataVisualizationMapper; +import io.gisbi.visualization.server.DataVisualizationServer; +import io.gisbi.websocket.WsMessage; +import io.gisbi.websocket.WsService; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; @@ -67,8 +64,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import io.dataease.visualization.dto.WatermarkContentDTO; -import io.dataease.api.permissions.user.vo.UserFormVO; +import io.gisbi.visualization.dto.WatermarkContentDTO; import java.io.*; import java.net.InetAddress; @@ -92,8 +88,7 @@ public class ExportCenterManage implements BaseExportApi { DataVisualizationServer dataVisualizationServer; @Resource private CoreChartViewMapper coreChartViewMapper; - @Resource - private PermissionManage permissionManage; + @Autowired private WsService wsService; @Autowired(required = false) @@ -288,7 +283,7 @@ public class ExportCenterManage implements BaseExportApi { return result; } - @XpackInteract(value = "exportCenter", before = false) + public void setOrg(ExportTaskDTO exportTaskDTO) { } @@ -434,7 +429,6 @@ public class ExportCenterManage implements BaseExportApi { TokenUserBO tokenUserBO = AuthUtils.getUser(); Future future = scheduledThreadPoolExecutor.submit(() -> { - LicenseUtil.validate(); AuthUtils.setUser(tokenUserBO); try { exportTask.setExportStatus("IN_PROGRESS"); @@ -463,7 +457,7 @@ public class ExportCenterManage implements BaseExportApi { DEException.throwException(Translator.get("i18n_no_fields")); } Map desensitizationList = new HashMap<>(); - allFields = permissionManage.filterColumnPermissions(allFields, desensitizationList, dto.getId(), null); +// allFields = permissionManage.filterColumnPermissions(allFields, desensitizationList, dto.getId(), null); if (ObjectUtils.isEmpty(allFields)) { DEException.throwException(Translator.get("i18n_no_column_permission")); } @@ -483,20 +477,20 @@ public class ExportCenterManage implements BaseExportApi { } sql = Utils.replaceSchemaAlias(sql, dsMap); } - List rowPermissionsTree = new ArrayList<>(); - TokenUserBO user = AuthUtils.getUser(); - if (user != null) { - rowPermissionsTree = permissionManage.getRowPermissionsTree(dto.getId(), user.getUserId()); - } - if (StringUtils.isNotEmpty(request.getExpressionTree())) { - Gson gson = new Gson(); - DatasetRowPermissionsTreeObj datasetRowPermissionsTreeObj = JsonUtil.parseObject(request.getExpressionTree(), DatasetRowPermissionsTreeObj.class); - permissionManage.getField(datasetRowPermissionsTreeObj); - DataSetRowPermissionsTreeDTO dataSetRowPermissionsTreeDTO = new DataSetRowPermissionsTreeDTO(); - dataSetRowPermissionsTreeDTO.setTree(datasetRowPermissionsTreeObj); - dataSetRowPermissionsTreeDTO.setExportData(true); - rowPermissionsTree.add(dataSetRowPermissionsTreeDTO); - } +// List rowPermissionsTree = new ArrayList<>(); +// TokenUserBO user = AuthUtils.getUser(); +// if (user != null) { +// rowPermissionsTree = permissionManage.getRowPermissionsTree(dto.getId(), user.getUserId()); +// } +// if (StringUtils.isNotEmpty(request.getExpressionTree())) { +// Gson gson = new Gson(); +// DatasetRowPermissionsTreeObj datasetRowPermissionsTreeObj = JsonUtil.parseObject(request.getExpressionTree(), DatasetRowPermissionsTreeObj.class); +// permissionManage.getField(datasetRowPermissionsTreeObj); +// DataSetRowPermissionsTreeDTO dataSetRowPermissionsTreeDTO = new DataSetRowPermissionsTreeDTO(); +// dataSetRowPermissionsTreeDTO.setTree(datasetRowPermissionsTreeObj); +// dataSetRowPermissionsTreeDTO.setExportData(true); +// rowPermissionsTree.add(dataSetRowPermissionsTreeDTO); +// } Provider provider; if (crossDs) { @@ -507,7 +501,7 @@ public class ExportCenterManage implements BaseExportApi { SQLMeta sqlMeta = new SQLMeta(); Table2SQLObj.table2sqlobj(sqlMeta, null, "(" + sql + ")", crossDs); Field2SQLObj.field2sqlObj(sqlMeta, allFields, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); - WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); +// WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); Order2SQLObj.getOrders(sqlMeta, dto.getSortFields(), allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage); String replaceSql = provider.rebuildSQL(SQLProvider.createQuerySQL(sqlMeta, false, false, false), sqlMeta, crossDs, dsMap); Long totalCount = datasetDataManage.getDatasetTotal(dto, replaceSql, null); @@ -646,7 +640,7 @@ public class ExportCenterManage implements BaseExportApi { boolean isCreated = directory.mkdir(); TokenUserBO tokenUserBO = AuthUtils.getUser(); Future future = scheduledThreadPoolExecutor.submit(() -> { - LicenseUtil.validate(); +// LicenseUtil.validate(); AuthUtils.setUser(tokenUserBO); try { exportTask.setExportStatus("IN_PROGRESS"); @@ -801,14 +795,14 @@ public class ExportCenterManage implements BaseExportApi { public void addWatermarkTools(Workbook wb) { VisualizationWatermark watermark = watermarkMapper.selectById("system_default"); WatermarkContentDTO watermarkContent = JsonUtil.parseObject(watermark.getSettingContent(), WatermarkContentDTO.class); - if (watermarkContent.getEnable() && watermarkContent.getExcelEnable()) { - UserFormVO userInfo = visualizationMapper.queryInnerUserInfo(AuthUtils.getUser().getUserId()); - // 在主逻辑中添加水印 - int watermarkPictureIdx = ExcelWatermarkUtils.addWatermarkImage(wb, watermarkContent, userInfo); // 生成水印图片并获取 ID - for (Sheet sheet : wb) { - ExcelWatermarkUtils.addWatermarkToSheet(sheet, watermarkPictureIdx); // 为每个 Sheet 添加水印 - } - } +// if (watermarkContent.getEnable() && watermarkContent.getExcelEnable()) { +// UserFormVO userInfo = visualizationMapper.queryInnerUserInfo(AuthUtils.getUser().getUserId()); +// // 在主逻辑中添加水印 +// int watermarkPictureIdx = ExcelWatermarkUtils.addWatermarkImage(wb, watermarkContent, userInfo); // 生成水印图片并获取 ID +// for (Sheet sheet : wb) { +// ExcelWatermarkUtils.addWatermarkToSheet(sheet, watermarkPictureIdx); // 为每个 Sheet 添加水印 +// } +// } } } diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/server/ExportCenterServer.java b/core/core-backend/src/main/java/io/gisbi/exportCenter/server/ExportCenterServer.java similarity index 84% rename from core/core-backend/src/main/java/io/dataease/exportCenter/server/ExportCenterServer.java rename to core/core-backend/src/main/java/io/gisbi/exportCenter/server/ExportCenterServer.java index 3e8dca4..2280439 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/server/ExportCenterServer.java +++ b/core/core-backend/src/main/java/io/gisbi/exportCenter/server/ExportCenterServer.java @@ -1,9 +1,9 @@ -package io.dataease.exportCenter.server; +package io.gisbi.exportCenter.server; -import io.dataease.api.exportCenter.ExportCenterApi; -import io.dataease.exportCenter.manage.ExportCenterManage; -import io.dataease.exportCenter.util.ExportCenterUtils; -import io.dataease.model.ExportTaskDTO; +import io.gisbi.api.exportCenter.ExportCenterApi; +import io.gisbi.exportCenter.manage.ExportCenterManage; +import io.gisbi.exportCenter.util.ExportCenterUtils; +import io.gisbi.model.ExportTaskDTO; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import org.springframework.transaction.annotation.Transactional; diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/util/ExportCenterUtils.java b/core/core-backend/src/main/java/io/gisbi/exportCenter/util/ExportCenterUtils.java similarity index 84% rename from core/core-backend/src/main/java/io/dataease/exportCenter/util/ExportCenterUtils.java rename to core/core-backend/src/main/java/io/gisbi/exportCenter/util/ExportCenterUtils.java index 3fcd848..e085a37 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/util/ExportCenterUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/exportCenter/util/ExportCenterUtils.java @@ -1,6 +1,6 @@ -package io.dataease.exportCenter.util; +package io.gisbi.exportCenter.util; -import io.dataease.exportCenter.manage.ExportCenterLimitManage; +import io.gisbi.exportCenter.manage.ExportCenterLimitManage; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/font/dao/auto/entity/CoreFont.java b/core/core-backend/src/main/java/io/gisbi/font/dao/auto/entity/CoreFont.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/font/dao/auto/entity/CoreFont.java rename to core/core-backend/src/main/java/io/gisbi/font/dao/auto/entity/CoreFont.java index afd4d9d..d0a8d26 100644 --- a/core/core-backend/src/main/java/io/dataease/font/dao/auto/entity/CoreFont.java +++ b/core/core-backend/src/main/java/io/gisbi/font/dao/auto/entity/CoreFont.java @@ -1,4 +1,4 @@ -package io.dataease.font.dao.auto.entity; +package io.gisbi.font.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-08-28 */ @TableName("core_font") diff --git a/core/core-backend/src/main/java/io/dataease/font/dao/auto/mapper/CoreFontMapper.java b/core/core-backend/src/main/java/io/gisbi/font/dao/auto/mapper/CoreFontMapper.java similarity index 68% rename from core/core-backend/src/main/java/io/dataease/font/dao/auto/mapper/CoreFontMapper.java rename to core/core-backend/src/main/java/io/gisbi/font/dao/auto/mapper/CoreFontMapper.java index 8e7ef7c..2b4edaa 100644 --- a/core/core-backend/src/main/java/io/dataease/font/dao/auto/mapper/CoreFontMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/font/dao/auto/mapper/CoreFontMapper.java @@ -1,6 +1,6 @@ -package io.dataease.font.dao.auto.mapper; +package io.gisbi.font.dao.auto.mapper; -import io.dataease.font.dao.auto.entity.CoreFont; +import io.gisbi.font.dao.auto.entity.CoreFont; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-08-28 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java b/core/core-backend/src/main/java/io/gisbi/font/manage/FontManage.java similarity index 94% rename from core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java rename to core/core-backend/src/main/java/io/gisbi/font/manage/FontManage.java index 0f95280..f485d34 100644 --- a/core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java +++ b/core/core-backend/src/main/java/io/gisbi/font/manage/FontManage.java @@ -1,13 +1,12 @@ -package io.dataease.font.manage; +package io.gisbi.font.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import io.dataease.api.font.dto.FontDto; -import io.dataease.chart.dao.auto.entity.CoreChartView; -import io.dataease.exception.DEException; -import io.dataease.font.dao.auto.entity.CoreFont; -import io.dataease.font.dao.auto.mapper.CoreFontMapper; -import io.dataease.utils.*; +import io.gisbi.api.font.dto.FontDto; +import io.gisbi.exception.DEException; +import io.gisbi.font.dao.auto.entity.CoreFont; +import io.gisbi.font.dao.auto.mapper.CoreFontMapper; +import io.gisbi.utils.*; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.collections4.CollectionUtils; @@ -24,12 +23,9 @@ import org.springframework.core.io.ResourceLoader; import java.awt.*; import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.io.IOException; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.UUID; diff --git a/core/core-backend/src/main/java/io/dataease/font/server/FontServer.java b/core/core-backend/src/main/java/io/gisbi/font/server/FontServer.java similarity index 87% rename from core/core-backend/src/main/java/io/dataease/font/server/FontServer.java rename to core/core-backend/src/main/java/io/gisbi/font/server/FontServer.java index 764266b..d35966c 100644 --- a/core/core-backend/src/main/java/io/dataease/font/server/FontServer.java +++ b/core/core-backend/src/main/java/io/gisbi/font/server/FontServer.java @@ -1,10 +1,10 @@ -package io.dataease.font.server; +package io.gisbi.font.server; -import io.dataease.api.font.api.FontApi; -import io.dataease.api.font.dto.FontDto; -import io.dataease.exception.DEException; +import io.gisbi.api.font.api.FontApi; +import io.gisbi.api.font.dto.FontDto; +import io.gisbi.exception.DEException; import jakarta.annotation.Resource; -import io.dataease.font.manage.FontManage; +import io.gisbi.font.manage.FontManage; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/core/core-backend/src/main/java/io/dataease/home/IndexController.java b/core/core-backend/src/main/java/io/gisbi/home/IndexController.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/home/IndexController.java rename to core/core-backend/src/main/java/io/gisbi/home/IndexController.java index 3de4b0a..97f891d 100644 --- a/core/core-backend/src/main/java/io/dataease/home/IndexController.java +++ b/core/core-backend/src/main/java/io/gisbi/home/IndexController.java @@ -1,4 +1,4 @@ -package io.dataease.home; +package io.gisbi.home; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/core/core-backend/src/main/java/io/dataease/home/RestIndexController.java b/core/core-backend/src/main/java/io/gisbi/home/RestIndexController.java similarity index 86% rename from core/core-backend/src/main/java/io/dataease/home/RestIndexController.java rename to core/core-backend/src/main/java/io/gisbi/home/RestIndexController.java index 701dfa5..baddfe4 100644 --- a/core/core-backend/src/main/java/io/dataease/home/RestIndexController.java +++ b/core/core-backend/src/main/java/io/gisbi/home/RestIndexController.java @@ -1,8 +1,8 @@ -package io.dataease.home; +package io.gisbi.home; -import io.dataease.home.manage.DeIndexManage; -import io.dataease.utils.ModelUtils; -import io.dataease.utils.RsaUtils; +import io.gisbi.home.manage.DeIndexManage; +import io.gisbi.utils.ModelUtils; +import io.gisbi.utils.RsaUtils; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/core/core-backend/src/main/java/io/dataease/home/manage/DeIndexManage.java b/core/core-backend/src/main/java/io/gisbi/home/manage/DeIndexManage.java similarity index 88% rename from core/core-backend/src/main/java/io/dataease/home/manage/DeIndexManage.java rename to core/core-backend/src/main/java/io/gisbi/home/manage/DeIndexManage.java index 9ef0cfe..f153828 100644 --- a/core/core-backend/src/main/java/io/dataease/home/manage/DeIndexManage.java +++ b/core/core-backend/src/main/java/io/gisbi/home/manage/DeIndexManage.java @@ -1,4 +1,4 @@ -package io.dataease.home.manage; +package io.gisbi.home.manage; import io.dataease.license.config.XpackInteract; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/interceptor/MybatisInterceptor.java b/core/core-backend/src/main/java/io/gisbi/interceptor/MybatisInterceptor.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/interceptor/MybatisInterceptor.java rename to core/core-backend/src/main/java/io/gisbi/interceptor/MybatisInterceptor.java index a7a9215..c7d6ff1 100644 --- a/core/core-backend/src/main/java/io/dataease/interceptor/MybatisInterceptor.java +++ b/core/core-backend/src/main/java/io/gisbi/interceptor/MybatisInterceptor.java @@ -1,7 +1,7 @@ -package io.dataease.interceptor; +package io.gisbi.interceptor; -import io.dataease.commons.utils.MybatisInterceptorConfig; -import io.dataease.utils.BeanUtils; +import io.gisbi.commons.utils.MybatisInterceptorConfig; +import io.gisbi.utils.BeanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.cache.CacheKey; import org.apache.ibatis.executor.Executor; diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/CheckDsStatusJob.java b/core/core-backend/src/main/java/io/gisbi/job/schedule/CheckDsStatusJob.java similarity index 79% rename from core/core-backend/src/main/java/io/dataease/job/schedule/CheckDsStatusJob.java rename to core/core-backend/src/main/java/io/gisbi/job/schedule/CheckDsStatusJob.java index cf3c0e0..0e8bd95 100644 --- a/core/core-backend/src/main/java/io/dataease/job/schedule/CheckDsStatusJob.java +++ b/core/core-backend/src/main/java/io/gisbi/job/schedule/CheckDsStatusJob.java @@ -1,9 +1,9 @@ -package io.dataease.job.schedule; +package io.gisbi.job.schedule; -import io.dataease.datasource.server.DatasourceServer; -import io.dataease.utils.CommonBeanFactory; -import io.dataease.utils.LogUtil; +import io.gisbi.datasource.server.DatasourceServer; +import io.gisbi.utils.CommonBeanFactory; +import io.gisbi.utils.LogUtil; import jakarta.annotation.Resource; import org.quartz.Job; import org.quartz.JobExecutionContext; diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/CleanScheduler.java b/core/core-backend/src/main/java/io/gisbi/job/schedule/CleanScheduler.java similarity index 81% rename from core/core-backend/src/main/java/io/dataease/job/schedule/CleanScheduler.java rename to core/core-backend/src/main/java/io/gisbi/job/schedule/CleanScheduler.java index 375548b..5351042 100644 --- a/core/core-backend/src/main/java/io/dataease/job/schedule/CleanScheduler.java +++ b/core/core-backend/src/main/java/io/gisbi/job/schedule/CleanScheduler.java @@ -1,8 +1,8 @@ -package io.dataease.job.schedule; +package io.gisbi.job.schedule; -import io.dataease.datasource.server.DatasourceTaskServer; -import io.dataease.exportCenter.manage.ExportCenterManage; -import io.dataease.utils.LogUtil; +import io.gisbi.datasource.server.DatasourceTaskServer; +import io.gisbi.exportCenter.manage.ExportCenterManage; +import io.gisbi.utils.LogUtil; import jakarta.annotation.Resource; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/DeDataFillingTaskExecutor.java b/core/core-backend/src/main/java/io/gisbi/job/schedule/DeDataFillingTaskExecutor.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/job/schedule/DeDataFillingTaskExecutor.java rename to core/core-backend/src/main/java/io/gisbi/job/schedule/DeDataFillingTaskExecutor.java index 54f582a..6bb1266 100644 --- a/core/core-backend/src/main/java/io/dataease/job/schedule/DeDataFillingTaskExecutor.java +++ b/core/core-backend/src/main/java/io/gisbi/job/schedule/DeDataFillingTaskExecutor.java @@ -1,6 +1,6 @@ -package io.dataease.job.schedule; +package io.gisbi.job.schedule; -import io.dataease.commons.utils.CronUtils; +import io.gisbi.commons.utils.CronUtils; import io.dataease.license.config.XpackInteract; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/DeScheduleJob.java b/core/core-backend/src/main/java/io/gisbi/job/schedule/DeScheduleJob.java similarity index 93% rename from core/core-backend/src/main/java/io/dataease/job/schedule/DeScheduleJob.java rename to core/core-backend/src/main/java/io/gisbi/job/schedule/DeScheduleJob.java index 029036e..299c19c 100644 --- a/core/core-backend/src/main/java/io/dataease/job/schedule/DeScheduleJob.java +++ b/core/core-backend/src/main/java/io/gisbi/job/schedule/DeScheduleJob.java @@ -1,6 +1,6 @@ -package io.dataease.job.schedule; +package io.gisbi.job.schedule; -import io.dataease.utils.LogUtil; +import io.gisbi.utils.LogUtil; import org.quartz.*; public abstract class DeScheduleJob implements Job { diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/DeTaskExecutor.java b/core/core-backend/src/main/java/io/gisbi/job/schedule/DeTaskExecutor.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/job/schedule/DeTaskExecutor.java rename to core/core-backend/src/main/java/io/gisbi/job/schedule/DeTaskExecutor.java index 4a47dd1..5090e9a 100644 --- a/core/core-backend/src/main/java/io/dataease/job/schedule/DeTaskExecutor.java +++ b/core/core-backend/src/main/java/io/gisbi/job/schedule/DeTaskExecutor.java @@ -1,6 +1,6 @@ -package io.dataease.job.schedule; +package io.gisbi.job.schedule; -import io.dataease.commons.utils.CronUtils; +import io.gisbi.commons.utils.CronUtils; import io.dataease.license.config.XpackInteract; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/DeXpackDataFillingScheduleJob.java b/core/core-backend/src/main/java/io/gisbi/job/schedule/DeXpackDataFillingScheduleJob.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/job/schedule/DeXpackDataFillingScheduleJob.java rename to core/core-backend/src/main/java/io/gisbi/job/schedule/DeXpackDataFillingScheduleJob.java index ef91ebb..a0de990 100644 --- a/core/core-backend/src/main/java/io/dataease/job/schedule/DeXpackDataFillingScheduleJob.java +++ b/core/core-backend/src/main/java/io/gisbi/job/schedule/DeXpackDataFillingScheduleJob.java @@ -1,8 +1,8 @@ -package io.dataease.job.schedule; +package io.gisbi.job.schedule; import io.dataease.license.utils.LicenseUtil; -import io.dataease.utils.CommonBeanFactory; -import io.dataease.utils.LogUtil; +import io.gisbi.utils.CommonBeanFactory; +import io.gisbi.utils.LogUtil; import org.quartz.*; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/DeXpackScheduleJob.java b/core/core-backend/src/main/java/io/gisbi/job/schedule/DeXpackScheduleJob.java similarity index 87% rename from core/core-backend/src/main/java/io/dataease/job/schedule/DeXpackScheduleJob.java rename to core/core-backend/src/main/java/io/gisbi/job/schedule/DeXpackScheduleJob.java index 30e1f22..29ee3fe 100644 --- a/core/core-backend/src/main/java/io/dataease/job/schedule/DeXpackScheduleJob.java +++ b/core/core-backend/src/main/java/io/gisbi/job/schedule/DeXpackScheduleJob.java @@ -1,9 +1,8 @@ -package io.dataease.job.schedule; +package io.gisbi.job.schedule; import io.dataease.license.utils.LicenseUtil; -import io.dataease.utils.CommonBeanFactory; -import io.dataease.utils.LogUtil; -import jakarta.annotation.Resource; +import io.gisbi.utils.CommonBeanFactory; +import io.gisbi.utils.LogUtil; import org.quartz.*; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/ExtractDataJob.java b/core/core-backend/src/main/java/io/gisbi/job/schedule/ExtractDataJob.java similarity index 78% rename from core/core-backend/src/main/java/io/dataease/job/schedule/ExtractDataJob.java rename to core/core-backend/src/main/java/io/gisbi/job/schedule/ExtractDataJob.java index 0ffbaae..e3a32f4 100644 --- a/core/core-backend/src/main/java/io/dataease/job/schedule/ExtractDataJob.java +++ b/core/core-backend/src/main/java/io/gisbi/job/schedule/ExtractDataJob.java @@ -1,8 +1,8 @@ -package io.dataease.job.schedule; +package io.gisbi.job.schedule; -import io.dataease.datasource.manage.DatasourceSyncManage; -import io.dataease.utils.CommonBeanFactory; +import io.gisbi.datasource.manage.DatasourceSyncManage; +import io.gisbi.utils.CommonBeanFactory; import org.quartz.JobExecutionContext; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/Schedular.java b/core/core-backend/src/main/java/io/gisbi/job/schedule/Schedular.java similarity index 80% rename from core/core-backend/src/main/java/io/dataease/job/schedule/Schedular.java rename to core/core-backend/src/main/java/io/gisbi/job/schedule/Schedular.java index 88de462..b740094 100644 --- a/core/core-backend/src/main/java/io/dataease/job/schedule/Schedular.java +++ b/core/core-backend/src/main/java/io/gisbi/job/schedule/Schedular.java @@ -1,7 +1,7 @@ -package io.dataease.job.schedule; +package io.gisbi.job.schedule; import com.fit2cloud.quartz.anno.QuartzScheduled; -import io.dataease.datasource.server.DatasourceServer; +import io.gisbi.datasource.server.DatasourceServer; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/ScheduleManager.java b/core/core-backend/src/main/java/io/gisbi/job/schedule/ScheduleManager.java similarity index 99% rename from core/core-backend/src/main/java/io/dataease/job/schedule/ScheduleManager.java rename to core/core-backend/src/main/java/io/gisbi/job/schedule/ScheduleManager.java index e970294..a0459dc 100644 --- a/core/core-backend/src/main/java/io/dataease/job/schedule/ScheduleManager.java +++ b/core/core-backend/src/main/java/io/gisbi/job/schedule/ScheduleManager.java @@ -1,9 +1,9 @@ -package io.dataease.job.schedule; +package io.gisbi.job.schedule; -import io.dataease.exception.DEException; -import io.dataease.i18n.Translator; -import io.dataease.utils.LogUtil; +import io.gisbi.exception.DEException; +import io.gisbi.i18n.Translator; +import io.gisbi.utils.LogUtil; import jakarta.annotation.Resource; import org.quartz.*; import org.quartz.impl.matchers.GroupMatcher; diff --git a/core/core-backend/src/main/java/io/dataease/license/manage/CoreLicManage.java b/core/core-backend/src/main/java/io/gisbi/license/manage/CoreLicManage.java similarity index 77% rename from core/core-backend/src/main/java/io/dataease/license/manage/CoreLicManage.java rename to core/core-backend/src/main/java/io/gisbi/license/manage/CoreLicManage.java index c264d40..70ab854 100644 --- a/core/core-backend/src/main/java/io/dataease/license/manage/CoreLicManage.java +++ b/core/core-backend/src/main/java/io/gisbi/license/manage/CoreLicManage.java @@ -1,4 +1,4 @@ -package io.dataease.license.manage; +package io.gisbi.license.manage; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Component public class CoreLicManage { - @Value("${dataease.version}") + @Value("1.0.0") private String version; public String getVersion() { diff --git a/core/core-backend/src/main/java/io/dataease/license/server/LicenseServer.java b/core/core-backend/src/main/java/io/gisbi/license/server/LicenseServer.java similarity index 85% rename from core/core-backend/src/main/java/io/dataease/license/server/LicenseServer.java rename to core/core-backend/src/main/java/io/gisbi/license/server/LicenseServer.java index 69978d0..9abe648 100644 --- a/core/core-backend/src/main/java/io/dataease/license/server/LicenseServer.java +++ b/core/core-backend/src/main/java/io/gisbi/license/server/LicenseServer.java @@ -1,9 +1,9 @@ -package io.dataease.license.server; +package io.gisbi.license.server; -import io.dataease.api.license.LicenseApi; -import io.dataease.api.license.dto.LicenseRequest; +import io.gisbi.api.license.LicenseApi; +import io.gisbi.api.license.dto.LicenseRequest; import io.dataease.license.bo.F2CLicResult; -import io.dataease.license.manage.CoreLicManage; +import io.gisbi.license.manage.CoreLicManage; import io.dataease.license.manage.F2CLicManage; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/listener/ChartFilterDynamicListener.java b/core/core-backend/src/main/java/io/gisbi/listener/ChartFilterDynamicListener.java similarity index 86% rename from core/core-backend/src/main/java/io/dataease/listener/ChartFilterDynamicListener.java rename to core/core-backend/src/main/java/io/gisbi/listener/ChartFilterDynamicListener.java index 08787b2..af3be95 100644 --- a/core/core-backend/src/main/java/io/dataease/listener/ChartFilterDynamicListener.java +++ b/core/core-backend/src/main/java/io/gisbi/listener/ChartFilterDynamicListener.java @@ -1,8 +1,8 @@ -package io.dataease.listener; +package io.gisbi.listener; -import io.dataease.chart.manage.ChartViewOldDataMergeService; -import io.dataease.startup.dao.auto.entity.CoreSysStartupJob; -import io.dataease.startup.dao.auto.mapper.CoreSysStartupJobMapper; +import io.gisbi.chart.manage.ChartViewOldDataMergeService; +import io.gisbi.startup.dao.auto.entity.CoreSysStartupJob; +import io.gisbi.startup.dao.auto.mapper.CoreSysStartupJobMapper; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; /** - * @Author Junjun + * @Author bi-coder */ @Component @Order(value = 9) diff --git a/core/core-backend/src/main/java/io/dataease/listener/ChartFilterMergeListener.java b/core/core-backend/src/main/java/io/gisbi/listener/ChartFilterMergeListener.java similarity index 86% rename from core/core-backend/src/main/java/io/dataease/listener/ChartFilterMergeListener.java rename to core/core-backend/src/main/java/io/gisbi/listener/ChartFilterMergeListener.java index 6620b5e..672014a 100644 --- a/core/core-backend/src/main/java/io/dataease/listener/ChartFilterMergeListener.java +++ b/core/core-backend/src/main/java/io/gisbi/listener/ChartFilterMergeListener.java @@ -1,8 +1,8 @@ -package io.dataease.listener; +package io.gisbi.listener; -import io.dataease.chart.manage.ChartViewOldDataMergeService; -import io.dataease.startup.dao.auto.entity.CoreSysStartupJob; -import io.dataease.startup.dao.auto.mapper.CoreSysStartupJobMapper; +import io.gisbi.chart.manage.ChartViewOldDataMergeService; +import io.gisbi.startup.dao.auto.entity.CoreSysStartupJob; +import io.gisbi.startup.dao.auto.mapper.CoreSysStartupJobMapper; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; /** - * @Author Junjun + * @Author bi-coder */ @Component @Order(value = 4) diff --git a/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java b/core/core-backend/src/main/java/io/gisbi/listener/DataSourceInitStartListener.java similarity index 81% rename from core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java rename to core/core-backend/src/main/java/io/gisbi/listener/DataSourceInitStartListener.java index a473a37..08dec64 100644 --- a/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java +++ b/core/core-backend/src/main/java/io/gisbi/listener/DataSourceInitStartListener.java @@ -1,14 +1,14 @@ -package io.dataease.listener; +package io.gisbi.listener; -import io.dataease.datasource.dao.auto.entity.CoreDatasourceTask; -import io.dataease.datasource.manage.DataSourceManage; -import io.dataease.datasource.manage.DatasourceSyncManage; -import io.dataease.datasource.manage.EngineManage; -import io.dataease.datasource.provider.CalciteProvider; -import io.dataease.datasource.server.DatasourceServer; -import io.dataease.datasource.server.DatasourceTaskServer; -import io.dataease.system.dao.auto.entity.CoreSysSetting; -import io.dataease.system.manage.SysParameterManage; +import io.gisbi.datasource.dao.auto.entity.CoreDatasourceTask; +import io.gisbi.datasource.manage.DataSourceManage; +import io.gisbi.datasource.manage.DatasourceSyncManage; +import io.gisbi.datasource.manage.EngineManage; +import io.gisbi.datasource.provider.CalciteProvider; +import io.gisbi.datasource.server.DatasourceServer; +import io.gisbi.datasource.server.DatasourceTaskServer; +import io.gisbi.system.dao.auto.entity.CoreSysSetting; +import io.gisbi.system.manage.SysParameterManage; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.boot.context.event.ApplicationReadyEvent; diff --git a/core/core-backend/src/main/java/io/dataease/listener/EhCacheStartListener.java b/core/core-backend/src/main/java/io/gisbi/listener/EhCacheStartListener.java similarity index 94% rename from core/core-backend/src/main/java/io/dataease/listener/EhCacheStartListener.java rename to core/core-backend/src/main/java/io/gisbi/listener/EhCacheStartListener.java index 8893004..383794c 100644 --- a/core/core-backend/src/main/java/io/dataease/listener/EhCacheStartListener.java +++ b/core/core-backend/src/main/java/io/gisbi/listener/EhCacheStartListener.java @@ -1,7 +1,7 @@ -package io.dataease.listener; +package io.gisbi.listener; -import io.dataease.utils.ConfigUtils; +import io.gisbi.utils.ConfigUtils; import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; diff --git a/core/core-backend/src/main/java/io/dataease/listener/TemplateInitListener.java b/core/core-backend/src/main/java/io/gisbi/listener/TemplateInitListener.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/listener/TemplateInitListener.java rename to core/core-backend/src/main/java/io/gisbi/listener/TemplateInitListener.java index 183165b..664fd5f 100644 --- a/core/core-backend/src/main/java/io/dataease/listener/TemplateInitListener.java +++ b/core/core-backend/src/main/java/io/gisbi/listener/TemplateInitListener.java @@ -1,7 +1,7 @@ -package io.dataease.listener; +package io.gisbi.listener; import io.dataease.license.utils.LogUtil; -import io.dataease.template.manage.TemplateLocalParseManage; +import io.gisbi.template.manage.TemplateLocalParseManage; import jakarta.annotation.Resource; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; diff --git a/core/core-backend/src/main/java/io/dataease/listener/XpackTaskStarter.java b/core/core-backend/src/main/java/io/gisbi/listener/XpackTaskStarter.java similarity index 84% rename from core/core-backend/src/main/java/io/dataease/listener/XpackTaskStarter.java rename to core/core-backend/src/main/java/io/gisbi/listener/XpackTaskStarter.java index eb83895..010ff70 100644 --- a/core/core-backend/src/main/java/io/dataease/listener/XpackTaskStarter.java +++ b/core/core-backend/src/main/java/io/gisbi/listener/XpackTaskStarter.java @@ -1,9 +1,9 @@ -package io.dataease.listener; +package io.gisbi.listener; -import io.dataease.job.schedule.DeDataFillingTaskExecutor; -import io.dataease.job.schedule.DeTaskExecutor; +import io.gisbi.job.schedule.DeDataFillingTaskExecutor; +import io.gisbi.job.schedule.DeTaskExecutor; import io.dataease.license.utils.LicenseUtil; -import io.dataease.utils.LogUtil; +import io.gisbi.utils.LogUtil; import jakarta.annotation.Resource; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; diff --git a/core/core-backend/src/main/java/io/dataease/map/bo/AreaBO.java b/core/core-backend/src/main/java/io/gisbi/map/bo/AreaBO.java similarity index 75% rename from core/core-backend/src/main/java/io/dataease/map/bo/AreaBO.java rename to core/core-backend/src/main/java/io/gisbi/map/bo/AreaBO.java index c9620c8..4177d4f 100644 --- a/core/core-backend/src/main/java/io/dataease/map/bo/AreaBO.java +++ b/core/core-backend/src/main/java/io/gisbi/map/bo/AreaBO.java @@ -1,6 +1,6 @@ -package io.dataease.map.bo; +package io.gisbi.map.bo; -import io.dataease.map.dao.auto.entity.Area; +import io.gisbi.map.dao.auto.entity.Area; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/core-backend/src/main/java/io/dataease/map/dao/auto/entity/Area.java b/core/core-backend/src/main/java/io/gisbi/map/dao/auto/entity/Area.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/map/dao/auto/entity/Area.java rename to core/core-backend/src/main/java/io/gisbi/map/dao/auto/entity/Area.java index 1f80c60..bf74e93 100644 --- a/core/core-backend/src/main/java/io/dataease/map/dao/auto/entity/Area.java +++ b/core/core-backend/src/main/java/io/gisbi/map/dao/auto/entity/Area.java @@ -1,4 +1,4 @@ -package io.dataease.map.dao.auto.entity; +package io.gisbi.map.dao.auto.entity; import java.io.Serializable; @@ -7,7 +7,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-07-09 */ public class Area implements Serializable { diff --git a/core/core-backend/src/main/java/io/dataease/map/dao/auto/entity/CoreCustomGeoArea.java b/core/core-backend/src/main/java/io/gisbi/map/dao/auto/entity/CoreCustomGeoArea.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/map/dao/auto/entity/CoreCustomGeoArea.java rename to core/core-backend/src/main/java/io/gisbi/map/dao/auto/entity/CoreCustomGeoArea.java index af97566..aee2f62 100644 --- a/core/core-backend/src/main/java/io/dataease/map/dao/auto/entity/CoreCustomGeoArea.java +++ b/core/core-backend/src/main/java/io/gisbi/map/dao/auto/entity/CoreCustomGeoArea.java @@ -1,4 +1,4 @@ -package io.dataease.map.dao.auto.entity; +package io.gisbi.map.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * 自定义地理区域 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-11-22 */ @TableName("core_custom_geo_area") diff --git a/core/core-backend/src/main/java/io/dataease/map/dao/auto/entity/CoreCustomGeoSubArea.java b/core/core-backend/src/main/java/io/gisbi/map/dao/auto/entity/CoreCustomGeoSubArea.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/map/dao/auto/entity/CoreCustomGeoSubArea.java rename to core/core-backend/src/main/java/io/gisbi/map/dao/auto/entity/CoreCustomGeoSubArea.java index bf81f82..1f8d495 100644 --- a/core/core-backend/src/main/java/io/dataease/map/dao/auto/entity/CoreCustomGeoSubArea.java +++ b/core/core-backend/src/main/java/io/gisbi/map/dao/auto/entity/CoreCustomGeoSubArea.java @@ -1,4 +1,4 @@ -package io.dataease.map.dao.auto.entity; +package io.gisbi.map.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * 自定义地理区域分区详情 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-11-22 */ @TableName("core_custom_geo_sub_area") diff --git a/core/core-backend/src/main/java/io/dataease/map/dao/auto/mapper/AreaMapper.java b/core/core-backend/src/main/java/io/gisbi/map/dao/auto/mapper/AreaMapper.java similarity index 68% rename from core/core-backend/src/main/java/io/dataease/map/dao/auto/mapper/AreaMapper.java rename to core/core-backend/src/main/java/io/gisbi/map/dao/auto/mapper/AreaMapper.java index 60051b2..efa5cad 100644 --- a/core/core-backend/src/main/java/io/dataease/map/dao/auto/mapper/AreaMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/map/dao/auto/mapper/AreaMapper.java @@ -1,6 +1,6 @@ -package io.dataease.map.dao.auto.mapper; +package io.gisbi.map.dao.auto.mapper; -import io.dataease.map.dao.auto.entity.Area; +import io.gisbi.map.dao.auto.entity.Area; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-07-09 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/map/dao/auto/mapper/CoreCustomGeoAreaMapper.java b/core/core-backend/src/main/java/io/gisbi/map/dao/auto/mapper/CoreCustomGeoAreaMapper.java similarity index 70% rename from core/core-backend/src/main/java/io/dataease/map/dao/auto/mapper/CoreCustomGeoAreaMapper.java rename to core/core-backend/src/main/java/io/gisbi/map/dao/auto/mapper/CoreCustomGeoAreaMapper.java index a4625e2..a80cf39 100644 --- a/core/core-backend/src/main/java/io/dataease/map/dao/auto/mapper/CoreCustomGeoAreaMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/map/dao/auto/mapper/CoreCustomGeoAreaMapper.java @@ -1,6 +1,6 @@ -package io.dataease.map.dao.auto.mapper; +package io.gisbi.map.dao.auto.mapper; -import io.dataease.map.dao.auto.entity.CoreCustomGeoArea; +import io.gisbi.map.dao.auto.entity.CoreCustomGeoArea; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 自定义地理区域 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-11-22 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/map/dao/auto/mapper/CoreCustomGeoSubAreaMapper.java b/core/core-backend/src/main/java/io/gisbi/map/dao/auto/mapper/CoreCustomGeoSubAreaMapper.java similarity index 70% rename from core/core-backend/src/main/java/io/dataease/map/dao/auto/mapper/CoreCustomGeoSubAreaMapper.java rename to core/core-backend/src/main/java/io/gisbi/map/dao/auto/mapper/CoreCustomGeoSubAreaMapper.java index c2fcc3b..a83b463 100644 --- a/core/core-backend/src/main/java/io/dataease/map/dao/auto/mapper/CoreCustomGeoSubAreaMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/map/dao/auto/mapper/CoreCustomGeoSubAreaMapper.java @@ -1,6 +1,6 @@ -package io.dataease.map.dao.auto.mapper; +package io.gisbi.map.dao.auto.mapper; -import io.dataease.map.dao.auto.entity.CoreCustomGeoSubArea; +import io.gisbi.map.dao.auto.entity.CoreCustomGeoSubArea; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 自定义地理区域分区详情 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-11-22 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/map/dao/ext/entity/CoreAreaCustom.java b/core/core-backend/src/main/java/io/gisbi/map/dao/ext/entity/CoreAreaCustom.java similarity index 82% rename from core/core-backend/src/main/java/io/dataease/map/dao/ext/entity/CoreAreaCustom.java rename to core/core-backend/src/main/java/io/gisbi/map/dao/ext/entity/CoreAreaCustom.java index 808d7ee..5fa173d 100644 --- a/core/core-backend/src/main/java/io/dataease/map/dao/ext/entity/CoreAreaCustom.java +++ b/core/core-backend/src/main/java/io/gisbi/map/dao/ext/entity/CoreAreaCustom.java @@ -1,4 +1,4 @@ -package io.dataease.map.dao.ext.entity; +package io.gisbi.map.dao.ext.entity; import lombok.Data; diff --git a/core/core-backend/src/main/java/io/dataease/map/dao/ext/mapper/CoreAreaCustomMapper.java b/core/core-backend/src/main/java/io/gisbi/map/dao/ext/mapper/CoreAreaCustomMapper.java similarity index 66% rename from core/core-backend/src/main/java/io/dataease/map/dao/ext/mapper/CoreAreaCustomMapper.java rename to core/core-backend/src/main/java/io/gisbi/map/dao/ext/mapper/CoreAreaCustomMapper.java index 9060591..d625764 100644 --- a/core/core-backend/src/main/java/io/dataease/map/dao/ext/mapper/CoreAreaCustomMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/map/dao/ext/mapper/CoreAreaCustomMapper.java @@ -1,7 +1,7 @@ -package io.dataease.map.dao.ext.mapper; +package io.gisbi.map.dao.ext.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.dataease.map.dao.ext.entity.CoreAreaCustom; +import io.gisbi.map.dao.ext.entity.CoreAreaCustom; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/map/manage/MapManage.java b/core/core-backend/src/main/java/io/gisbi/map/manage/MapManage.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/map/manage/MapManage.java rename to core/core-backend/src/main/java/io/gisbi/map/manage/MapManage.java index 8fcc34a..e5001c6 100644 --- a/core/core-backend/src/main/java/io/dataease/map/manage/MapManage.java +++ b/core/core-backend/src/main/java/io/gisbi/map/manage/MapManage.java @@ -1,23 +1,23 @@ -package io.dataease.map.manage; +package io.gisbi.map.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.api.map.dto.GeometryNodeCreator; -import io.dataease.api.map.vo.AreaNode; -import io.dataease.api.map.vo.CustomGeoArea; -import io.dataease.api.map.vo.CustomGeoSubArea; -import io.dataease.constant.StaticResourceConstants; -import io.dataease.exception.DEException; -import io.dataease.i18n.Translator; -import io.dataease.map.bo.AreaBO; -import io.dataease.map.dao.auto.entity.Area; -import io.dataease.map.dao.auto.entity.CoreCustomGeoArea; -import io.dataease.map.dao.auto.entity.CoreCustomGeoSubArea; -import io.dataease.map.dao.auto.mapper.AreaMapper; -import io.dataease.map.dao.auto.mapper.CoreCustomGeoAreaMapper; -import io.dataease.map.dao.auto.mapper.CoreCustomGeoSubAreaMapper; -import io.dataease.map.dao.ext.entity.CoreAreaCustom; -import io.dataease.map.dao.ext.mapper.CoreAreaCustomMapper; -import io.dataease.utils.*; +import io.gisbi.api.map.dto.GeometryNodeCreator; +import io.gisbi.api.map.vo.AreaNode; +import io.gisbi.api.map.vo.CustomGeoArea; +import io.gisbi.api.map.vo.CustomGeoSubArea; +import io.gisbi.constant.StaticResourceConstants; +import io.gisbi.exception.DEException; +import io.gisbi.i18n.Translator; +import io.gisbi.map.bo.AreaBO; +import io.gisbi.map.dao.auto.entity.Area; +import io.gisbi.map.dao.auto.entity.CoreCustomGeoArea; +import io.gisbi.map.dao.auto.entity.CoreCustomGeoSubArea; +import io.gisbi.map.dao.auto.mapper.AreaMapper; +import io.gisbi.map.dao.auto.mapper.CoreCustomGeoAreaMapper; +import io.gisbi.map.dao.auto.mapper.CoreCustomGeoSubAreaMapper; +import io.gisbi.map.dao.ext.entity.CoreAreaCustom; +import io.gisbi.map.dao.ext.mapper.CoreAreaCustomMapper; +import io.gisbi.utils.*; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -36,8 +36,8 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -import static io.dataease.constant.CacheConstant.CommonCacheConstant.CUSTOM_GEO_CACHE; -import static io.dataease.constant.CacheConstant.CommonCacheConstant.WORLD_MAP_CACHE; +import static io.gisbi.constant.CacheConstant.CommonCacheConstant.CUSTOM_GEO_CACHE; +import static io.gisbi.constant.CacheConstant.CommonCacheConstant.WORLD_MAP_CACHE; @Component public class MapManage { diff --git a/core/core-backend/src/main/java/io/dataease/map/server/CustomGeoServer.java b/core/core-backend/src/main/java/io/gisbi/map/server/CustomGeoServer.java similarity index 83% rename from core/core-backend/src/main/java/io/dataease/map/server/CustomGeoServer.java rename to core/core-backend/src/main/java/io/gisbi/map/server/CustomGeoServer.java index cff2a7c..4731bfb 100644 --- a/core/core-backend/src/main/java/io/dataease/map/server/CustomGeoServer.java +++ b/core/core-backend/src/main/java/io/gisbi/map/server/CustomGeoServer.java @@ -1,10 +1,10 @@ -package io.dataease.map.server; +package io.gisbi.map.server; -import io.dataease.api.map.CustomGeoApi; -import io.dataease.api.map.vo.AreaNode; -import io.dataease.api.map.vo.CustomGeoArea; -import io.dataease.api.map.vo.CustomGeoSubArea; -import io.dataease.map.manage.MapManage; +import io.gisbi.api.map.CustomGeoApi; +import io.gisbi.api.map.vo.AreaNode; +import io.gisbi.api.map.vo.CustomGeoArea; +import io.gisbi.api.map.vo.CustomGeoSubArea; +import io.gisbi.map.manage.MapManage; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/core/core-backend/src/main/java/io/dataease/map/server/GeoServer.java b/core/core-backend/src/main/java/io/gisbi/map/server/GeoServer.java similarity index 78% rename from core/core-backend/src/main/java/io/dataease/map/server/GeoServer.java rename to core/core-backend/src/main/java/io/gisbi/map/server/GeoServer.java index 4d4c0eb..cf5c98c 100644 --- a/core/core-backend/src/main/java/io/dataease/map/server/GeoServer.java +++ b/core/core-backend/src/main/java/io/gisbi/map/server/GeoServer.java @@ -1,8 +1,8 @@ -package io.dataease.map.server; +package io.gisbi.map.server; -import io.dataease.api.map.GeoApi; -import io.dataease.api.map.dto.GeometryNodeCreator; -import io.dataease.map.manage.MapManage; +import io.gisbi.api.map.GeoApi; +import io.gisbi.api.map.dto.GeometryNodeCreator; +import io.gisbi.map.manage.MapManage; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/core/core-backend/src/main/java/io/dataease/map/server/MapServer.java b/core/core-backend/src/main/java/io/gisbi/map/server/MapServer.java similarity index 72% rename from core/core-backend/src/main/java/io/dataease/map/server/MapServer.java rename to core/core-backend/src/main/java/io/gisbi/map/server/MapServer.java index 8667787..973c3f1 100644 --- a/core/core-backend/src/main/java/io/dataease/map/server/MapServer.java +++ b/core/core-backend/src/main/java/io/gisbi/map/server/MapServer.java @@ -1,8 +1,8 @@ -package io.dataease.map.server; +package io.gisbi.map.server; -import io.dataease.api.map.MapApi; -import io.dataease.api.map.vo.AreaNode; -import io.dataease.map.manage.MapManage; +import io.gisbi.api.map.MapApi; +import io.gisbi.api.map.vo.AreaNode; +import io.gisbi.map.manage.MapManage; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/core/core-backend/src/main/java/io/dataease/menu/bo/MenuTreeNode.java b/core/core-backend/src/main/java/io/gisbi/menu/bo/MenuTreeNode.java similarity index 70% rename from core/core-backend/src/main/java/io/dataease/menu/bo/MenuTreeNode.java rename to core/core-backend/src/main/java/io/gisbi/menu/bo/MenuTreeNode.java index 30060e7..4c43175 100644 --- a/core/core-backend/src/main/java/io/dataease/menu/bo/MenuTreeNode.java +++ b/core/core-backend/src/main/java/io/gisbi/menu/bo/MenuTreeNode.java @@ -1,6 +1,6 @@ -package io.dataease.menu.bo; +package io.gisbi.menu.bo; -import io.dataease.menu.dao.auto.entity.CoreMenu; +import io.gisbi.menu.dao.auto.entity.CoreMenu; import lombok.Data; import java.util.ArrayList; diff --git a/core/core-backend/src/main/java/io/dataease/menu/dao/auto/entity/CoreMenu.java b/core/core-backend/src/main/java/io/gisbi/menu/dao/auto/entity/CoreMenu.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/menu/dao/auto/entity/CoreMenu.java rename to core/core-backend/src/main/java/io/gisbi/menu/dao/auto/entity/CoreMenu.java index c4412e1..5763ed7 100644 --- a/core/core-backend/src/main/java/io/dataease/menu/dao/auto/entity/CoreMenu.java +++ b/core/core-backend/src/main/java/io/gisbi/menu/dao/auto/entity/CoreMenu.java @@ -1,4 +1,4 @@ -package io.dataease.menu.dao.auto.entity; +package io.gisbi.menu.dao.auto.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -10,7 +10,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-06-02 */ @TableName("core_menu") diff --git a/core/core-backend/src/main/java/io/dataease/menu/dao/auto/mapper/CoreMenuMapper.java b/core/core-backend/src/main/java/io/gisbi/menu/dao/auto/mapper/CoreMenuMapper.java similarity index 68% rename from core/core-backend/src/main/java/io/dataease/menu/dao/auto/mapper/CoreMenuMapper.java rename to core/core-backend/src/main/java/io/gisbi/menu/dao/auto/mapper/CoreMenuMapper.java index d10b793..84e81f9 100644 --- a/core/core-backend/src/main/java/io/dataease/menu/dao/auto/mapper/CoreMenuMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/menu/dao/auto/mapper/CoreMenuMapper.java @@ -1,6 +1,6 @@ -package io.dataease.menu.dao.auto.mapper; +package io.gisbi.menu.dao.auto.mapper; -import io.dataease.menu.dao.auto.entity.CoreMenu; +import io.gisbi.menu.dao.auto.entity.CoreMenu; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-06-02 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java b/core/core-backend/src/main/java/io/gisbi/menu/manage/MenuManage.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java rename to core/core-backend/src/main/java/io/gisbi/menu/manage/MenuManage.java index 145030f..c87b218 100644 --- a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java +++ b/core/core-backend/src/main/java/io/gisbi/menu/manage/MenuManage.java @@ -1,13 +1,13 @@ -package io.dataease.menu.manage; +package io.gisbi.menu.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.api.menu.vo.MenuMeta; -import io.dataease.api.menu.vo.MenuVO; +import io.gisbi.api.menu.vo.MenuMeta; +import io.gisbi.api.menu.vo.MenuVO; import io.dataease.license.config.XpackInteract; -import io.dataease.menu.bo.MenuTreeNode; -import io.dataease.menu.dao.auto.entity.CoreMenu; -import io.dataease.menu.dao.auto.mapper.CoreMenuMapper; -import io.dataease.utils.BeanUtils; +import io.gisbi.menu.bo.MenuTreeNode; +import io.gisbi.menu.dao.auto.entity.CoreMenu; +import io.gisbi.menu.dao.auto.mapper.CoreMenuMapper; +import io.gisbi.utils.BeanUtils; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/menu/server/MenuServer.java b/core/core-backend/src/main/java/io/gisbi/menu/server/MenuServer.java similarity index 69% rename from core/core-backend/src/main/java/io/dataease/menu/server/MenuServer.java rename to core/core-backend/src/main/java/io/gisbi/menu/server/MenuServer.java index 4f86eb7..068e6d2 100644 --- a/core/core-backend/src/main/java/io/dataease/menu/server/MenuServer.java +++ b/core/core-backend/src/main/java/io/gisbi/menu/server/MenuServer.java @@ -1,10 +1,10 @@ -package io.dataease.menu.server; +package io.gisbi.menu.server; -import io.dataease.api.menu.MenuApi; -import io.dataease.api.menu.vo.MenuVO; -import io.dataease.i18n.I18n; -import io.dataease.menu.dao.auto.entity.CoreMenu; -import io.dataease.menu.manage.MenuManage; +import io.gisbi.api.menu.MenuApi; +import io.gisbi.api.menu.vo.MenuVO; +import io.gisbi.i18n.I18n; +import io.gisbi.menu.dao.auto.entity.CoreMenu; +import io.gisbi.menu.manage.MenuManage; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/core/core-backend/src/main/java/io/dataease/msgCenter/MsgCenterServer.java b/core/core-backend/src/main/java/io/gisbi/msgCenter/MsgCenterServer.java similarity index 83% rename from core/core-backend/src/main/java/io/dataease/msgCenter/MsgCenterServer.java rename to core/core-backend/src/main/java/io/gisbi/msgCenter/MsgCenterServer.java index f05b1b4..f3627ea 100644 --- a/core/core-backend/src/main/java/io/dataease/msgCenter/MsgCenterServer.java +++ b/core/core-backend/src/main/java/io/gisbi/msgCenter/MsgCenterServer.java @@ -1,6 +1,6 @@ -package io.dataease.msgCenter; +package io.gisbi.msgCenter; -import io.dataease.api.msgCenter.MsgCenterApi; +import io.gisbi.api.msgCenter.MsgCenterApi; import io.dataease.license.config.XpackInteract; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/core/core-backend/src/main/java/io/dataease/operation/dao/auto/entity/CoreOptRecent.java b/core/core-backend/src/main/java/io/gisbi/operation/dao/auto/entity/CoreOptRecent.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/operation/dao/auto/entity/CoreOptRecent.java rename to core/core-backend/src/main/java/io/gisbi/operation/dao/auto/entity/CoreOptRecent.java index 67bdb1e..5552e95 100644 --- a/core/core-backend/src/main/java/io/dataease/operation/dao/auto/entity/CoreOptRecent.java +++ b/core/core-backend/src/main/java/io/gisbi/operation/dao/auto/entity/CoreOptRecent.java @@ -1,4 +1,4 @@ -package io.dataease.operation.dao.auto.entity; +package io.gisbi.operation.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-11-26 */ @TableName("core_opt_recent") diff --git a/core/core-backend/src/main/java/io/dataease/operation/dao/auto/mapper/CoreOptRecentMapper.java b/core/core-backend/src/main/java/io/gisbi/operation/dao/auto/mapper/CoreOptRecentMapper.java similarity index 66% rename from core/core-backend/src/main/java/io/dataease/operation/dao/auto/mapper/CoreOptRecentMapper.java rename to core/core-backend/src/main/java/io/gisbi/operation/dao/auto/mapper/CoreOptRecentMapper.java index fbd6668..04f4d20 100644 --- a/core/core-backend/src/main/java/io/dataease/operation/dao/auto/mapper/CoreOptRecentMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/operation/dao/auto/mapper/CoreOptRecentMapper.java @@ -1,6 +1,6 @@ -package io.dataease.operation.dao.auto.mapper; +package io.gisbi.operation.dao.auto.mapper; -import io.dataease.operation.dao.auto.entity.CoreOptRecent; +import io.gisbi.operation.dao.auto.entity.CoreOptRecent; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-11-26 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/operation/manage/CoreOptRecentManage.java b/core/core-backend/src/main/java/io/gisbi/operation/manage/CoreOptRecentManage.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/operation/manage/CoreOptRecentManage.java rename to core/core-backend/src/main/java/io/gisbi/operation/manage/CoreOptRecentManage.java index f9e8283..fb29b26 100644 --- a/core/core-backend/src/main/java/io/dataease/operation/manage/CoreOptRecentManage.java +++ b/core/core-backend/src/main/java/io/gisbi/operation/manage/CoreOptRecentManage.java @@ -1,11 +1,11 @@ -package io.dataease.operation.manage; +package io.gisbi.operation.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.commons.constants.OptConstants; -import io.dataease.operation.dao.auto.entity.CoreOptRecent; -import io.dataease.operation.dao.auto.mapper.CoreOptRecentMapper; -import io.dataease.utils.AuthUtils; -import io.dataease.utils.IDUtils; +import io.gisbi.commons.constants.OptConstants; +import io.gisbi.operation.dao.auto.entity.CoreOptRecent; +import io.gisbi.operation.dao.auto.mapper.CoreOptRecentMapper; +import io.gisbi.utils.AuthUtils; +import io.gisbi.utils.IDUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/core-backend/src/main/java/io/dataease/resource/ResourceApi.java b/core/core-backend/src/main/java/io/gisbi/resource/ResourceApi.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/resource/ResourceApi.java rename to core/core-backend/src/main/java/io/gisbi/resource/ResourceApi.java index bf89bbe..1ac19aa 100644 --- a/core/core-backend/src/main/java/io/dataease/resource/ResourceApi.java +++ b/core/core-backend/src/main/java/io/gisbi/resource/ResourceApi.java @@ -1,4 +1,4 @@ -package io.dataease.resource; +package io.gisbi.resource; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.PathVariable; @@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * @Author Junjun + * @Author bi-coder */ @RestController @RequestMapping("/resource") diff --git a/core/core-backend/src/main/java/io/gisbi/resource/ResourceService.java b/core/core-backend/src/main/java/io/gisbi/resource/ResourceService.java new file mode 100644 index 0000000..c35102e --- /dev/null +++ b/core/core-backend/src/main/java/io/gisbi/resource/ResourceService.java @@ -0,0 +1,20 @@ +package io.gisbi.resource; + +import io.gisbi.api.permissions.auth.dto.BusiPerCheckDTO; +import io.gisbi.constant.AuthEnum; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Component; + +/** + * @Author bi-coder + */ +@Component +public class ResourceService { + + public boolean checkPermission(Long id) { + BusiPerCheckDTO dto = new BusiPerCheckDTO(); + dto.setId(id); + dto.setAuthEnum(AuthEnum.READ); + return true; + } +} diff --git a/core/core-backend/src/main/java/io/dataease/share/dao/auto/entity/CoreShareTicket.java b/core/core-backend/src/main/java/io/gisbi/share/dao/auto/entity/CoreShareTicket.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/share/dao/auto/entity/CoreShareTicket.java rename to core/core-backend/src/main/java/io/gisbi/share/dao/auto/entity/CoreShareTicket.java index 80b048b..3ccdb07 100644 --- a/core/core-backend/src/main/java/io/dataease/share/dao/auto/entity/CoreShareTicket.java +++ b/core/core-backend/src/main/java/io/gisbi/share/dao/auto/entity/CoreShareTicket.java @@ -1,4 +1,4 @@ -package io.dataease.share.dao.auto.entity; +package io.gisbi.share.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-06-21 */ @TableName("core_share_ticket") diff --git a/core/core-backend/src/main/java/io/dataease/share/dao/auto/entity/XpackShare.java b/core/core-backend/src/main/java/io/gisbi/share/dao/auto/entity/XpackShare.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/share/dao/auto/entity/XpackShare.java rename to core/core-backend/src/main/java/io/gisbi/share/dao/auto/entity/XpackShare.java index d4fb772..fd7ad95 100644 --- a/core/core-backend/src/main/java/io/dataease/share/dao/auto/entity/XpackShare.java +++ b/core/core-backend/src/main/java/io/gisbi/share/dao/auto/entity/XpackShare.java @@ -1,4 +1,4 @@ -package io.dataease.share.dao.auto.entity; +package io.gisbi.share.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * 公共链接 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-06-21 */ @TableName("xpack_share") diff --git a/core/core-backend/src/main/java/io/dataease/share/dao/auto/mapper/CoreShareTicketMapper.java b/core/core-backend/src/main/java/io/gisbi/share/dao/auto/mapper/CoreShareTicketMapper.java similarity index 67% rename from core/core-backend/src/main/java/io/dataease/share/dao/auto/mapper/CoreShareTicketMapper.java rename to core/core-backend/src/main/java/io/gisbi/share/dao/auto/mapper/CoreShareTicketMapper.java index cb912a7..6a83179 100644 --- a/core/core-backend/src/main/java/io/dataease/share/dao/auto/mapper/CoreShareTicketMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/share/dao/auto/mapper/CoreShareTicketMapper.java @@ -1,6 +1,6 @@ -package io.dataease.share.dao.auto.mapper; +package io.gisbi.share.dao.auto.mapper; -import io.dataease.share.dao.auto.entity.CoreShareTicket; +import io.gisbi.share.dao.auto.entity.CoreShareTicket; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-06-21 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/share/dao/auto/mapper/XpackShareMapper.java b/core/core-backend/src/main/java/io/gisbi/share/dao/auto/mapper/XpackShareMapper.java similarity index 68% rename from core/core-backend/src/main/java/io/dataease/share/dao/auto/mapper/XpackShareMapper.java rename to core/core-backend/src/main/java/io/gisbi/share/dao/auto/mapper/XpackShareMapper.java index ffea74d..4c73cfc 100644 --- a/core/core-backend/src/main/java/io/dataease/share/dao/auto/mapper/XpackShareMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/share/dao/auto/mapper/XpackShareMapper.java @@ -1,6 +1,6 @@ -package io.dataease.share.dao.auto.mapper; +package io.gisbi.share.dao.auto.mapper; -import io.dataease.share.dao.auto.entity.XpackShare; +import io.gisbi.share.dao.auto.entity.XpackShare; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 公共链接 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-06-21 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/share/dao/ext/mapper/XpackShareExtMapper.java b/core/core-backend/src/main/java/io/gisbi/share/dao/ext/mapper/XpackShareExtMapper.java similarity index 87% rename from core/core-backend/src/main/java/io/dataease/share/dao/ext/mapper/XpackShareExtMapper.java rename to core/core-backend/src/main/java/io/gisbi/share/dao/ext/mapper/XpackShareExtMapper.java index 363ae39..d7c9680 100644 --- a/core/core-backend/src/main/java/io/dataease/share/dao/ext/mapper/XpackShareExtMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/share/dao/ext/mapper/XpackShareExtMapper.java @@ -1,10 +1,10 @@ -package io.dataease.share.dao.ext.mapper; +package io.gisbi.share.dao.ext.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.dataease.api.xpack.share.vo.TicketVO; -import io.dataease.share.dao.auto.entity.CoreShareTicket; -import io.dataease.share.dao.ext.po.XpackSharePO; +import io.gisbi.api.xpack.share.vo.TicketVO; +import io.gisbi.share.dao.auto.entity.CoreShareTicket; +import io.gisbi.share.dao.ext.po.XpackSharePO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/core/core-backend/src/main/java/io/dataease/share/dao/ext/po/XpackSharePO.java b/core/core-backend/src/main/java/io/gisbi/share/dao/ext/po/XpackSharePO.java similarity index 93% rename from core/core-backend/src/main/java/io/dataease/share/dao/ext/po/XpackSharePO.java rename to core/core-backend/src/main/java/io/gisbi/share/dao/ext/po/XpackSharePO.java index 26a3a3a..dcaefe6 100644 --- a/core/core-backend/src/main/java/io/dataease/share/dao/ext/po/XpackSharePO.java +++ b/core/core-backend/src/main/java/io/gisbi/share/dao/ext/po/XpackSharePO.java @@ -1,4 +1,4 @@ -package io.dataease.share.dao.ext.po; +package io.gisbi.share.dao.ext.po; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/core-backend/src/main/java/io/dataease/share/interceptor/DeLinkAop.java b/core/core-backend/src/main/java/io/gisbi/share/interceptor/DeLinkAop.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/share/interceptor/DeLinkAop.java rename to core/core-backend/src/main/java/io/gisbi/share/interceptor/DeLinkAop.java index 2a99251..16ede96 100644 --- a/core/core-backend/src/main/java/io/dataease/share/interceptor/DeLinkAop.java +++ b/core/core-backend/src/main/java/io/gisbi/share/interceptor/DeLinkAop.java @@ -1,17 +1,17 @@ -package io.dataease.share.interceptor; +package io.gisbi.share.interceptor; import com.auth0.jwt.JWT; import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.interfaces.DecodedJWT; import com.auth0.jwt.interfaces.Verification; -import io.dataease.auth.DeLinkPermit; -import io.dataease.constant.AuthConstant; -import io.dataease.exception.DEException; -import io.dataease.share.manage.XpackShareManage; -import io.dataease.share.util.LinkTokenUtil; -import io.dataease.utils.LogUtil; -import io.dataease.utils.ServletUtils; +import io.gisbi.auth.DeLinkPermit; +import io.gisbi.constant.AuthConstant; +import io.gisbi.exception.DEException; +import io.gisbi.share.manage.XpackShareManage; +import io.gisbi.share.util.LinkTokenUtil; +import io.gisbi.utils.LogUtil; +import io.gisbi.utils.ServletUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java b/core/core-backend/src/main/java/io/gisbi/share/interceptor/LinkInterceptor.java similarity index 89% rename from core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java rename to core/core-backend/src/main/java/io/gisbi/share/interceptor/LinkInterceptor.java index 3c9cab9..cc4be3a 100644 --- a/core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java +++ b/core/core-backend/src/main/java/io/gisbi/share/interceptor/LinkInterceptor.java @@ -1,10 +1,10 @@ -package io.dataease.share.interceptor; +package io.gisbi.share.interceptor; -import io.dataease.auth.DeLinkPermit; -import io.dataease.constant.AuthConstant; -import io.dataease.exception.DEException; -import io.dataease.utils.ServletUtils; -import io.dataease.utils.WhitelistUtils; +import io.gisbi.auth.DeLinkPermit; +import io.gisbi.constant.AuthConstant; +import io.gisbi.exception.DEException; +import io.gisbi.utils.ServletUtils; +import io.gisbi.utils.WhitelistUtils; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/share/manage/ShareTicketManage.java b/core/core-backend/src/main/java/io/gisbi/share/manage/ShareTicketManage.java similarity index 88% rename from core/core-backend/src/main/java/io/dataease/share/manage/ShareTicketManage.java rename to core/core-backend/src/main/java/io/gisbi/share/manage/ShareTicketManage.java index 6786800..a9aa005 100644 --- a/core/core-backend/src/main/java/io/dataease/share/manage/ShareTicketManage.java +++ b/core/core-backend/src/main/java/io/gisbi/share/manage/ShareTicketManage.java @@ -1,24 +1,24 @@ -package io.dataease.share.manage; +package io.gisbi.share.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.dataease.api.xpack.share.request.TicketCreator; -import io.dataease.api.xpack.share.request.TicketDelRequest; -import io.dataease.api.xpack.share.request.TicketSwitchRequest; -import io.dataease.api.xpack.share.vo.TicketVO; -import io.dataease.api.xpack.share.vo.TicketValidVO; -import io.dataease.commons.utils.CodingUtil; -import io.dataease.exception.DEException; -import io.dataease.share.dao.auto.entity.CoreShareTicket; -import io.dataease.share.dao.auto.entity.XpackShare; -import io.dataease.share.dao.auto.mapper.CoreShareTicketMapper; -import io.dataease.share.dao.auto.mapper.XpackShareMapper; -import io.dataease.share.dao.ext.mapper.XpackShareExtMapper; -import io.dataease.utils.AuthUtils; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.CommonBeanFactory; -import io.dataease.utils.IDUtils; +import io.gisbi.api.xpack.share.request.TicketCreator; +import io.gisbi.api.xpack.share.request.TicketDelRequest; +import io.gisbi.api.xpack.share.request.TicketSwitchRequest; +import io.gisbi.api.xpack.share.vo.TicketVO; +import io.gisbi.api.xpack.share.vo.TicketValidVO; +import io.gisbi.commons.utils.CodingUtil; +import io.gisbi.exception.DEException; +import io.gisbi.share.dao.auto.entity.CoreShareTicket; +import io.gisbi.share.dao.auto.entity.XpackShare; +import io.gisbi.share.dao.auto.mapper.CoreShareTicketMapper; +import io.gisbi.share.dao.auto.mapper.XpackShareMapper; +import io.gisbi.share.dao.ext.mapper.XpackShareExtMapper; +import io.gisbi.utils.AuthUtils; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.CommonBeanFactory; +import io.gisbi.utils.IDUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java b/core/core-backend/src/main/java/io/gisbi/share/manage/XpackShareManage.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java rename to core/core-backend/src/main/java/io/gisbi/share/manage/XpackShareManage.java index bf4cfc8..71d4405 100644 --- a/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java +++ b/core/core-backend/src/main/java/io/gisbi/share/manage/XpackShareManage.java @@ -1,30 +1,30 @@ -package io.dataease.share.manage; +package io.gisbi.share.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.dataease.api.system.vo.ShareBaseVO; -import io.dataease.api.visualization.request.VisualizationWorkbranchQueryRequest; -import io.dataease.api.xpack.share.request.XpackShareProxyRequest; -import io.dataease.api.xpack.share.request.XpackSharePwdValidator; -import io.dataease.api.xpack.share.request.XpackShareUuidEditor; -import io.dataease.api.xpack.share.vo.TicketValidVO; -import io.dataease.api.xpack.share.vo.XpackShareGridVO; -import io.dataease.api.xpack.share.vo.XpackShareProxyVO; -import io.dataease.auth.bo.TokenUserBO; -import io.dataease.constant.AuthConstant; -import io.dataease.constant.BusiResourceEnum; -import io.dataease.exception.DEException; -import io.dataease.i18n.Translator; +import io.gisbi.api.system.vo.ShareBaseVO; +import io.gisbi.api.visualization.request.VisualizationWorkbranchQueryRequest; +import io.gisbi.api.xpack.share.request.XpackShareProxyRequest; +import io.gisbi.api.xpack.share.request.XpackSharePwdValidator; +import io.gisbi.api.xpack.share.request.XpackShareUuidEditor; +import io.gisbi.api.xpack.share.vo.TicketValidVO; +import io.gisbi.api.xpack.share.vo.XpackShareGridVO; +import io.gisbi.api.xpack.share.vo.XpackShareProxyVO; +import io.gisbi.auth.bo.TokenUserBO; +import io.gisbi.constant.AuthConstant; +import io.gisbi.constant.BusiResourceEnum; +import io.gisbi.exception.DEException; +import io.gisbi.i18n.Translator; import io.dataease.license.config.XpackInteract; import io.dataease.license.utils.LicenseUtil; -import io.dataease.share.dao.auto.entity.XpackShare; -import io.dataease.share.dao.auto.mapper.XpackShareMapper; -import io.dataease.share.dao.ext.mapper.XpackShareExtMapper; -import io.dataease.share.dao.ext.po.XpackSharePO; -import io.dataease.share.util.LinkTokenUtil; -import io.dataease.system.manage.SysParameterManage; -import io.dataease.utils.*; +import io.gisbi.share.dao.auto.entity.XpackShare; +import io.gisbi.share.dao.auto.mapper.XpackShareMapper; +import io.gisbi.share.dao.ext.mapper.XpackShareExtMapper; +import io.gisbi.share.dao.ext.po.XpackSharePO; +import io.gisbi.share.util.LinkTokenUtil; +import io.gisbi.system.manage.SysParameterManage; +import io.gisbi.utils.*; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.collections4.CollectionUtils; diff --git a/core/core-backend/src/main/java/io/dataease/share/server/ShareTicketServer.java b/core/core-backend/src/main/java/io/gisbi/share/server/ShareTicketServer.java similarity index 75% rename from core/core-backend/src/main/java/io/dataease/share/server/ShareTicketServer.java rename to core/core-backend/src/main/java/io/gisbi/share/server/ShareTicketServer.java index 1cf0ecb..22c7aaa 100644 --- a/core/core-backend/src/main/java/io/dataease/share/server/ShareTicketServer.java +++ b/core/core-backend/src/main/java/io/gisbi/share/server/ShareTicketServer.java @@ -1,14 +1,14 @@ -package io.dataease.share.server; +package io.gisbi.share.server; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.dataease.api.xpack.share.ShareTicketApi; -import io.dataease.api.xpack.share.request.TicketCreator; -import io.dataease.api.xpack.share.request.TicketDelRequest; -import io.dataease.api.xpack.share.request.TicketSwitchRequest; -import io.dataease.api.xpack.share.vo.TicketVO; -import io.dataease.commons.utils.CodingUtil; -import io.dataease.share.manage.ShareTicketManage; +import io.gisbi.api.xpack.share.ShareTicketApi; +import io.gisbi.api.xpack.share.request.TicketCreator; +import io.gisbi.api.xpack.share.request.TicketDelRequest; +import io.gisbi.api.xpack.share.request.TicketSwitchRequest; +import io.gisbi.api.xpack.share.vo.TicketVO; +import io.gisbi.commons.utils.CodingUtil; +import io.gisbi.share.manage.ShareTicketManage; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/core/core-backend/src/main/java/io/dataease/share/server/XpackShareServer.java b/core/core-backend/src/main/java/io/gisbi/share/server/XpackShareServer.java similarity index 78% rename from core/core-backend/src/main/java/io/dataease/share/server/XpackShareServer.java rename to core/core-backend/src/main/java/io/gisbi/share/server/XpackShareServer.java index 1226714..7e12aa2 100644 --- a/core/core-backend/src/main/java/io/dataease/share/server/XpackShareServer.java +++ b/core/core-backend/src/main/java/io/gisbi/share/server/XpackShareServer.java @@ -1,17 +1,16 @@ -package io.dataease.share.server; +package io.gisbi.share.server; -import io.dataease.api.visualization.request.VisualizationWorkbranchQueryRequest; -import io.dataease.api.xpack.share.XpackShareApi; -import io.dataease.api.xpack.share.request.*; -import io.dataease.api.xpack.share.vo.XpackShareGridVO; -import io.dataease.api.xpack.share.vo.XpackShareProxyVO; -import io.dataease.api.xpack.share.vo.XpackShareVO; -import io.dataease.utils.BeanUtils; -import io.dataease.share.dao.auto.entity.XpackShare; -import io.dataease.share.manage.XpackShareManage; +import io.gisbi.api.visualization.request.VisualizationWorkbranchQueryRequest; +import io.gisbi.api.xpack.share.XpackShareApi; +import io.gisbi.api.xpack.share.request.*; +import io.gisbi.api.xpack.share.vo.XpackShareGridVO; +import io.gisbi.api.xpack.share.vo.XpackShareProxyVO; +import io.gisbi.api.xpack.share.vo.XpackShareVO; +import io.gisbi.utils.BeanUtils; +import io.gisbi.share.dao.auto.entity.XpackShare; +import io.gisbi.share.manage.XpackShareManage; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/core/core-backend/src/main/java/io/dataease/share/util/LinkTokenUtil.java b/core/core-backend/src/main/java/io/gisbi/share/util/LinkTokenUtil.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/share/util/LinkTokenUtil.java rename to core/core-backend/src/main/java/io/gisbi/share/util/LinkTokenUtil.java index 37adf92..d17f839 100644 --- a/core/core-backend/src/main/java/io/dataease/share/util/LinkTokenUtil.java +++ b/core/core-backend/src/main/java/io/gisbi/share/util/LinkTokenUtil.java @@ -1,4 +1,4 @@ -package io.dataease.share.util; +package io.gisbi.share.util; import com.auth0.jwt.JWT; import com.auth0.jwt.JWTCreator; diff --git a/core/core-backend/src/main/java/io/dataease/startup/dao/auto/entity/CoreSysStartupJob.java b/core/core-backend/src/main/java/io/gisbi/startup/dao/auto/entity/CoreSysStartupJob.java similarity index 94% rename from core/core-backend/src/main/java/io/dataease/startup/dao/auto/entity/CoreSysStartupJob.java rename to core/core-backend/src/main/java/io/gisbi/startup/dao/auto/entity/CoreSysStartupJob.java index 29065a7..e2d6437 100644 --- a/core/core-backend/src/main/java/io/dataease/startup/dao/auto/entity/CoreSysStartupJob.java +++ b/core/core-backend/src/main/java/io/gisbi/startup/dao/auto/entity/CoreSysStartupJob.java @@ -1,4 +1,4 @@ -package io.dataease.startup.dao.auto.entity; +package io.gisbi.startup.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * 项目启动任务 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-05-15 */ @TableName("core_sys_startup_job") diff --git a/core/core-backend/src/main/java/io/dataease/startup/dao/auto/mapper/CoreSysStartupJobMapper.java b/core/core-backend/src/main/java/io/gisbi/startup/dao/auto/mapper/CoreSysStartupJobMapper.java similarity index 68% rename from core/core-backend/src/main/java/io/dataease/startup/dao/auto/mapper/CoreSysStartupJobMapper.java rename to core/core-backend/src/main/java/io/gisbi/startup/dao/auto/mapper/CoreSysStartupJobMapper.java index b2679ec..f850174 100644 --- a/core/core-backend/src/main/java/io/dataease/startup/dao/auto/mapper/CoreSysStartupJobMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/startup/dao/auto/mapper/CoreSysStartupJobMapper.java @@ -1,6 +1,6 @@ -package io.dataease.startup.dao.auto.mapper; +package io.gisbi.startup.dao.auto.mapper; -import io.dataease.startup.dao.auto.entity.CoreSysStartupJob; +import io.gisbi.startup.dao.auto.entity.CoreSysStartupJob; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 项目启动任务 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-05-15 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/substitute/permissions/auth/SubstituleAuthServer.java b/core/core-backend/src/main/java/io/gisbi/substitute/permissions/auth/SubstituleAuthServer.java similarity index 93% rename from core/core-backend/src/main/java/io/dataease/substitute/permissions/auth/SubstituleAuthServer.java rename to core/core-backend/src/main/java/io/gisbi/substitute/permissions/auth/SubstituleAuthServer.java index 0966e2b..6ce4d37 100644 --- a/core/core-backend/src/main/java/io/dataease/substitute/permissions/auth/SubstituleAuthServer.java +++ b/core/core-backend/src/main/java/io/gisbi/substitute/permissions/auth/SubstituleAuthServer.java @@ -1,4 +1,4 @@ -package io.dataease.substitute.permissions.auth; +package io.gisbi.substitute.permissions.auth; /*import io.dataease.api.permissions.auth.api.AuthApi; import io.dataease.api.permissions.dto.AuthDTO; diff --git a/core/core-backend/src/main/java/io/dataease/substitute/permissions/login/SubstituleLoginServer.java b/core/core-backend/src/main/java/io/gisbi/substitute/permissions/login/SubstituleLoginServer.java similarity index 81% rename from core/core-backend/src/main/java/io/dataease/substitute/permissions/login/SubstituleLoginServer.java rename to core/core-backend/src/main/java/io/gisbi/substitute/permissions/login/SubstituleLoginServer.java index cc6de17..25c5b6c 100644 --- a/core/core-backend/src/main/java/io/dataease/substitute/permissions/login/SubstituleLoginServer.java +++ b/core/core-backend/src/main/java/io/gisbi/substitute/permissions/login/SubstituleLoginServer.java @@ -1,17 +1,17 @@ -package io.dataease.substitute.permissions.login; +package io.gisbi.substitute.permissions.login; import com.auth0.jwt.JWT; import com.auth0.jwt.JWTCreator; import com.auth0.jwt.algorithms.Algorithm; -import io.dataease.api.permissions.login.dto.PwdLoginDTO; -import io.dataease.auth.bo.TokenUserBO; -import io.dataease.auth.config.SubstituleLoginConfig; -import io.dataease.auth.vo.TokenVO; -import io.dataease.exception.DEException; -import io.dataease.i18n.Translator; -import io.dataease.utils.LogUtil; -import io.dataease.utils.Md5Utils; -import io.dataease.utils.RsaUtils; +import io.gisbi.api.permissions.login.dto.PwdLoginDTO; +import io.gisbi.auth.bo.TokenUserBO; +import io.gisbi.auth.config.SubstituleLoginConfig; +import io.gisbi.auth.vo.TokenVO; +import io.gisbi.exception.DEException; +import io.gisbi.i18n.Translator; +import io.gisbi.utils.LogUtil; +import io.gisbi.utils.Md5Utils; +import io.gisbi.utils.RsaUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/substitute/permissions/org/SubstituleOrgServer.java b/core/core-backend/src/main/java/io/gisbi/substitute/permissions/org/SubstituleOrgServer.java similarity index 85% rename from core/core-backend/src/main/java/io/dataease/substitute/permissions/org/SubstituleOrgServer.java rename to core/core-backend/src/main/java/io/gisbi/substitute/permissions/org/SubstituleOrgServer.java index 44f6fe2..ae8119e 100644 --- a/core/core-backend/src/main/java/io/dataease/substitute/permissions/org/SubstituleOrgServer.java +++ b/core/core-backend/src/main/java/io/gisbi/substitute/permissions/org/SubstituleOrgServer.java @@ -1,7 +1,7 @@ -package io.dataease.substitute.permissions.org; +package io.gisbi.substitute.permissions.org; -import io.dataease.api.permissions.org.vo.MountedVO; -import io.dataease.model.KeywordRequest; +import io.gisbi.api.permissions.org.vo.MountedVO; +import io.gisbi.model.KeywordRequest; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.PostMapping; diff --git a/core/core-backend/src/main/java/io/dataease/substitute/permissions/user/SubstituteUserServer.java b/core/core-backend/src/main/java/io/gisbi/substitute/permissions/user/SubstituteUserServer.java similarity index 82% rename from core/core-backend/src/main/java/io/dataease/substitute/permissions/user/SubstituteUserServer.java rename to core/core-backend/src/main/java/io/gisbi/substitute/permissions/user/SubstituteUserServer.java index 345255c..e0a8766 100644 --- a/core/core-backend/src/main/java/io/dataease/substitute/permissions/user/SubstituteUserServer.java +++ b/core/core-backend/src/main/java/io/gisbi/substitute/permissions/user/SubstituteUserServer.java @@ -1,13 +1,13 @@ -package io.dataease.substitute.permissions.user; +package io.gisbi.substitute.permissions.user; -import io.dataease.api.permissions.user.dto.LangSwitchRequest; -import io.dataease.api.permissions.user.vo.CurIpVO; -import io.dataease.api.permissions.user.vo.UserFormVO; -import io.dataease.exception.DEException; -import io.dataease.i18n.Lang; -import io.dataease.utils.CacheUtils; -import io.dataease.utils.IPUtils; +import io.gisbi.api.permissions.user.dto.LangSwitchRequest; +import io.gisbi.api.permissions.user.vo.CurIpVO; +import io.gisbi.api.permissions.user.vo.UserFormVO; +import io.gisbi.exception.DEException; +import io.gisbi.i18n.Lang; +import io.gisbi.utils.CacheUtils; +import io.gisbi.utils.IPUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.Map; -import static io.dataease.constant.CacheConstant.UserCacheConstant.USER_COMMUNITY_LANGUAGE; +import static io.gisbi.constant.CacheConstant.UserCacheConstant.USER_COMMUNITY_LANGUAGE; @Component @ConditionalOnMissingBean(name = "userServer") diff --git a/core/core-backend/src/main/java/io/dataease/system/bo/SysParameterBO.java b/core/core-backend/src/main/java/io/gisbi/system/bo/SysParameterBO.java similarity index 87% rename from core/core-backend/src/main/java/io/dataease/system/bo/SysParameterBO.java rename to core/core-backend/src/main/java/io/gisbi/system/bo/SysParameterBO.java index 29a5cf9..4a6b03a 100644 --- a/core/core-backend/src/main/java/io/dataease/system/bo/SysParameterBO.java +++ b/core/core-backend/src/main/java/io/gisbi/system/bo/SysParameterBO.java @@ -1,4 +1,4 @@ -package io.dataease.system.bo; +package io.gisbi.system.bo; import lombok.Data; diff --git a/core/core-backend/src/main/java/io/dataease/system/dao/auto/entity/CoreSysSetting.java b/core/core-backend/src/main/java/io/gisbi/system/dao/auto/entity/CoreSysSetting.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/system/dao/auto/entity/CoreSysSetting.java rename to core/core-backend/src/main/java/io/gisbi/system/dao/auto/entity/CoreSysSetting.java index b0f3db7..a7a9524 100644 --- a/core/core-backend/src/main/java/io/dataease/system/dao/auto/entity/CoreSysSetting.java +++ b/core/core-backend/src/main/java/io/gisbi/system/dao/auto/entity/CoreSysSetting.java @@ -1,4 +1,4 @@ -package io.dataease.system.dao.auto.entity; +package io.gisbi.system.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-10-27 */ @TableName("core_sys_setting") diff --git a/core/core-backend/src/main/java/io/dataease/system/dao/auto/entity/CoreTypeface.java b/core/core-backend/src/main/java/io/gisbi/system/dao/auto/entity/CoreTypeface.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/system/dao/auto/entity/CoreTypeface.java rename to core/core-backend/src/main/java/io/gisbi/system/dao/auto/entity/CoreTypeface.java index 2023862..d588ecf 100644 --- a/core/core-backend/src/main/java/io/dataease/system/dao/auto/entity/CoreTypeface.java +++ b/core/core-backend/src/main/java/io/gisbi/system/dao/auto/entity/CoreTypeface.java @@ -1,4 +1,4 @@ -package io.dataease.system.dao.auto.entity; +package io.gisbi.system.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-08-08 */ @TableName("core_typeface") diff --git a/core/core-backend/src/main/java/io/dataease/system/dao/auto/mapper/CoreSysSettingMapper.java b/core/core-backend/src/main/java/io/gisbi/system/dao/auto/mapper/CoreSysSettingMapper.java similarity index 67% rename from core/core-backend/src/main/java/io/dataease/system/dao/auto/mapper/CoreSysSettingMapper.java rename to core/core-backend/src/main/java/io/gisbi/system/dao/auto/mapper/CoreSysSettingMapper.java index f2fd770..5010801 100644 --- a/core/core-backend/src/main/java/io/dataease/system/dao/auto/mapper/CoreSysSettingMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/system/dao/auto/mapper/CoreSysSettingMapper.java @@ -1,6 +1,6 @@ -package io.dataease.system.dao.auto.mapper; +package io.gisbi.system.dao.auto.mapper; -import io.dataease.system.dao.auto.entity.CoreSysSetting; +import io.gisbi.system.dao.auto.entity.CoreSysSetting; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-10-27 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/system/dao/auto/mapper/CoreTypefaceMapper.java b/core/core-backend/src/main/java/io/gisbi/system/dao/auto/mapper/CoreTypefaceMapper.java similarity index 67% rename from core/core-backend/src/main/java/io/dataease/system/dao/auto/mapper/CoreTypefaceMapper.java rename to core/core-backend/src/main/java/io/gisbi/system/dao/auto/mapper/CoreTypefaceMapper.java index fe81895..caeb5b6 100644 --- a/core/core-backend/src/main/java/io/dataease/system/dao/auto/mapper/CoreTypefaceMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/system/dao/auto/mapper/CoreTypefaceMapper.java @@ -1,6 +1,6 @@ -package io.dataease.system.dao.auto.mapper; +package io.gisbi.system.dao.auto.mapper; -import io.dataease.system.dao.auto.entity.CoreTypeface; +import io.gisbi.system.dao.auto.entity.CoreTypeface; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-08-08 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/system/dao/ext/mapper/ExtCoreSysSettingMapper.java b/core/core-backend/src/main/java/io/gisbi/system/dao/ext/mapper/ExtCoreSysSettingMapper.java similarity index 60% rename from core/core-backend/src/main/java/io/dataease/system/dao/ext/mapper/ExtCoreSysSettingMapper.java rename to core/core-backend/src/main/java/io/gisbi/system/dao/ext/mapper/ExtCoreSysSettingMapper.java index cff68a4..095c091 100644 --- a/core/core-backend/src/main/java/io/dataease/system/dao/ext/mapper/ExtCoreSysSettingMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/system/dao/ext/mapper/ExtCoreSysSettingMapper.java @@ -1,8 +1,8 @@ -package io.dataease.system.dao.ext.mapper; +package io.gisbi.system.dao.ext.mapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import io.dataease.system.dao.auto.entity.CoreSysSetting; -import io.dataease.system.dao.auto.mapper.CoreSysSettingMapper; +import io.gisbi.system.dao.auto.entity.CoreSysSetting; +import io.gisbi.system.dao.auto.mapper.CoreSysSettingMapper; import org.springframework.stereotype.Component; @Component("extCoreSysSettingMapper") diff --git a/core/core-backend/src/main/java/io/dataease/system/manage/CoreUserManage.java b/core/core-backend/src/main/java/io/gisbi/system/manage/CoreUserManage.java similarity index 88% rename from core/core-backend/src/main/java/io/dataease/system/manage/CoreUserManage.java rename to core/core-backend/src/main/java/io/gisbi/system/manage/CoreUserManage.java index 1c4e727..bfdb7a4 100644 --- a/core/core-backend/src/main/java/io/dataease/system/manage/CoreUserManage.java +++ b/core/core-backend/src/main/java/io/gisbi/system/manage/CoreUserManage.java @@ -1,4 +1,4 @@ -package io.dataease.system.manage; +package io.gisbi.system.manage; import io.dataease.license.config.XpackInteract; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/system/manage/SysParameterManage.java b/core/core-backend/src/main/java/io/gisbi/system/manage/SysParameterManage.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/system/manage/SysParameterManage.java rename to core/core-backend/src/main/java/io/gisbi/system/manage/SysParameterManage.java index 8c69904..d08018c 100644 --- a/core/core-backend/src/main/java/io/dataease/system/manage/SysParameterManage.java +++ b/core/core-backend/src/main/java/io/gisbi/system/manage/SysParameterManage.java @@ -1,18 +1,18 @@ -package io.dataease.system.manage; +package io.gisbi.system.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.api.system.request.OnlineMapEditor; -import io.dataease.api.system.vo.SettingItemVO; -import io.dataease.api.system.vo.ShareBaseVO; -import io.dataease.datasource.server.DatasourceServer; +import io.gisbi.api.system.request.OnlineMapEditor; +import io.gisbi.api.system.vo.SettingItemVO; +import io.gisbi.api.system.vo.ShareBaseVO; +import io.gisbi.datasource.server.DatasourceServer; import io.dataease.license.config.XpackInteract; -import io.dataease.system.dao.auto.entity.CoreSysSetting; -import io.dataease.system.dao.auto.mapper.CoreSysSettingMapper; -import io.dataease.system.dao.ext.mapper.ExtCoreSysSettingMapper; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.CommonBeanFactory; -import io.dataease.utils.IDUtils; -import io.dataease.utils.SystemSettingUtils; +import io.gisbi.system.dao.auto.entity.CoreSysSetting; +import io.gisbi.system.dao.auto.mapper.CoreSysSettingMapper; +import io.gisbi.system.dao.ext.mapper.ExtCoreSysSettingMapper; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.CommonBeanFactory; +import io.gisbi.utils.IDUtils; +import io.gisbi.utils.SystemSettingUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/system/server/SysParameterServer.java b/core/core-backend/src/main/java/io/gisbi/system/server/SysParameterServer.java similarity index 89% rename from core/core-backend/src/main/java/io/dataease/system/server/SysParameterServer.java rename to core/core-backend/src/main/java/io/gisbi/system/server/SysParameterServer.java index b382250..f57ad8a 100644 --- a/core/core-backend/src/main/java/io/dataease/system/server/SysParameterServer.java +++ b/core/core-backend/src/main/java/io/gisbi/system/server/SysParameterServer.java @@ -1,13 +1,13 @@ -package io.dataease.system.server; +package io.gisbi.system.server; -import io.dataease.api.system.SysParameterApi; -import io.dataease.api.system.request.OnlineMapEditor; -import io.dataease.api.system.vo.SettingItemVO; -import io.dataease.api.system.vo.ShareBaseVO; -import io.dataease.constant.StaticResourceConstants; -import io.dataease.constant.XpackSettingConstants; -import io.dataease.system.dao.auto.entity.CoreSysSetting; -import io.dataease.system.manage.SysParameterManage; +import io.gisbi.api.system.SysParameterApi; +import io.gisbi.api.system.request.OnlineMapEditor; +import io.gisbi.api.system.vo.SettingItemVO; +import io.gisbi.api.system.vo.ShareBaseVO; +import io.gisbi.constant.StaticResourceConstants; +import io.gisbi.constant.XpackSettingConstants; +import io.gisbi.system.dao.auto.entity.CoreSysSetting; +import io.gisbi.system.manage.SysParameterManage; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/DeTemplateVersion.java b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/entity/DeTemplateVersion.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/DeTemplateVersion.java rename to core/core-backend/src/main/java/io/gisbi/template/dao/auto/entity/DeTemplateVersion.java index 35fe0f8..3c34c9f 100644 --- a/core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/DeTemplateVersion.java +++ b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/entity/DeTemplateVersion.java @@ -1,4 +1,4 @@ -package io.dataease.template.dao.auto.entity; +package io.gisbi.template.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-05-07 */ @TableName("de_template_version") diff --git a/core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplate.java b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/entity/VisualizationTemplate.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplate.java rename to core/core-backend/src/main/java/io/gisbi/template/dao/auto/entity/VisualizationTemplate.java index 31d386d..3d041ce 100644 --- a/core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplate.java +++ b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/entity/VisualizationTemplate.java @@ -1,4 +1,4 @@ -package io.dataease.template.dao.auto.entity; +package io.gisbi.template.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * 模板表 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-07-17 */ @TableName("visualization_template") diff --git a/core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplateCategory.java b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/entity/VisualizationTemplateCategory.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplateCategory.java rename to core/core-backend/src/main/java/io/gisbi/template/dao/auto/entity/VisualizationTemplateCategory.java index e356906..b82cb1f 100644 --- a/core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplateCategory.java +++ b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/entity/VisualizationTemplateCategory.java @@ -1,4 +1,4 @@ -package io.dataease.template.dao.auto.entity; +package io.gisbi.template.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * 模板表 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-12-04 */ @TableName("visualization_template_category") diff --git a/core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplateCategoryMap.java b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/entity/VisualizationTemplateCategoryMap.java similarity index 94% rename from core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplateCategoryMap.java rename to core/core-backend/src/main/java/io/gisbi/template/dao/auto/entity/VisualizationTemplateCategoryMap.java index 2bb17c8..ccc87bd 100644 --- a/core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplateCategoryMap.java +++ b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/entity/VisualizationTemplateCategoryMap.java @@ -1,4 +1,4 @@ -package io.dataease.template.dao.auto.entity; +package io.gisbi.template.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * 模板表 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-12-04 */ @TableName("visualization_template_category_map") diff --git a/core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplateExtendData.java b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/entity/VisualizationTemplateExtendData.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplateExtendData.java rename to core/core-backend/src/main/java/io/gisbi/template/dao/auto/entity/VisualizationTemplateExtendData.java index 6c25244..183c60a 100644 --- a/core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplateExtendData.java +++ b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/entity/VisualizationTemplateExtendData.java @@ -1,4 +1,4 @@ -package io.dataease.template.dao.auto.entity; +package io.gisbi.template.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-11-10 */ @TableName("visualization_template_extend_data") diff --git a/core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/DeTemplateVersionMapper.java b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/mapper/DeTemplateVersionMapper.java similarity index 66% rename from core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/DeTemplateVersionMapper.java rename to core/core-backend/src/main/java/io/gisbi/template/dao/auto/mapper/DeTemplateVersionMapper.java index 709e3c9..90fbf09 100644 --- a/core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/DeTemplateVersionMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/mapper/DeTemplateVersionMapper.java @@ -1,6 +1,6 @@ -package io.dataease.template.dao.auto.mapper; +package io.gisbi.template.dao.auto.mapper; -import io.dataease.template.dao.auto.entity.DeTemplateVersion; +import io.gisbi.template.dao.auto.entity.DeTemplateVersion; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-05-07 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateCategoryMapMapper.java b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/mapper/VisualizationTemplateCategoryMapMapper.java similarity index 67% rename from core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateCategoryMapMapper.java rename to core/core-backend/src/main/java/io/gisbi/template/dao/auto/mapper/VisualizationTemplateCategoryMapMapper.java index bf8c10b..acc341f 100644 --- a/core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateCategoryMapMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/mapper/VisualizationTemplateCategoryMapMapper.java @@ -1,6 +1,6 @@ -package io.dataease.template.dao.auto.mapper; +package io.gisbi.template.dao.auto.mapper; -import io.dataease.template.dao.auto.entity.VisualizationTemplateCategoryMap; +import io.gisbi.template.dao.auto.entity.VisualizationTemplateCategoryMap; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 模板表 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-12-04 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateCategoryMapper.java b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/mapper/VisualizationTemplateCategoryMapper.java similarity index 67% rename from core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateCategoryMapper.java rename to core/core-backend/src/main/java/io/gisbi/template/dao/auto/mapper/VisualizationTemplateCategoryMapper.java index 939345a..803241c 100644 --- a/core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateCategoryMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/mapper/VisualizationTemplateCategoryMapper.java @@ -1,6 +1,6 @@ -package io.dataease.template.dao.auto.mapper; +package io.gisbi.template.dao.auto.mapper; -import io.dataease.template.dao.auto.entity.VisualizationTemplateCategory; +import io.gisbi.template.dao.auto.entity.VisualizationTemplateCategory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 模板表 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-12-04 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateExtendDataMapper.java b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/mapper/VisualizationTemplateExtendDataMapper.java similarity index 66% rename from core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateExtendDataMapper.java rename to core/core-backend/src/main/java/io/gisbi/template/dao/auto/mapper/VisualizationTemplateExtendDataMapper.java index ee5d101..e7c3799 100644 --- a/core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateExtendDataMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/mapper/VisualizationTemplateExtendDataMapper.java @@ -1,6 +1,6 @@ -package io.dataease.template.dao.auto.mapper; +package io.gisbi.template.dao.auto.mapper; -import io.dataease.template.dao.auto.entity.VisualizationTemplateExtendData; +import io.gisbi.template.dao.auto.entity.VisualizationTemplateExtendData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-11-10 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateMapper.java b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/mapper/VisualizationTemplateMapper.java similarity index 67% rename from core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateMapper.java rename to core/core-backend/src/main/java/io/gisbi/template/dao/auto/mapper/VisualizationTemplateMapper.java index c4ef398..a35a7d1 100644 --- a/core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/template/dao/auto/mapper/VisualizationTemplateMapper.java @@ -1,6 +1,6 @@ -package io.dataease.template.dao.auto.mapper; +package io.gisbi.template.dao.auto.mapper; -import io.dataease.template.dao.auto.entity.VisualizationTemplate; +import io.gisbi.template.dao.auto.entity.VisualizationTemplate; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 模板表 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-07-17 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/template/dao/ext/ExtVisualizationTemplateMapper.java b/core/core-backend/src/main/java/io/gisbi/template/dao/ext/ExtVisualizationTemplateMapper.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/template/dao/ext/ExtVisualizationTemplateMapper.java rename to core/core-backend/src/main/java/io/gisbi/template/dao/ext/ExtVisualizationTemplateMapper.java index a52a9d4..e14b048 100644 --- a/core/core-backend/src/main/java/io/dataease/template/dao/ext/ExtVisualizationTemplateMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/template/dao/ext/ExtVisualizationTemplateMapper.java @@ -1,8 +1,8 @@ -package io.dataease.template.dao.ext; +package io.gisbi.template.dao.ext; -import io.dataease.api.template.dto.TemplateManageDTO; -import io.dataease.api.template.request.TemplateManageRequest; -import io.dataease.api.visualization.vo.*; +import io.gisbi.api.template.dto.TemplateManageDTO; +import io.gisbi.api.template.request.TemplateManageRequest; +import io.gisbi.api.visualization.vo.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java b/core/core-backend/src/main/java/io/gisbi/template/manage/TemplateCenterManage.java similarity index 93% rename from core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java rename to core/core-backend/src/main/java/io/gisbi/template/manage/TemplateCenterManage.java index 3baa2ab..1af567f 100644 --- a/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java +++ b/core/core-backend/src/main/java/io/gisbi/template/manage/TemplateCenterManage.java @@ -1,26 +1,24 @@ -package io.dataease.template.manage; +package io.gisbi.template.manage; -import io.dataease.api.template.dto.TemplateManageDTO; -import io.dataease.api.template.dto.TemplateManageFileDTO; -import io.dataease.api.template.dto.TemplateMarketDTO; -import io.dataease.api.template.dto.TemplateMarketPreviewInfoDTO; -import io.dataease.api.template.response.*; -import io.dataease.api.template.vo.MarketApplicationMetaDataVO; -import io.dataease.api.template.vo.MarketApplicationSpecVO; -import io.dataease.api.template.vo.MarketLatestReleaseVO; -import io.dataease.api.template.vo.MarketMetaDataVO; -import io.dataease.constant.CommonConstants; -import io.dataease.exception.DEException; -import io.dataease.i18n.Translator; -import io.dataease.operation.manage.CoreOptRecentManage; -import io.dataease.system.manage.SysParameterManage; -import io.dataease.template.dao.auto.entity.VisualizationTemplateCategoryMap; -import io.dataease.template.dao.auto.mapper.VisualizationTemplateCategoryMapMapper; -import io.dataease.template.dao.ext.ExtVisualizationTemplateMapper; -import io.dataease.utils.HttpClientConfig; -import io.dataease.utils.HttpClientUtil; -import io.dataease.utils.JsonUtil; -import io.dataease.utils.LogUtil; +import io.gisbi.api.template.dto.TemplateManageDTO; +import io.gisbi.api.template.dto.TemplateManageFileDTO; +import io.gisbi.api.template.dto.TemplateMarketDTO; +import io.gisbi.api.template.dto.TemplateMarketPreviewInfoDTO; +import io.gisbi.api.template.response.*; +import io.gisbi.api.template.vo.MarketApplicationMetaDataVO; +import io.gisbi.api.template.vo.MarketApplicationSpecVO; +import io.gisbi.api.template.vo.MarketMetaDataVO; +import io.gisbi.constant.CommonConstants; +import io.gisbi.exception.DEException; +import io.gisbi.i18n.Translator; +import io.gisbi.operation.manage.CoreOptRecentManage; +import io.gisbi.system.manage.SysParameterManage; +import io.gisbi.template.dao.auto.mapper.VisualizationTemplateCategoryMapMapper; +import io.gisbi.template.dao.ext.ExtVisualizationTemplateMapper; +import io.gisbi.utils.HttpClientConfig; +import io.gisbi.utils.HttpClientUtil; +import io.gisbi.utils.JsonUtil; +import io.gisbi.utils.LogUtil; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/core/core-backend/src/main/java/io/dataease/template/manage/TemplateLocalParseManage.java b/core/core-backend/src/main/java/io/gisbi/template/manage/TemplateLocalParseManage.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/template/manage/TemplateLocalParseManage.java rename to core/core-backend/src/main/java/io/gisbi/template/manage/TemplateLocalParseManage.java index c34fdd7..1c2e6bc 100644 --- a/core/core-backend/src/main/java/io/dataease/template/manage/TemplateLocalParseManage.java +++ b/core/core-backend/src/main/java/io/gisbi/template/manage/TemplateLocalParseManage.java @@ -1,12 +1,12 @@ -package io.dataease.template.manage; +package io.gisbi.template.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.api.visualization.request.DataVisualizationBaseRequest; +import io.gisbi.api.visualization.request.DataVisualizationBaseRequest; import io.dataease.license.utils.LogUtil; -import io.dataease.template.dao.auto.entity.DeTemplateVersion; -import io.dataease.template.dao.auto.mapper.DeTemplateVersionMapper; -import io.dataease.utils.JsonUtil; -import io.dataease.visualization.server.StaticResourceServer; +import io.gisbi.template.dao.auto.entity.DeTemplateVersion; +import io.gisbi.template.dao.auto.mapper.DeTemplateVersionMapper; +import io.gisbi.utils.JsonUtil; +import io.gisbi.visualization.server.StaticResourceServer; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.springframework.core.io.ResourceLoader; @@ -21,7 +21,7 @@ import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; /** - * @author : WangJiaHao + * @Author bi-coder * @date : 2024/5/7 */ @Service diff --git a/core/core-backend/src/main/java/io/dataease/template/service/TemplateManageService.java b/core/core-backend/src/main/java/io/gisbi/template/service/TemplateManageService.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/template/service/TemplateManageService.java rename to core/core-backend/src/main/java/io/gisbi/template/service/TemplateManageService.java index dfa4178..3e9e260 100644 --- a/core/core-backend/src/main/java/io/dataease/template/service/TemplateManageService.java +++ b/core/core-backend/src/main/java/io/gisbi/template/service/TemplateManageService.java @@ -1,23 +1,23 @@ -package io.dataease.template.service; +package io.gisbi.template.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.api.template.TemplateManageApi; -import io.dataease.api.template.dto.TemplateManageDTO; -import io.dataease.api.template.request.TemplateManageBatchRequest; -import io.dataease.api.template.request.TemplateManageRequest; -import io.dataease.api.template.vo.VisualizationTemplateVO; -import io.dataease.constant.CommonConstants; -import io.dataease.exception.DEException; -import io.dataease.template.dao.auto.entity.VisualizationTemplate; -import io.dataease.template.dao.auto.entity.VisualizationTemplateCategory; -import io.dataease.template.dao.auto.entity.VisualizationTemplateCategoryMap; -import io.dataease.template.dao.auto.mapper.VisualizationTemplateCategoryMapMapper; -import io.dataease.template.dao.auto.mapper.VisualizationTemplateCategoryMapper; -import io.dataease.template.dao.auto.mapper.VisualizationTemplateMapper; -import io.dataease.template.dao.ext.ExtVisualizationTemplateMapper; -import io.dataease.utils.AuthUtils; -import io.dataease.utils.BeanUtils; -import io.dataease.visualization.server.StaticResourceServer; +import io.gisbi.api.template.TemplateManageApi; +import io.gisbi.api.template.dto.TemplateManageDTO; +import io.gisbi.api.template.request.TemplateManageBatchRequest; +import io.gisbi.api.template.request.TemplateManageRequest; +import io.gisbi.api.template.vo.VisualizationTemplateVO; +import io.gisbi.constant.CommonConstants; +import io.gisbi.exception.DEException; +import io.gisbi.template.dao.auto.entity.VisualizationTemplate; +import io.gisbi.template.dao.auto.entity.VisualizationTemplateCategory; +import io.gisbi.template.dao.auto.entity.VisualizationTemplateCategoryMap; +import io.gisbi.template.dao.auto.mapper.VisualizationTemplateCategoryMapMapper; +import io.gisbi.template.dao.auto.mapper.VisualizationTemplateCategoryMapper; +import io.gisbi.template.dao.auto.mapper.VisualizationTemplateMapper; +import io.gisbi.template.dao.ext.ExtVisualizationTemplateMapper; +import io.gisbi.utils.AuthUtils; +import io.gisbi.utils.BeanUtils; +import io.gisbi.visualization.server.StaticResourceServer; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.transaction.annotation.Transactional; @@ -28,10 +28,10 @@ import org.springframework.web.bind.annotation.RestController; import java.util.*; -import static io.dataease.constant.StaticResourceConstants.UPLOAD_URL_PREFIX; +import static io.gisbi.constant.StaticResourceConstants.UPLOAD_URL_PREFIX; /** - * @author : WangJiaHao + * @Author bi-coder * @date : 2023/11/7 13:29 */ @RestController diff --git a/core/core-backend/src/main/java/io/dataease/template/service/TemplateMarketService.java b/core/core-backend/src/main/java/io/gisbi/template/service/TemplateMarketService.java similarity index 75% rename from core/core-backend/src/main/java/io/dataease/template/service/TemplateMarketService.java rename to core/core-backend/src/main/java/io/gisbi/template/service/TemplateMarketService.java index c9a80cc..75b7b3b 100644 --- a/core/core-backend/src/main/java/io/dataease/template/service/TemplateMarketService.java +++ b/core/core-backend/src/main/java/io/gisbi/template/service/TemplateMarketService.java @@ -1,10 +1,10 @@ -package io.dataease.template.service; +package io.gisbi.template.service; -import io.dataease.api.template.TemplateMarketApi; -import io.dataease.api.template.response.MarketBaseResponse; -import io.dataease.api.template.response.MarketPreviewBaseResponse; -import io.dataease.api.template.vo.MarketMetaDataVO; -import io.dataease.template.manage.TemplateCenterManage; +import io.gisbi.api.template.TemplateMarketApi; +import io.gisbi.api.template.response.MarketBaseResponse; +import io.gisbi.api.template.response.MarketPreviewBaseResponse; +import io.gisbi.api.template.vo.MarketMetaDataVO; +import io.gisbi.template.manage.TemplateCenterManage; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - * @author : WangJiaHao + * @Author bi-coder * @date : 2023/11/17 13:20 */ @RestController diff --git a/core/core-backend/src/main/java/io/dataease/visualization/bo/ExcelSheetModel.java b/core/core-backend/src/main/java/io/gisbi/visualization/bo/ExcelSheetModel.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/visualization/bo/ExcelSheetModel.java rename to core/core-backend/src/main/java/io/gisbi/visualization/bo/ExcelSheetModel.java index d1b8389..4cfeda5 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/bo/ExcelSheetModel.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/bo/ExcelSheetModel.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.bo; +package io.gisbi.visualization.bo; import lombok.Data; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/CoreStore.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/CoreStore.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/CoreStore.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/CoreStore.java index 87dda5d..a0223b5 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/CoreStore.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/CoreStore.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.auto.entity; +package io.gisbi.visualization.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-08-24 */ @TableName("core_store") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/DataVisualizationInfo.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/DataVisualizationInfo.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/DataVisualizationInfo.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/DataVisualizationInfo.java index 67ba543..1282fcb 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/DataVisualizationInfo.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/DataVisualizationInfo.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.auto.entity; +package io.gisbi.visualization.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * 可视化大屏信息表 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-11-22 */ @TableName("data_visualization_info") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationBackground.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationBackground.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationBackground.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationBackground.java index 218f0fb..98ee188 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationBackground.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationBackground.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.auto.entity; +package io.gisbi.visualization.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-06-12 */ @TableName("visualization_background") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJump.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationLinkJump.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJump.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationLinkJump.java index fcb342c..eec1dbb 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJump.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationLinkJump.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.auto.entity; +package io.gisbi.visualization.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-09-22 */ @TableName("visualization_link_jump") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJumpInfo.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationLinkJumpInfo.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJumpInfo.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationLinkJumpInfo.java index f833aaa..94e0607 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJumpInfo.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationLinkJumpInfo.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.auto.entity; +package io.gisbi.visualization.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * 跳转配置表 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-09-19 */ @TableName("visualization_link_jump_info") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJumpTargetViewInfo.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationLinkJumpTargetViewInfo.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJumpTargetViewInfo.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationLinkJumpTargetViewInfo.java index 7a7673a..980b667 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJumpTargetViewInfo.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationLinkJumpTargetViewInfo.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.auto.entity; +package io.gisbi.visualization.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -9,7 +9,7 @@ import java.io.Serializable; * 跳转目标仪表板图表字段配置表 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-11-20 */ @TableName("visualization_link_jump_target_view_info") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkage.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationLinkage.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkage.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationLinkage.java index 26378f1..e24c509 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkage.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationLinkage.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.auto.entity; +package io.gisbi.visualization.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-09-22 */ @TableName("visualization_linkage") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkageField.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationLinkageField.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkageField.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationLinkageField.java index 56c6454..f6b2f1e 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkageField.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationLinkageField.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.auto.entity; +package io.gisbi.visualization.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-09-22 */ @TableName("visualization_linkage_field") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParams.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationOuterParams.java similarity index 96% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParams.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationOuterParams.java index 92e0ad5..348c462 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParams.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationOuterParams.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.auto.entity; +package io.gisbi.visualization.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -9,7 +9,7 @@ import java.io.Serializable; * 外部参数关联关系表 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-09-09 */ @TableName("visualization_outer_params") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java index daa534f..66001d1 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.auto.entity; +package io.gisbi.visualization.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -9,7 +9,7 @@ import java.io.Serializable; * 外部参数配置表 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-09-09 */ @TableName("visualization_outer_params_info") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java similarity index 97% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java index e36f2ea..594d88f 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.auto.entity; +package io.gisbi.visualization.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -9,7 +9,7 @@ import java.io.Serializable; * 外部参数联动视图字段信息表 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-08-21 */ @TableName("visualization_outer_params_target_view_info") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationSubject.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationSubject.java similarity index 98% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationSubject.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationSubject.java index 1ef714b..43e63ed 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationSubject.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationSubject.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.auto.entity; +package io.gisbi.visualization.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-07-12 */ @TableName("visualization_subject") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationWatermark.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationWatermark.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationWatermark.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationWatermark.java index 8aac069..deec905 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationWatermark.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/entity/VisualizationWatermark.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.auto.entity; +package io.gisbi.visualization.dao.auto.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -8,7 +8,7 @@ import java.io.Serializable; * 仪表板水印设置表 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-01-09 */ @TableName("visualization_watermark") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/CoreStoreMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/CoreStoreMapper.java similarity index 64% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/CoreStoreMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/CoreStoreMapper.java index 64c6a5a..57d1171 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/CoreStoreMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/CoreStoreMapper.java @@ -1,6 +1,6 @@ -package io.dataease.visualization.dao.auto.mapper; +package io.gisbi.visualization.dao.auto.mapper; -import io.dataease.visualization.dao.auto.entity.CoreStore; +import io.gisbi.visualization.dao.auto.entity.CoreStore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-08-24 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/DataVisualizationInfoMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/DataVisualizationInfoMapper.java similarity index 66% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/DataVisualizationInfoMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/DataVisualizationInfoMapper.java index 890d6f7..02b14fe 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/DataVisualizationInfoMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/DataVisualizationInfoMapper.java @@ -1,6 +1,6 @@ -package io.dataease.visualization.dao.auto.mapper; +package io.gisbi.visualization.dao.auto.mapper; -import io.dataease.visualization.dao.auto.entity.DataVisualizationInfo; +import io.gisbi.visualization.dao.auto.entity.DataVisualizationInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 可视化大屏信息表 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-11-22 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationBackgroundMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationBackgroundMapper.java similarity index 65% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationBackgroundMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationBackgroundMapper.java index 9fc92d7..c545924 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationBackgroundMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationBackgroundMapper.java @@ -1,6 +1,6 @@ -package io.dataease.visualization.dao.auto.mapper; +package io.gisbi.visualization.dao.auto.mapper; -import io.dataease.visualization.dao.auto.entity.VisualizationBackground; +import io.gisbi.visualization.dao.auto.entity.VisualizationBackground; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-06-12 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkJumpInfoMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationLinkJumpInfoMapper.java similarity index 66% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkJumpInfoMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationLinkJumpInfoMapper.java index 8918e3a..0e8bb32 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkJumpInfoMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationLinkJumpInfoMapper.java @@ -1,6 +1,6 @@ -package io.dataease.visualization.dao.auto.mapper; +package io.gisbi.visualization.dao.auto.mapper; -import io.dataease.visualization.dao.auto.entity.VisualizationLinkJumpInfo; +import io.gisbi.visualization.dao.auto.entity.VisualizationLinkJumpInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 跳转配置表 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-09-19 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkJumpMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationLinkJumpMapper.java similarity index 65% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkJumpMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationLinkJumpMapper.java index f274667..c7643ca 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkJumpMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationLinkJumpMapper.java @@ -1,6 +1,6 @@ -package io.dataease.visualization.dao.auto.mapper; +package io.gisbi.visualization.dao.auto.mapper; -import io.dataease.visualization.dao.auto.entity.VisualizationLinkJump; +import io.gisbi.visualization.dao.auto.entity.VisualizationLinkJump; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-09-22 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkJumpTargetViewInfoMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationLinkJumpTargetViewInfoMapper.java similarity index 68% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkJumpTargetViewInfoMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationLinkJumpTargetViewInfoMapper.java index df62b64..c44e5e1 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkJumpTargetViewInfoMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationLinkJumpTargetViewInfoMapper.java @@ -1,6 +1,6 @@ -package io.dataease.visualization.dao.auto.mapper; +package io.gisbi.visualization.dao.auto.mapper; -import io.dataease.visualization.dao.auto.entity.VisualizationLinkJumpTargetViewInfo; +import io.gisbi.visualization.dao.auto.entity.VisualizationLinkJumpTargetViewInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 跳转目标仪表板图表字段配置表 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-11-20 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkageFieldMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationLinkageFieldMapper.java similarity index 65% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkageFieldMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationLinkageFieldMapper.java index 11fd7fd..2a444c6 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkageFieldMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationLinkageFieldMapper.java @@ -1,6 +1,6 @@ -package io.dataease.visualization.dao.auto.mapper; +package io.gisbi.visualization.dao.auto.mapper; -import io.dataease.visualization.dao.auto.entity.VisualizationLinkageField; +import io.gisbi.visualization.dao.auto.entity.VisualizationLinkageField; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-09-22 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkageMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationLinkageMapper.java similarity index 65% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkageMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationLinkageMapper.java index 770e476..83a75fa 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkageMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationLinkageMapper.java @@ -1,6 +1,6 @@ -package io.dataease.visualization.dao.auto.mapper; +package io.gisbi.visualization.dao.auto.mapper; -import io.dataease.visualization.dao.auto.entity.VisualizationLinkage; +import io.gisbi.visualization.dao.auto.entity.VisualizationLinkage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-09-22 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsInfoMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationOuterParamsInfoMapper.java similarity index 66% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsInfoMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationOuterParamsInfoMapper.java index 68aeeb0..6e035d6 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsInfoMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationOuterParamsInfoMapper.java @@ -1,6 +1,6 @@ -package io.dataease.visualization.dao.auto.mapper; +package io.gisbi.visualization.dao.auto.mapper; -import io.dataease.visualization.dao.auto.entity.VisualizationOuterParamsInfo; +import io.gisbi.visualization.dao.auto.entity.VisualizationOuterParamsInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 外部参数配置表 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-09-09 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationOuterParamsMapper.java similarity index 67% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationOuterParamsMapper.java index f635f21..81b20ee 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationOuterParamsMapper.java @@ -1,6 +1,6 @@ -package io.dataease.visualization.dao.auto.mapper; +package io.gisbi.visualization.dao.auto.mapper; -import io.dataease.visualization.dao.auto.entity.VisualizationOuterParams; +import io.gisbi.visualization.dao.auto.entity.VisualizationOuterParams; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 外部参数关联关系表 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-09-09 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java similarity index 67% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java index 0e6a211..0a73fad 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java @@ -1,6 +1,6 @@ -package io.dataease.visualization.dao.auto.mapper; +package io.gisbi.visualization.dao.auto.mapper; -import io.dataease.visualization.dao.auto.entity.VisualizationOuterParamsTargetViewInfo; +import io.gisbi.visualization.dao.auto.entity.VisualizationOuterParamsTargetViewInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 外部参数联动视图字段信息表 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-08-21 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationSubjectMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationSubjectMapper.java similarity index 65% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationSubjectMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationSubjectMapper.java index 7da246a..cf18b8c 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationSubjectMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationSubjectMapper.java @@ -1,6 +1,6 @@ -package io.dataease.visualization.dao.auto.mapper; +package io.gisbi.visualization.dao.auto.mapper; -import io.dataease.visualization.dao.auto.entity.VisualizationSubject; +import io.gisbi.visualization.dao.auto.entity.VisualizationSubject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2023-07-12 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationWatermarkMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationWatermarkMapper.java similarity index 66% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationWatermarkMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationWatermarkMapper.java index 99334c0..2bea903 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationWatermarkMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/auto/mapper/VisualizationWatermarkMapper.java @@ -1,6 +1,6 @@ -package io.dataease.visualization.dao.auto.mapper; +package io.gisbi.visualization.dao.auto.mapper; -import io.dataease.visualization.dao.auto.entity.VisualizationWatermark; +import io.gisbi.visualization.dao.auto.entity.VisualizationWatermark; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 仪表板水印设置表 Mapper 接口 *

* - * @author fit2cloud + * @Author bi-coder * @since 2024-01-09 */ @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/CoreStoreExtMapper.java similarity index 89% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/CoreStoreExtMapper.java index 0f4c231..80d016e 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/CoreStoreExtMapper.java @@ -1,8 +1,8 @@ -package io.dataease.visualization.dao.ext.mapper; +package io.gisbi.visualization.dao.ext.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.dataease.visualization.dao.ext.po.StorePO; +import io.gisbi.visualization.dao.ext.po.StorePO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreVisualiationExtMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/CoreVisualiationExtMapper.java similarity index 91% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreVisualiationExtMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/CoreVisualiationExtMapper.java index c07ed6c..d8cbd0b 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreVisualiationExtMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/CoreVisualiationExtMapper.java @@ -1,7 +1,7 @@ -package io.dataease.visualization.dao.ext.mapper; +package io.gisbi.visualization.dao.ext.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.visualization.dao.ext.po.VisualizationNodePO; +import io.gisbi.visualization.dao.ext.po.VisualizationNodePO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java similarity index 78% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java index 866d87b..95d870c 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java @@ -1,22 +1,19 @@ -package io.dataease.visualization.dao.ext.mapper; +package io.gisbi.visualization.dao.ext.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.dataease.api.permissions.user.vo.UserFormVO; -import io.dataease.api.visualization.dto.VisualizationViewTableDTO; -import io.dataease.api.visualization.vo.DataVisualizationBaseVO; -import io.dataease.api.visualization.vo.DataVisualizationVO; -import io.dataease.api.visualization.vo.VisualizationReportFilterVO; -import io.dataease.api.visualization.vo.VisualizationResourceVO; -import io.dataease.chart.dao.auto.entity.CoreChartView; -import io.dataease.visualization.dao.ext.po.StorePO; -import io.dataease.visualization.dao.ext.po.VisualizationResourcePO; +import io.gisbi.api.permissions.user.vo.UserFormVO; +import io.gisbi.api.visualization.dto.VisualizationViewTableDTO; +import io.gisbi.api.visualization.vo.DataVisualizationBaseVO; +import io.gisbi.api.visualization.vo.DataVisualizationVO; +import io.gisbi.api.visualization.vo.VisualizationReportFilterVO; +import io.gisbi.chart.dao.auto.entity.CoreChartView; +import io.gisbi.visualization.dao.ext.po.VisualizationResourcePO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; -import java.util.Map; import java.util.Set; @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationLinkJumpMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/ExtVisualizationLinkJumpMapper.java similarity index 77% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationLinkJumpMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/ExtVisualizationLinkJumpMapper.java index 06f8514..9aaddd3 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationLinkJumpMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/ExtVisualizationLinkJumpMapper.java @@ -1,11 +1,11 @@ -package io.dataease.visualization.dao.ext.mapper; +package io.gisbi.visualization.dao.ext.mapper; -import io.dataease.api.visualization.dto.VisualizationLinkJumpDTO; -import io.dataease.api.visualization.request.VisualizationLinkJumpBaseRequest; -import io.dataease.api.visualization.vo.VisualizationLinkJumpInfoVO; -import io.dataease.api.visualization.vo.VisualizationLinkJumpVO; -import io.dataease.api.visualization.vo.VisualizationOutParamsJumpVO; -import io.dataease.api.visualization.vo.VisualizationViewTableVO; +import io.gisbi.api.visualization.dto.VisualizationLinkJumpDTO; +import io.gisbi.api.visualization.request.VisualizationLinkJumpBaseRequest; +import io.gisbi.api.visualization.vo.VisualizationLinkJumpInfoVO; +import io.gisbi.api.visualization.vo.VisualizationLinkJumpVO; +import io.gisbi.api.visualization.vo.VisualizationOutParamsJumpVO; +import io.gisbi.api.visualization.vo.VisualizationViewTableVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationLinkageMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/ExtVisualizationLinkageMapper.java similarity index 73% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationLinkageMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/ExtVisualizationLinkageMapper.java index 9a0b05f..9033a1c 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationLinkageMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/ExtVisualizationLinkageMapper.java @@ -1,10 +1,10 @@ -package io.dataease.visualization.dao.ext.mapper; +package io.gisbi.visualization.dao.ext.mapper; -import io.dataease.api.visualization.dto.LinkageInfoDTO; -import io.dataease.api.visualization.dto.VisualizationLinkageDTO; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.visualization.dao.auto.entity.VisualizationLinkage; -import io.dataease.visualization.dao.auto.entity.VisualizationLinkageField; +import io.gisbi.api.visualization.dto.LinkageInfoDTO; +import io.gisbi.api.visualization.dto.VisualizationLinkageDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.visualization.dao.auto.entity.VisualizationLinkage; +import io.gisbi.visualization.dao.auto.entity.VisualizationLinkageField; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationOuterParamsMapper.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/ExtVisualizationOuterParamsMapper.java similarity index 74% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationOuterParamsMapper.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/ExtVisualizationOuterParamsMapper.java index 32b85f9..6d07726 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationOuterParamsMapper.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/mapper/ExtVisualizationOuterParamsMapper.java @@ -1,10 +1,10 @@ -package io.dataease.visualization.dao.ext.mapper; +package io.gisbi.visualization.dao.ext.mapper; -import io.dataease.api.dataset.vo.CoreDatasetGroupVO; -import io.dataease.api.visualization.dto.VisualizationOuterParamsDTO; -import io.dataease.api.visualization.dto.VisualizationOuterParamsInfoDTO; -import io.dataease.visualization.dao.auto.entity.VisualizationOuterParamsInfo; +import io.gisbi.api.dataset.vo.CoreDatasetGroupVO; +import io.gisbi.api.visualization.dto.VisualizationOuterParamsDTO; +import io.gisbi.api.visualization.dto.VisualizationOuterParamsInfoDTO; +import io.gisbi.visualization.dao.auto.entity.VisualizationOuterParamsInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/StorePO.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/po/StorePO.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/StorePO.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/po/StorePO.java index 2127dd4..33130a9 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/StorePO.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/po/StorePO.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.ext.po; +package io.gisbi.visualization.dao.ext.po; import lombok.Data; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/VisualizationNodePO.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/po/VisualizationNodePO.java similarity index 88% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/VisualizationNodePO.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/po/VisualizationNodePO.java index cae51eb..cced510 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/VisualizationNodePO.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/po/VisualizationNodePO.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.ext.po; +package io.gisbi.visualization.dao.ext.po; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/VisualizationResourcePO.java b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/po/VisualizationResourcePO.java similarity index 94% rename from core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/VisualizationResourcePO.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/po/VisualizationResourcePO.java index 6101c7b..60ee2e4 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/VisualizationResourcePO.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dao/ext/po/VisualizationResourcePO.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dao.ext.po; +package io.gisbi.visualization.dao.ext.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dto/VisualizationNodeBO.java b/core/core-backend/src/main/java/io/gisbi/visualization/dto/VisualizationNodeBO.java similarity index 85% rename from core/core-backend/src/main/java/io/dataease/visualization/dto/VisualizationNodeBO.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dto/VisualizationNodeBO.java index fbdda97..1eea1ed 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dto/VisualizationNodeBO.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dto/VisualizationNodeBO.java @@ -1,6 +1,6 @@ -package io.dataease.visualization.dto; +package io.gisbi.visualization.dto; -import io.dataease.model.TreeBaseModel; +import io.gisbi.model.TreeBaseModel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dto/WatermarkContentDTO.java b/core/core-backend/src/main/java/io/gisbi/visualization/dto/WatermarkContentDTO.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/visualization/dto/WatermarkContentDTO.java rename to core/core-backend/src/main/java/io/gisbi/visualization/dto/WatermarkContentDTO.java index 091b4d8..def2d8c 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dto/WatermarkContentDTO.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/dto/WatermarkContentDTO.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.dto; +package io.gisbi.visualization.dto; import lombok.Data; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreBusiManage.java b/core/core-backend/src/main/java/io/gisbi/visualization/manage/CoreBusiManage.java similarity index 85% rename from core/core-backend/src/main/java/io/dataease/visualization/manage/CoreBusiManage.java rename to core/core-backend/src/main/java/io/gisbi/visualization/manage/CoreBusiManage.java index bd76a82..552d354 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreBusiManage.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/manage/CoreBusiManage.java @@ -1,9 +1,9 @@ -package io.dataease.visualization.manage; +package io.gisbi.visualization.manage; -import io.dataease.dataset.manage.DatasetGroupManage; -import io.dataease.datasource.manage.DataSourceManage; -import io.dataease.model.BusiNodeRequest; -import io.dataease.model.BusiNodeVO; +import io.gisbi.dataset.manage.DatasetGroupManage; +import io.gisbi.datasource.manage.DataSourceManage; +import io.gisbi.model.BusiNodeRequest; +import io.gisbi.model.BusiNodeVO; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java b/core/core-backend/src/main/java/io/gisbi/visualization/manage/CoreVisualizationExportManage.java similarity index 89% rename from core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java rename to core/core-backend/src/main/java/io/gisbi/visualization/manage/CoreVisualizationExportManage.java index abbfc01..6dc8b49 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/manage/CoreVisualizationExportManage.java @@ -1,25 +1,25 @@ -package io.dataease.visualization.manage; +package io.gisbi.visualization.manage; import com.fasterxml.jackson.core.type.TypeReference; -import io.dataease.api.visualization.vo.DataVisualizationVO; -import io.dataease.chart.constant.ChartConstants; -import io.dataease.chart.manage.ChartDataManage; -import io.dataease.chart.manage.ChartViewManege; -import io.dataease.constant.CommonConstants; -import io.dataease.dataset.server.DatasetFieldServer; -import io.dataease.constant.DeTypeConstants; -import io.dataease.exception.DEException; -import io.dataease.exportCenter.util.ExportCenterUtils; -import io.dataease.extensions.view.dto.ChartExtFilterDTO; -import io.dataease.extensions.view.dto.ChartExtRequest; -import io.dataease.extensions.view.dto.ChartViewDTO; -import io.dataease.extensions.view.dto.ChartViewFieldDTO; -import io.dataease.utils.AuthUtils; -import io.dataease.utils.JsonUtil; -import io.dataease.visualization.bo.ExcelSheetModel; -import io.dataease.visualization.dao.ext.mapper.ExtDataVisualizationMapper; -import io.dataease.visualization.template.FilterBuildTemplate; -import io.dataease.visualization.utils.VisualizationExcelUtils; +import io.gisbi.api.visualization.vo.DataVisualizationVO; +import io.gisbi.chart.constant.ChartConstants; +import io.gisbi.chart.manage.ChartDataManage; +import io.gisbi.chart.manage.ChartViewManege; +import io.gisbi.constant.CommonConstants; +import io.gisbi.dataset.server.DatasetFieldServer; +import io.gisbi.constant.DeTypeConstants; +import io.gisbi.exception.DEException; +import io.gisbi.exportCenter.util.ExportCenterUtils; +import io.gisbi.extensions.view.dto.ChartExtFilterDTO; +import io.gisbi.extensions.view.dto.ChartExtRequest; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import io.gisbi.extensions.view.dto.ChartViewFieldDTO; +import io.gisbi.utils.AuthUtils; +import io.gisbi.utils.JsonUtil; +import io.gisbi.visualization.bo.ExcelSheetModel; +import io.gisbi.visualization.dao.ext.mapper.ExtDataVisualizationMapper; +import io.gisbi.visualization.template.FilterBuildTemplate; +import io.gisbi.visualization.utils.VisualizationExcelUtils; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java b/core/core-backend/src/main/java/io/gisbi/visualization/manage/CoreVisualizationManage.java similarity index 88% rename from core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java rename to core/core-backend/src/main/java/io/gisbi/visualization/manage/CoreVisualizationManage.java index 9d4fe99..762a386 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/manage/CoreVisualizationManage.java @@ -1,27 +1,27 @@ -package io.dataease.visualization.manage; +package io.gisbi.visualization.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.dataease.api.visualization.request.DataVisualizationBaseRequest; -import io.dataease.api.visualization.request.VisualizationWorkbranchQueryRequest; -import io.dataease.api.visualization.vo.VisualizationResourceVO; -import io.dataease.commons.constants.DataVisualizationConstants; -import io.dataease.commons.constants.OptConstants; -import io.dataease.constant.BusiResourceEnum; -import io.dataease.exception.DEException; +import io.gisbi.api.visualization.request.DataVisualizationBaseRequest; +import io.gisbi.api.visualization.request.VisualizationWorkbranchQueryRequest; +import io.gisbi.api.visualization.vo.VisualizationResourceVO; +import io.gisbi.commons.constants.DataVisualizationConstants; +import io.gisbi.commons.constants.OptConstants; +import io.gisbi.constant.BusiResourceEnum; +import io.gisbi.exception.DEException; import io.dataease.license.config.XpackInteract; -import io.dataease.model.BusiNodeRequest; -import io.dataease.model.BusiNodeVO; -import io.dataease.operation.manage.CoreOptRecentManage; -import io.dataease.utils.*; -import io.dataease.visualization.dao.auto.entity.DataVisualizationInfo; -import io.dataease.visualization.dao.auto.mapper.DataVisualizationInfoMapper; -import io.dataease.visualization.dao.ext.mapper.CoreVisualiationExtMapper; -import io.dataease.visualization.dao.ext.mapper.ExtDataVisualizationMapper; -import io.dataease.visualization.dao.ext.po.VisualizationNodePO; -import io.dataease.visualization.dao.ext.po.VisualizationResourcePO; -import io.dataease.visualization.dto.VisualizationNodeBO; +import io.gisbi.model.BusiNodeRequest; +import io.gisbi.model.BusiNodeVO; +import io.gisbi.operation.manage.CoreOptRecentManage; +import io.gisbi.utils.*; +import io.gisbi.visualization.dao.auto.entity.DataVisualizationInfo; +import io.gisbi.visualization.dao.auto.mapper.DataVisualizationInfoMapper; +import io.gisbi.visualization.dao.ext.mapper.CoreVisualiationExtMapper; +import io.gisbi.visualization.dao.ext.mapper.ExtDataVisualizationMapper; +import io.gisbi.visualization.dao.ext.po.VisualizationNodePO; +import io.gisbi.visualization.dao.ext.po.VisualizationResourcePO; +import io.gisbi.visualization.dto.VisualizationNodeBO; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java b/core/core-backend/src/main/java/io/gisbi/visualization/manage/VisualizationStoreManage.java similarity index 86% rename from core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java rename to core/core-backend/src/main/java/io/gisbi/visualization/manage/VisualizationStoreManage.java index 3ce84d2..5a67922 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/manage/VisualizationStoreManage.java @@ -1,22 +1,22 @@ -package io.dataease.visualization.manage; +package io.gisbi.visualization.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.dataease.api.visualization.request.VisualizationStoreRequest; -import io.dataease.api.visualization.request.VisualizationWorkbranchQueryRequest; -import io.dataease.api.visualization.vo.VisualizationStoreVO; -import io.dataease.constant.BusiResourceEnum; -import io.dataease.exception.DEException; +import io.gisbi.api.visualization.request.VisualizationStoreRequest; +import io.gisbi.api.visualization.request.VisualizationWorkbranchQueryRequest; +import io.gisbi.api.visualization.vo.VisualizationStoreVO; +import io.gisbi.constant.BusiResourceEnum; +import io.gisbi.exception.DEException; import io.dataease.license.config.XpackInteract; -import io.dataease.utils.AuthUtils; -import io.dataease.utils.CommonBeanFactory; -import io.dataease.utils.CommunityUtils; -import io.dataease.utils.IDUtils; -import io.dataease.visualization.dao.auto.entity.CoreStore; -import io.dataease.visualization.dao.auto.mapper.CoreStoreMapper; -import io.dataease.visualization.dao.ext.mapper.CoreStoreExtMapper; -import io.dataease.visualization.dao.ext.po.StorePO; +import io.gisbi.utils.AuthUtils; +import io.gisbi.utils.CommonBeanFactory; +import io.gisbi.utils.CommunityUtils; +import io.gisbi.utils.IDUtils; +import io.gisbi.visualization.dao.auto.entity.CoreStore; +import io.gisbi.visualization.dao.auto.mapper.CoreStoreMapper; +import io.gisbi.visualization.dao.ext.mapper.CoreStoreExtMapper; +import io.gisbi.visualization.dao.ext.po.StorePO; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationTemplateExtendDataManage.java b/core/core-backend/src/main/java/io/gisbi/visualization/manage/VisualizationTemplateExtendDataManage.java similarity index 76% rename from core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationTemplateExtendDataManage.java rename to core/core-backend/src/main/java/io/gisbi/visualization/manage/VisualizationTemplateExtendDataManage.java index 498fead..e13af39 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationTemplateExtendDataManage.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/manage/VisualizationTemplateExtendDataManage.java @@ -1,12 +1,12 @@ -package io.dataease.visualization.manage; +package io.gisbi.visualization.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.extensions.view.dto.ChartViewDTO; -import io.dataease.exception.DEException; -import io.dataease.template.dao.auto.entity.VisualizationTemplateExtendData; -import io.dataease.template.dao.auto.mapper.VisualizationTemplateExtendDataMapper; -import io.dataease.utils.JsonUtil; -import io.dataease.utils.LogUtil; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import io.gisbi.exception.DEException; +import io.gisbi.template.dao.auto.entity.VisualizationTemplateExtendData; +import io.gisbi.template.dao.auto.mapper.VisualizationTemplateExtendDataMapper; +import io.gisbi.utils.JsonUtil; +import io.gisbi.utils.LogUtil; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; /** - * @author : WangJiaHao + * @Author bi-coder * @date : 2023/11/13 13:25 */ @Service diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/gisbi/visualization/server/DataVisualizationServer.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java rename to core/core-backend/src/main/java/io/gisbi/visualization/server/DataVisualizationServer.java index fe1b986..6a44f3b 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/server/DataVisualizationServer.java @@ -1,63 +1,63 @@ -package io.dataease.visualization.server; +package io.gisbi.visualization.server; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.dataease.api.dataset.union.DatasetGroupInfoDTO; -import io.dataease.api.template.dto.TemplateManageFileDTO; -import io.dataease.api.template.dto.VisualizationTemplateExtendDataDTO; -import io.dataease.api.visualization.DataVisualizationApi; -import io.dataease.api.visualization.dto.VisualizationViewTableDTO; -import io.dataease.api.visualization.request.DataVisualizationBaseRequest; -import io.dataease.api.visualization.request.VisualizationAppExportRequest; -import io.dataease.api.visualization.request.VisualizationWorkbranchQueryRequest; -import io.dataease.api.visualization.vo.*; -import io.dataease.auth.DeLinkPermit; -import io.dataease.chart.dao.auto.entity.CoreChartView; -import io.dataease.chart.dao.auto.mapper.CoreChartViewMapper; -import io.dataease.chart.manage.ChartDataManage; -import io.dataease.chart.manage.ChartViewManege; -import io.dataease.commons.constants.DataVisualizationConstants; -import io.dataease.commons.constants.OptConstants; -import io.dataease.constant.CommonConstants; -import io.dataease.constant.LogOT; -import io.dataease.dataset.dao.auto.entity.CoreDatasetGroup; -import io.dataease.dataset.dao.auto.entity.CoreDatasetTable; -import io.dataease.dataset.dao.auto.entity.CoreDatasetTableField; -import io.dataease.dataset.dao.auto.mapper.CoreDatasetGroupMapper; -import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper; -import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableMapper; -import io.dataease.dataset.manage.DatasetDataManage; -import io.dataease.dataset.manage.DatasetGroupManage; -import io.dataease.datasource.dao.auto.entity.CoreDatasource; -import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper; -import io.dataease.datasource.provider.ExcelUtils; -import io.dataease.datasource.server.DatasourceServer; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; -import io.dataease.extensions.view.dto.ChartViewDTO; -import io.dataease.i18n.Translator; +import io.gisbi.api.dataset.union.DatasetGroupInfoDTO; +import io.gisbi.api.template.dto.TemplateManageFileDTO; +import io.gisbi.api.template.dto.VisualizationTemplateExtendDataDTO; +import io.gisbi.api.visualization.DataVisualizationApi; +import io.gisbi.api.visualization.dto.VisualizationViewTableDTO; +import io.gisbi.api.visualization.request.DataVisualizationBaseRequest; +import io.gisbi.api.visualization.request.VisualizationAppExportRequest; +import io.gisbi.api.visualization.request.VisualizationWorkbranchQueryRequest; +import io.gisbi.api.visualization.vo.*; +import io.gisbi.auth.DeLinkPermit; +import io.gisbi.chart.dao.auto.entity.CoreChartView; +import io.gisbi.chart.dao.auto.mapper.CoreChartViewMapper; +import io.gisbi.chart.manage.ChartDataManage; +import io.gisbi.chart.manage.ChartViewManege; +import io.gisbi.commons.constants.DataVisualizationConstants; +import io.gisbi.commons.constants.OptConstants; +import io.gisbi.constant.CommonConstants; +import io.gisbi.constant.LogOT; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetGroup; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetTable; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetTableField; +import io.gisbi.dataset.dao.auto.mapper.CoreDatasetGroupMapper; +import io.gisbi.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper; +import io.gisbi.dataset.dao.auto.mapper.CoreDatasetTableMapper; +import io.gisbi.dataset.manage.DatasetDataManage; +import io.gisbi.dataset.manage.DatasetGroupManage; +import io.gisbi.datasource.dao.auto.entity.CoreDatasource; +import io.gisbi.datasource.dao.auto.mapper.CoreDatasourceMapper; +import io.gisbi.datasource.provider.ExcelUtils; +import io.gisbi.datasource.server.DatasourceServer; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import io.gisbi.i18n.Translator; import io.dataease.license.config.XpackInteract; -import io.dataease.license.manage.CoreLicManage; -import io.dataease.log.DeLog; -import io.dataease.model.BusiNodeRequest; -import io.dataease.model.BusiNodeVO; -import io.dataease.operation.manage.CoreOptRecentManage; -import io.dataease.system.manage.CoreUserManage; -import io.dataease.template.dao.auto.entity.VisualizationTemplate; -import io.dataease.template.dao.auto.entity.VisualizationTemplateExtendData; -import io.dataease.template.dao.auto.mapper.VisualizationTemplateExtendDataMapper; -import io.dataease.template.dao.auto.mapper.VisualizationTemplateMapper; -import io.dataease.template.dao.ext.ExtVisualizationTemplateMapper; -import io.dataease.template.manage.TemplateCenterManage; -import io.dataease.utils.*; -import io.dataease.visualization.dao.auto.entity.DataVisualizationInfo; -import io.dataease.visualization.dao.auto.entity.VisualizationWatermark; -import io.dataease.visualization.dao.auto.mapper.DataVisualizationInfoMapper; -import io.dataease.visualization.dao.auto.mapper.VisualizationWatermarkMapper; -import io.dataease.visualization.dao.ext.mapper.ExtDataVisualizationMapper; -import io.dataease.visualization.manage.CoreBusiManage; -import io.dataease.visualization.manage.CoreVisualizationManage; -import io.dataease.visualization.utils.VisualizationUtils; +import io.gisbi.license.manage.CoreLicManage; +import io.gisbi.log.DeLog; +import io.gisbi.model.BusiNodeRequest; +import io.gisbi.model.BusiNodeVO; +import io.gisbi.operation.manage.CoreOptRecentManage; +import io.gisbi.system.manage.CoreUserManage; +import io.gisbi.template.dao.auto.entity.VisualizationTemplate; +import io.gisbi.template.dao.auto.entity.VisualizationTemplateExtendData; +import io.gisbi.template.dao.auto.mapper.VisualizationTemplateExtendDataMapper; +import io.gisbi.template.dao.auto.mapper.VisualizationTemplateMapper; +import io.gisbi.template.dao.ext.ExtVisualizationTemplateMapper; +import io.gisbi.template.manage.TemplateCenterManage; +import io.gisbi.utils.*; +import io.gisbi.visualization.dao.auto.entity.DataVisualizationInfo; +import io.gisbi.visualization.dao.auto.entity.VisualizationWatermark; +import io.gisbi.visualization.dao.auto.mapper.DataVisualizationInfoMapper; +import io.gisbi.visualization.dao.auto.mapper.VisualizationWatermarkMapper; +import io.gisbi.visualization.dao.ext.mapper.ExtDataVisualizationMapper; +import io.gisbi.visualization.manage.CoreBusiManage; +import io.gisbi.visualization.manage.CoreVisualizationManage; +import io.gisbi.visualization.utils.VisualizationUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/FileType.java b/core/core-backend/src/main/java/io/gisbi/visualization/server/FileType.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/visualization/server/FileType.java rename to core/core-backend/src/main/java/io/gisbi/visualization/server/FileType.java index 36c4ce0..6a0b366 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/FileType.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/server/FileType.java @@ -1,4 +1,4 @@ -package io.dataease.visualization.server; +package io.gisbi.visualization.server; public enum FileType { diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/StaticResourceServer.java b/core/core-backend/src/main/java/io/gisbi/visualization/server/StaticResourceServer.java similarity index 95% rename from core/core-backend/src/main/java/io/dataease/visualization/server/StaticResourceServer.java rename to core/core-backend/src/main/java/io/gisbi/visualization/server/StaticResourceServer.java index 12cfdd6..3d4b0fc 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/StaticResourceServer.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/server/StaticResourceServer.java @@ -1,12 +1,12 @@ -package io.dataease.visualization.server; +package io.gisbi.visualization.server; -import io.dataease.api.visualization.StaticResourceApi; -import io.dataease.api.visualization.request.StaticResourceRequest; -import io.dataease.exception.DEException; -import io.dataease.utils.FileUtils; -import io.dataease.utils.JsonUtil; -import io.dataease.utils.LogUtil; -import io.dataease.utils.StaticResourceUtils; +import io.gisbi.api.visualization.StaticResourceApi; +import io.gisbi.api.visualization.request.StaticResourceRequest; +import io.gisbi.exception.DEException; +import io.gisbi.utils.FileUtils; +import io.gisbi.utils.JsonUtil; +import io.gisbi.utils.LogUtil; +import io.gisbi.utils.StaticResourceUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationBackgroundService.java b/core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationBackgroundService.java similarity index 71% rename from core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationBackgroundService.java rename to core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationBackgroundService.java index da326e8..0dbab9d 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationBackgroundService.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationBackgroundService.java @@ -1,12 +1,12 @@ -package io.dataease.visualization.server; +package io.gisbi.visualization.server; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.api.visualization.VisualizationBackgroundApi; -import io.dataease.api.visualization.vo.VisualizationBackgroundVO; -import io.dataease.i18n.Translator; -import io.dataease.utils.BeanUtils; -import io.dataease.visualization.dao.auto.entity.VisualizationBackground; -import io.dataease.visualization.dao.auto.mapper.VisualizationBackgroundMapper; +import io.gisbi.api.visualization.VisualizationBackgroundApi; +import io.gisbi.api.visualization.vo.VisualizationBackgroundVO; +import io.gisbi.i18n.Translator; +import io.gisbi.utils.BeanUtils; +import io.gisbi.visualization.dao.auto.entity.VisualizationBackground; +import io.gisbi.visualization.dao.auto.mapper.VisualizationBackgroundMapper; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -16,7 +16,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @author : WangJiaHao + * @Author bi-coder * @date : 2023/6/12 19:31 */ @RestController diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java b/core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationLinkJumpService.java similarity index 80% rename from core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java rename to core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationLinkJumpService.java index 42734e6..dc12ef8 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationLinkJumpService.java @@ -1,31 +1,31 @@ -package io.dataease.visualization.server; +package io.gisbi.visualization.server; -import io.dataease.api.visualization.VisualizationLinkJumpApi; -import io.dataease.api.visualization.dto.VisualizationComponentDTO; -import io.dataease.api.visualization.dto.VisualizationLinkJumpDTO; -import io.dataease.api.visualization.dto.VisualizationLinkJumpInfoDTO; -import io.dataease.api.visualization.request.VisualizationLinkJumpBaseRequest; -import io.dataease.api.visualization.response.VisualizationLinkJumpBaseResponse; -import io.dataease.api.visualization.vo.VisualizationOutParamsJumpVO; -import io.dataease.api.visualization.vo.VisualizationViewTableVO; -import io.dataease.auth.DeLinkPermit; -import io.dataease.chart.dao.auto.entity.CoreChartView; -import io.dataease.chart.dao.auto.mapper.CoreChartViewMapper; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.utils.AuthUtils; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.IDUtils; -import io.dataease.utils.ModelUtils; -import io.dataease.visualization.dao.auto.entity.DataVisualizationInfo; -import io.dataease.visualization.dao.auto.entity.VisualizationLinkJump; -import io.dataease.visualization.dao.auto.entity.VisualizationLinkJumpInfo; -import io.dataease.visualization.dao.auto.entity.VisualizationLinkJumpTargetViewInfo; -import io.dataease.visualization.dao.auto.mapper.DataVisualizationInfoMapper; -import io.dataease.visualization.dao.auto.mapper.VisualizationLinkJumpInfoMapper; -import io.dataease.visualization.dao.auto.mapper.VisualizationLinkJumpMapper; -import io.dataease.visualization.dao.auto.mapper.VisualizationLinkJumpTargetViewInfoMapper; -import io.dataease.visualization.dao.ext.mapper.ExtVisualizationLinkJumpMapper; -import io.dataease.visualization.dao.ext.mapper.ExtVisualizationLinkageMapper; +import io.gisbi.api.visualization.VisualizationLinkJumpApi; +import io.gisbi.api.visualization.dto.VisualizationComponentDTO; +import io.gisbi.api.visualization.dto.VisualizationLinkJumpDTO; +import io.gisbi.api.visualization.dto.VisualizationLinkJumpInfoDTO; +import io.gisbi.api.visualization.request.VisualizationLinkJumpBaseRequest; +import io.gisbi.api.visualization.response.VisualizationLinkJumpBaseResponse; +import io.gisbi.api.visualization.vo.VisualizationOutParamsJumpVO; +import io.gisbi.api.visualization.vo.VisualizationViewTableVO; +import io.gisbi.auth.DeLinkPermit; +import io.gisbi.chart.dao.auto.entity.CoreChartView; +import io.gisbi.chart.dao.auto.mapper.CoreChartViewMapper; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.utils.AuthUtils; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.IDUtils; +import io.gisbi.utils.ModelUtils; +import io.gisbi.visualization.dao.auto.entity.DataVisualizationInfo; +import io.gisbi.visualization.dao.auto.entity.VisualizationLinkJump; +import io.gisbi.visualization.dao.auto.entity.VisualizationLinkJumpInfo; +import io.gisbi.visualization.dao.auto.entity.VisualizationLinkJumpTargetViewInfo; +import io.gisbi.visualization.dao.auto.mapper.DataVisualizationInfoMapper; +import io.gisbi.visualization.dao.auto.mapper.VisualizationLinkJumpInfoMapper; +import io.gisbi.visualization.dao.auto.mapper.VisualizationLinkJumpMapper; +import io.gisbi.visualization.dao.auto.mapper.VisualizationLinkJumpTargetViewInfoMapper; +import io.gisbi.visualization.dao.ext.mapper.ExtVisualizationLinkJumpMapper; +import io.gisbi.visualization.dao.ext.mapper.ExtVisualizationLinkageMapper; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.transaction.annotation.Transactional; @@ -37,7 +37,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @author : WangJiaHao + * @Author bi-coder * @date : 2023/7/18 14:31 */ @RestController diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkageService.java b/core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationLinkageService.java similarity index 81% rename from core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkageService.java rename to core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationLinkageService.java index 8f256d9..5881d1a 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkageService.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationLinkageService.java @@ -1,22 +1,22 @@ -package io.dataease.visualization.server; +package io.gisbi.visualization.server; -import io.dataease.api.commons.BaseRspModel; -import io.dataease.api.visualization.VisualizationLinkageApi; -import io.dataease.api.visualization.dto.LinkageInfoDTO; -import io.dataease.api.visualization.dto.VisualizationLinkageDTO; -import io.dataease.api.visualization.request.VisualizationLinkageRequest; -import io.dataease.api.visualization.vo.VisualizationLinkageFieldVO; -import io.dataease.auth.DeLinkPermit; -import io.dataease.chart.dao.auto.entity.CoreChartView; -import io.dataease.chart.dao.auto.mapper.CoreChartViewMapper; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.IDUtils; -import io.dataease.visualization.dao.auto.entity.VisualizationLinkage; -import io.dataease.visualization.dao.auto.entity.VisualizationLinkageField; -import io.dataease.visualization.dao.auto.mapper.DataVisualizationInfoMapper; -import io.dataease.visualization.dao.auto.mapper.VisualizationLinkageFieldMapper; -import io.dataease.visualization.dao.auto.mapper.VisualizationLinkageMapper; -import io.dataease.visualization.dao.ext.mapper.ExtVisualizationLinkageMapper; +import io.gisbi.api.commons.BaseRspModel; +import io.gisbi.api.visualization.VisualizationLinkageApi; +import io.gisbi.api.visualization.dto.LinkageInfoDTO; +import io.gisbi.api.visualization.dto.VisualizationLinkageDTO; +import io.gisbi.api.visualization.request.VisualizationLinkageRequest; +import io.gisbi.api.visualization.vo.VisualizationLinkageFieldVO; +import io.gisbi.auth.DeLinkPermit; +import io.gisbi.chart.dao.auto.entity.CoreChartView; +import io.gisbi.chart.dao.auto.mapper.CoreChartViewMapper; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.IDUtils; +import io.gisbi.visualization.dao.auto.entity.VisualizationLinkage; +import io.gisbi.visualization.dao.auto.entity.VisualizationLinkageField; +import io.gisbi.visualization.dao.auto.mapper.DataVisualizationInfoMapper; +import io.gisbi.visualization.dao.auto.mapper.VisualizationLinkageFieldMapper; +import io.gisbi.visualization.dao.auto.mapper.VisualizationLinkageMapper; +import io.gisbi.visualization.dao.ext.mapper.ExtVisualizationLinkageMapper; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.springframework.transaction.annotation.Transactional; @@ -28,7 +28,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @author : WangJiaHao + * @Author bi-coder * @date : 2023/7/13 */ @RestController diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationOuterParamsService.java b/core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationOuterParamsService.java similarity index 83% rename from core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationOuterParamsService.java rename to core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationOuterParamsService.java index 34b02ce..da35756 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationOuterParamsService.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationOuterParamsService.java @@ -1,27 +1,27 @@ -package io.dataease.visualization.server; +package io.gisbi.visualization.server; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; -import io.dataease.api.dataset.vo.CoreDatasetGroupVO; -import io.dataease.api.dataset.vo.CoreDatasetTableFieldVO; -import io.dataease.api.visualization.VisualizationOuterParamsApi; -import io.dataease.api.visualization.dto.VisualizationOuterParamsDTO; -import io.dataease.api.visualization.dto.VisualizationOuterParamsInfoDTO; -import io.dataease.api.visualization.response.VisualizationOuterParamsBaseResponse; -import io.dataease.auth.DeLinkPermit; -import io.dataease.dataset.dao.auto.entity.CoreDatasetTable; -import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableMapper; -import io.dataease.constant.DeTypeConstants; -import io.dataease.extensions.view.dto.SqlVariableDetails; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.JsonUtil; -import io.dataease.visualization.dao.auto.entity.VisualizationOuterParams; -import io.dataease.visualization.dao.auto.entity.VisualizationOuterParamsInfo; -import io.dataease.visualization.dao.auto.entity.VisualizationOuterParamsTargetViewInfo; -import io.dataease.visualization.dao.auto.mapper.VisualizationOuterParamsInfoMapper; -import io.dataease.visualization.dao.auto.mapper.VisualizationOuterParamsMapper; -import io.dataease.visualization.dao.auto.mapper.VisualizationOuterParamsTargetViewInfoMapper; -import io.dataease.visualization.dao.ext.mapper.ExtVisualizationOuterParamsMapper; +import io.gisbi.api.dataset.vo.CoreDatasetGroupVO; +import io.gisbi.api.dataset.vo.CoreDatasetTableFieldVO; +import io.gisbi.api.visualization.VisualizationOuterParamsApi; +import io.gisbi.api.visualization.dto.VisualizationOuterParamsDTO; +import io.gisbi.api.visualization.dto.VisualizationOuterParamsInfoDTO; +import io.gisbi.api.visualization.response.VisualizationOuterParamsBaseResponse; +import io.gisbi.auth.DeLinkPermit; +import io.gisbi.dataset.dao.auto.entity.CoreDatasetTable; +import io.gisbi.dataset.dao.auto.mapper.CoreDatasetTableMapper; +import io.gisbi.constant.DeTypeConstants; +import io.gisbi.extensions.view.dto.SqlVariableDetails; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.JsonUtil; +import io.gisbi.visualization.dao.auto.entity.VisualizationOuterParams; +import io.gisbi.visualization.dao.auto.entity.VisualizationOuterParamsInfo; +import io.gisbi.visualization.dao.auto.entity.VisualizationOuterParamsTargetViewInfo; +import io.gisbi.visualization.dao.auto.mapper.VisualizationOuterParamsInfoMapper; +import io.gisbi.visualization.dao.auto.mapper.VisualizationOuterParamsMapper; +import io.gisbi.visualization.dao.auto.mapper.VisualizationOuterParamsTargetViewInfoMapper; +import io.gisbi.visualization.dao.ext.mapper.ExtVisualizationOuterParamsMapper; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.util.Assert; @@ -33,7 +33,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @author : WangJiaHao + * @Author bi-coder * @date : 2024/3/11 09:44 */ @RestController diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationStoreServer.java b/core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationStoreServer.java similarity index 75% rename from core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationStoreServer.java rename to core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationStoreServer.java index a055d63..09d662e 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationStoreServer.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationStoreServer.java @@ -1,13 +1,12 @@ -package io.dataease.visualization.server; +package io.gisbi.visualization.server; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.dataease.api.visualization.VisualizationStoreApi; -import io.dataease.api.visualization.request.VisualizationStoreRequest; -import io.dataease.api.visualization.request.VisualizationWorkbranchQueryRequest; -import io.dataease.api.visualization.vo.VisualizationResourceVO; -import io.dataease.api.visualization.vo.VisualizationStoreVO; -import io.dataease.i18n.Translator; -import io.dataease.visualization.manage.VisualizationStoreManage; +import io.gisbi.api.visualization.VisualizationStoreApi; +import io.gisbi.api.visualization.request.VisualizationStoreRequest; +import io.gisbi.api.visualization.request.VisualizationWorkbranchQueryRequest; +import io.gisbi.api.visualization.vo.VisualizationStoreVO; +import io.gisbi.i18n.Translator; +import io.gisbi.visualization.manage.VisualizationStoreManage; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationSubjectService.java b/core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationSubjectService.java similarity index 86% rename from core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationSubjectService.java rename to core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationSubjectService.java index 792e8ad..9b87888 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationSubjectService.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationSubjectService.java @@ -1,14 +1,14 @@ -package io.dataease.visualization.server; +package io.gisbi.visualization.server; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.api.visualization.VisualizationSubjectApi; -import io.dataease.api.visualization.request.VisualizationSubjectRequest; -import io.dataease.api.visualization.vo.VisualizationSubjectVO; -import io.dataease.exception.DEException; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.IDUtils; -import io.dataease.visualization.dao.auto.entity.VisualizationSubject; -import io.dataease.visualization.dao.auto.mapper.VisualizationSubjectMapper; +import io.gisbi.api.visualization.VisualizationSubjectApi; +import io.gisbi.api.visualization.request.VisualizationSubjectRequest; +import io.gisbi.api.visualization.vo.VisualizationSubjectVO; +import io.gisbi.exception.DEException; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.IDUtils; +import io.gisbi.visualization.dao.auto.entity.VisualizationSubject; +import io.gisbi.visualization.dao.auto.mapper.VisualizationSubjectMapper; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.util.Assert; @@ -18,11 +18,10 @@ import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; -import java.util.UUID; import java.util.stream.Collectors; /** - * @author : WangJiaHao + * @Author bi-coder * @date : 2023/6/9 18:41 */ @RestController diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationWatermarkService.java b/core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationWatermarkService.java similarity index 68% rename from core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationWatermarkService.java rename to core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationWatermarkService.java index b1f880c..60739f9 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationWatermarkService.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/server/VisualizationWatermarkService.java @@ -1,18 +1,17 @@ -package io.dataease.visualization.server; +package io.gisbi.visualization.server; -import io.dataease.api.visualization.VisualizationWatermarkApi; -import io.dataease.api.visualization.request.VisualizationWatermarkRequest; -import io.dataease.api.visualization.vo.VisualizationWatermarkVO; -import io.dataease.utils.BeanUtils; -import io.dataease.visualization.dao.auto.entity.VisualizationWatermark; -import io.dataease.visualization.dao.auto.mapper.VisualizationWatermarkMapper; +import io.gisbi.api.visualization.VisualizationWatermarkApi; +import io.gisbi.api.visualization.request.VisualizationWatermarkRequest; +import io.gisbi.api.visualization.vo.VisualizationWatermarkVO; +import io.gisbi.utils.BeanUtils; +import io.gisbi.visualization.dao.auto.entity.VisualizationWatermark; +import io.gisbi.visualization.dao.auto.mapper.VisualizationWatermarkMapper; import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * @author : WangJiaHao + * @Author bi-coder * @date : 2024/1/10 16:59 */ @RestController diff --git a/core/core-backend/src/main/java/io/dataease/visualization/template/FilterBuildTemplate.java b/core/core-backend/src/main/java/io/gisbi/visualization/template/FilterBuildTemplate.java similarity index 86% rename from core/core-backend/src/main/java/io/dataease/visualization/template/FilterBuildTemplate.java rename to core/core-backend/src/main/java/io/gisbi/visualization/template/FilterBuildTemplate.java index 59b0a6a..937ac77 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/template/FilterBuildTemplate.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/template/FilterBuildTemplate.java @@ -1,6 +1,6 @@ -package io.dataease.visualization.template; +package io.gisbi.visualization.template; -import io.dataease.extensions.view.dto.ChartExtFilterDTO; +import io.gisbi.extensions.view.dto.ChartExtFilterDTO; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/utils/VisualizationExcelUtils.java b/core/core-backend/src/main/java/io/gisbi/visualization/utils/VisualizationExcelUtils.java similarity index 93% rename from core/core-backend/src/main/java/io/dataease/visualization/utils/VisualizationExcelUtils.java rename to core/core-backend/src/main/java/io/gisbi/visualization/utils/VisualizationExcelUtils.java index 9a28ee3..8eb73b4 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/utils/VisualizationExcelUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/utils/VisualizationExcelUtils.java @@ -1,11 +1,11 @@ -package io.dataease.visualization.utils; +package io.gisbi.visualization.utils; -import io.dataease.constant.DeTypeConstants; -import io.dataease.utils.ConfigUtils; -import io.dataease.utils.FileUtils; -import io.dataease.utils.LogUtil; -import io.dataease.utils.ModelUtils; -import io.dataease.visualization.bo.ExcelSheetModel; +import io.gisbi.constant.DeTypeConstants; +import io.gisbi.utils.ConfigUtils; +import io.gisbi.utils.FileUtils; +import io.gisbi.utils.LogUtil; +import io.gisbi.utils.ModelUtils; +import io.gisbi.visualization.bo.ExcelSheetModel; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.*; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/utils/VisualizationUtils.java b/core/core-backend/src/main/java/io/gisbi/visualization/utils/VisualizationUtils.java similarity index 84% rename from core/core-backend/src/main/java/io/dataease/visualization/utils/VisualizationUtils.java rename to core/core-backend/src/main/java/io/gisbi/visualization/utils/VisualizationUtils.java index 3c9bf26..8ce1ae4 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/utils/VisualizationUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/utils/VisualizationUtils.java @@ -1,7 +1,7 @@ -package io.dataease.visualization.utils; +package io.gisbi.visualization.utils; -import io.dataease.extensions.view.dto.ChartViewDTO; -import io.dataease.utils.JsonUtil; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import io.gisbi.utils.JsonUtil; import java.util.HashMap; import java.util.Map; diff --git a/core/core-backend/src/main/java/io/dataease/websocket/aop/WSTrigger.java b/core/core-backend/src/main/java/io/gisbi/websocket/aop/WSTrigger.java similarity index 89% rename from core/core-backend/src/main/java/io/dataease/websocket/aop/WSTrigger.java rename to core/core-backend/src/main/java/io/gisbi/websocket/aop/WSTrigger.java index ab55bc2..ad5f9d3 100644 --- a/core/core-backend/src/main/java/io/dataease/websocket/aop/WSTrigger.java +++ b/core/core-backend/src/main/java/io/gisbi/websocket/aop/WSTrigger.java @@ -1,7 +1,7 @@ -package io.dataease.websocket.aop; +package io.gisbi.websocket.aop; -import io.dataease.websocket.WsMessage; -import io.dataease.websocket.WsService; +import io.gisbi.websocket.WsMessage; +import io.gisbi.websocket.WsService; import org.apache.commons.lang3.ArrayUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; diff --git a/core/core-backend/src/main/java/io/dataease/websocket/config/WsConfig.java b/core/core-backend/src/main/java/io/gisbi/websocket/config/WsConfig.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/websocket/config/WsConfig.java rename to core/core-backend/src/main/java/io/gisbi/websocket/config/WsConfig.java index ca4b87f..b8785a7 100644 --- a/core/core-backend/src/main/java/io/dataease/websocket/config/WsConfig.java +++ b/core/core-backend/src/main/java/io/gisbi/websocket/config/WsConfig.java @@ -1,7 +1,7 @@ -package io.dataease.websocket.config; +package io.gisbi.websocket.config; -import io.dataease.websocket.factory.DeWsHandlerFactory; -import io.dataease.websocket.handler.PrincipalHandshakeHandler; +import io.gisbi.websocket.factory.DeWsHandlerFactory; +import io.gisbi.websocket.handler.PrincipalHandshakeHandler; import org.springframework.context.annotation.Configuration; import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; diff --git a/core/core-backend/src/main/java/io/dataease/websocket/entity/DePrincipal.java b/core/core-backend/src/main/java/io/gisbi/websocket/entity/DePrincipal.java similarity index 86% rename from core/core-backend/src/main/java/io/dataease/websocket/entity/DePrincipal.java rename to core/core-backend/src/main/java/io/gisbi/websocket/entity/DePrincipal.java index 500c247..98784a8 100644 --- a/core/core-backend/src/main/java/io/dataease/websocket/entity/DePrincipal.java +++ b/core/core-backend/src/main/java/io/gisbi/websocket/entity/DePrincipal.java @@ -1,4 +1,4 @@ -package io.dataease.websocket.entity; +package io.gisbi.websocket.entity; import java.security.Principal; diff --git a/core/core-backend/src/main/java/io/dataease/websocket/factory/DeWebSocketHandlerDecorator.java b/core/core-backend/src/main/java/io/gisbi/websocket/factory/DeWebSocketHandlerDecorator.java similarity index 94% rename from core/core-backend/src/main/java/io/dataease/websocket/factory/DeWebSocketHandlerDecorator.java rename to core/core-backend/src/main/java/io/gisbi/websocket/factory/DeWebSocketHandlerDecorator.java index 68526a6..4782c62 100644 --- a/core/core-backend/src/main/java/io/dataease/websocket/factory/DeWebSocketHandlerDecorator.java +++ b/core/core-backend/src/main/java/io/gisbi/websocket/factory/DeWebSocketHandlerDecorator.java @@ -1,6 +1,6 @@ -package io.dataease.websocket.factory; +package io.gisbi.websocket.factory; -import io.dataease.websocket.util.WsUtil; +import io.gisbi.websocket.util.WsUtil; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.WebSocketSession; diff --git a/core/core-backend/src/main/java/io/dataease/websocket/factory/DeWsHandlerFactory.java b/core/core-backend/src/main/java/io/gisbi/websocket/factory/DeWsHandlerFactory.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/websocket/factory/DeWsHandlerFactory.java rename to core/core-backend/src/main/java/io/gisbi/websocket/factory/DeWsHandlerFactory.java index 44bba8b..9f1fc1b 100644 --- a/core/core-backend/src/main/java/io/dataease/websocket/factory/DeWsHandlerFactory.java +++ b/core/core-backend/src/main/java/io/gisbi/websocket/factory/DeWsHandlerFactory.java @@ -1,4 +1,4 @@ -package io.dataease.websocket.factory; +package io.gisbi.websocket.factory; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.handler.WebSocketHandlerDecoratorFactory; diff --git a/core/core-backend/src/main/java/io/dataease/websocket/handler/PrincipalHandshakeHandler.java b/core/core-backend/src/main/java/io/gisbi/websocket/handler/PrincipalHandshakeHandler.java similarity index 92% rename from core/core-backend/src/main/java/io/dataease/websocket/handler/PrincipalHandshakeHandler.java rename to core/core-backend/src/main/java/io/gisbi/websocket/handler/PrincipalHandshakeHandler.java index 86fd226..f68058a 100644 --- a/core/core-backend/src/main/java/io/dataease/websocket/handler/PrincipalHandshakeHandler.java +++ b/core/core-backend/src/main/java/io/gisbi/websocket/handler/PrincipalHandshakeHandler.java @@ -1,6 +1,6 @@ -package io.dataease.websocket.handler; +package io.gisbi.websocket.handler; -import io.dataease.websocket.entity.DePrincipal; +import io.gisbi.websocket.entity.DePrincipal; import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; import org.springframework.http.server.ServerHttpRequest; diff --git a/core/core-backend/src/main/java/io/dataease/websocket/service/impl/StandaloneWsService.java b/core/core-backend/src/main/java/io/gisbi/websocket/service/impl/StandaloneWsService.java similarity index 84% rename from core/core-backend/src/main/java/io/dataease/websocket/service/impl/StandaloneWsService.java rename to core/core-backend/src/main/java/io/gisbi/websocket/service/impl/StandaloneWsService.java index 8f0d781..4c07802 100644 --- a/core/core-backend/src/main/java/io/dataease/websocket/service/impl/StandaloneWsService.java +++ b/core/core-backend/src/main/java/io/gisbi/websocket/service/impl/StandaloneWsService.java @@ -1,7 +1,7 @@ -package io.dataease.websocket.service.impl; +package io.gisbi.websocket.service.impl; -import io.dataease.websocket.WsMessage; -import io.dataease.websocket.WsService; +import io.gisbi.websocket.WsMessage; +import io.gisbi.websocket.WsService; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.springframework.messaging.simp.SimpMessagingTemplate; diff --git a/core/core-backend/src/main/java/io/dataease/websocket/util/WsUtil.java b/core/core-backend/src/main/java/io/gisbi/websocket/util/WsUtil.java similarity index 90% rename from core/core-backend/src/main/java/io/dataease/websocket/util/WsUtil.java rename to core/core-backend/src/main/java/io/gisbi/websocket/util/WsUtil.java index fdb613d..947dc3d 100644 --- a/core/core-backend/src/main/java/io/dataease/websocket/util/WsUtil.java +++ b/core/core-backend/src/main/java/io/gisbi/websocket/util/WsUtil.java @@ -1,8 +1,8 @@ -package io.dataease.websocket.util; +package io.gisbi.websocket.util; -import io.dataease.auth.bo.TokenUserBO; -import io.dataease.utils.AuthUtils; +import io.gisbi.auth.bo.TokenUserBO; +import io.gisbi.utils.AuthUtils; import org.apache.commons.lang3.ObjectUtils; import java.util.concurrent.CopyOnWriteArraySet; diff --git a/core/core-backend/src/main/resources/application-desktop.yml b/core/core-backend/src/main/resources/application-desktop.yml deleted file mode 100644 index 7c9932c..0000000 --- a/core/core-backend/src/main/resources/application-desktop.yml +++ /dev/null @@ -1,25 +0,0 @@ - -spring: - - datasource: - driver-class-name: org.h2.Driver - url: jdbc:h2:/opt/dataease2.0/desktop;AUTO_SERVER=TRUE;AUTO_RECONNECT=TRUE;MODE=MySQL;CASE_INSENSITIVE_IDENTIFIERS=TRUE;DATABASE_TO_UPPER=FALSE - username: sa - password: 123456 - - h2: - console: - enabled: true - path: /h2-console - messages: - basename: i18n/core - flyway: - enabled: true - table: de_desktop_version - validate-on-migrate: false - locations: classpath:db/desktop - baseline-on-migrate: true - out-of-order: true - -mybatis-plus: - mapper-locations: classpath:mybatis/*.xml diff --git a/core/core-backend/src/main/resources/application-distributed.yml b/core/core-backend/src/main/resources/application-distributed.yml deleted file mode 100644 index ed0fc3b..0000000 --- a/core/core-backend/src/main/resources/application-distributed.yml +++ /dev/null @@ -1,28 +0,0 @@ - -spring: - - cloud: - nacos: - discovery: - enabled: true - server-addr: 127.0.0.1:8848 - datasource: - url: jdbc:mysql://localhost:3306/de_manage?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false - username: root - password: 1qaz@WSX - flyway: - enabled: false - messages: - basename: i18n/core - - -dynamic: - datasource: - official-ds: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/de_official?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false - username: root - password: 1qaz@WSX - -mybatis-plus: - mapper-locations: classpath:mybatis/*.xml diff --git a/core/core-backend/src/main/resources/application-standalone.yml b/core/core-backend/src/main/resources/application-standalone.yml index 9fecd55..8d830ab 100644 --- a/core/core-backend/src/main/resources/application-standalone.yml +++ b/core/core-backend/src/main/resources/application-standalone.yml @@ -1,8 +1,5 @@ spring: datasource: -# url: jdbc:mysql://localhost:3306/dataease?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true -# username: root -# password: 123456 url: jdbc:mysql://121.37.111.42:3306/dataease?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true username: root password: mysql_F8ysiK@2024 diff --git a/core/core-backend/src/main/resources/application.yml b/core/core-backend/src/main/resources/application.yml index 498dc93..1d46ca7 100644 --- a/core/core-backend/src/main/resources/application.yml +++ b/core/core-backend/src/main/resources/application.yml @@ -34,7 +34,7 @@ mybatis: map-underscore-to-camel-case: true logging: file: - path: /opt/dataease2.0/logs/dataease + path: /opt/gisbi1.0/logs/gisbi # sql日志生产环境注释掉 #mybatis-plus: # configuration: @@ -44,7 +44,7 @@ quartz: enabled: true scheduler-name: deSyncJob -dataease: +gisbi: version: '@project.version@' login_timeout: 2880 xpack-front-distributed: true diff --git a/core/core-backend/src/main/resources/db/desktop/V2.0__core_ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.0__core_ddl.sql deleted file mode 100644 index 8d1fa06..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.0__core_ddl.sql +++ /dev/null @@ -1,4250 +0,0 @@ --- ---------------------------- --- Table structure for datasource --- ---------------------------- -DROP TABLE IF EXISTS `core_datasource`; -CREATE TABLE `core_datasource` -( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `name` varchar(255) NOT NULL COMMENT '名称', - `description` varchar(255) DEFAULT NULL COMMENT '描述', - `type` varchar(50) NOT NULL COMMENT '类型', - `pid` bigint DEFAULT NULL COMMENT '父级ID', - `edit_type` varchar(50) COMMENT '更新方式:0:替换;1:追加', - `configuration` longtext NOT NULL COMMENT '详细信息', - `create_time` bigint NOT NULL COMMENT '创建时间', - `update_time` bigint NOT NULL COMMENT '更新时间', - `create_by` varchar(50) DEFAULT NULL COMMENT '创建人ID', - `status` longtext COMMENT '状态', - `qrtz_instance` longtext COMMENT '状态', - `task_status` varchar(50) DEFAULT NULL COMMENT '任务状态', - PRIMARY KEY (`id`) -); - -DROP TABLE IF EXISTS `core_driver`; -CREATE TABLE `core_driver` -( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `name` varchar(50) NOT NULL COMMENT '名称', - `create_time` bigint(13) NOT NULL COMMENT '创建时间', - `type` varchar(255) DEFAULT NULL COMMENT '数据源类型', - `driver_class` varchar(255) DEFAULT NULL COMMENT '驱动类', - `description` varchar(255) DEFAULT NULL COMMENT '描述', - PRIMARY KEY (`id`) -); - -DROP TABLE IF EXISTS `core_driver_jar`; -CREATE TABLE `core_driver_jar` -( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `de_driver_id` varchar(50) NOT NULL COMMENT '驱动主键', - `file_name` varchar(255) DEFAULT NULL COMMENT '名称', - `version` varchar(255) DEFAULT NULL COMMENT '版本', - `driver_class` longtext COMMENT '驱动类', - `trans_name` varchar(255) DEFAULT NULL, - `is_trans_name` tinyint(1) DEFAULT NULL, - PRIMARY KEY (`id`) -); - - --- --- Table structure for table `core_menu` --- - -DROP TABLE IF EXISTS `core_menu`; -CREATE TABLE `core_menu` -( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `pid` bigint unsigned NOT NULL COMMENT '父ID', - `type` int DEFAULT NULL COMMENT '类型', - `name` varchar(45) DEFAULT NULL COMMENT '名称', - `component` varchar(45) DEFAULT NULL COMMENT '组件', - `menu_sort` int DEFAULT NULL COMMENT '排序', - `icon` varchar(45) DEFAULT NULL COMMENT '图标', - `path` varchar(45) DEFAULT NULL COMMENT '路径', - `hidden` tinyint(1) NOT NULL DEFAULT '0' COMMENT '隐藏', - `in_layout` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否内部', - `auth` tinyint(1) NOT NULL DEFAULT '0' COMMENT '参与授权', - PRIMARY KEY (`id`) -); - --- --- Dumping data for table `core_menu` --- - - -INSERT INTO `core_menu` -VALUES (1, 0, 2, 'workbranch', 'workbranch', 1, NULL, '/workbranch', 0, 1, 1), - (2, 0, 2, 'panel', 'visualized/view/panel', 2, NULL, '/panel', 0, 1, 1), - (3, 0, 2, 'screen', 'visualized/view/screen', 3, NULL, '/screen', 0, 1, 1), - (4, 0, 1, 'data', NULL, 4, NULL, '/data', 0, 1, 0), - (5, 4, 2, 'dataset', 'visualized/data/dataset', 1, NULL, '/dataset', 0, 1, 1), - (6, 4, 2, 'datasource', 'visualized/data/datasource', 2, NULL, '/datasource', 0, 1, 1), - (11, 0, 2, 'dataset-form', 'visualized/data/dataset/form', 7, NULL, '/dataset-form', 1, 0, 0), - (12, 0, 2, 'datasource-form', 'visualized/data/datasource/form', 7, NULL, '/ds-form', 1, 0, 0), - (15, 0, 1, 'sys-setting', NULL, 6, NULL, '/sys-setting', 1, 1, 0), - (16, 15, 2, 'parameter', 'system/parameter', 1, 'sys-parameter', '/parameter', 0, 1, 0); - - -DROP TABLE IF EXISTS `core_dataset_group`; -CREATE TABLE `core_dataset_group` -( - `id` bigint NOT NULL COMMENT 'ID', - `name` varchar(128) DEFAULT NULL COMMENT '名称', - `pid` bigint DEFAULT NULL COMMENT '父级ID', - `level` int(10) DEFAULT '0' COMMENT '当前分组处于第几级', - `node_type` varchar(50) NOT NULL COMMENT 'node类型:folder or dataset', - `type` varchar(50) DEFAULT NULL COMMENT 'sql,union', - `mode` int DEFAULT '0' COMMENT '连接模式:0-直连,1-同步(包括excel、api等数据存在de中的表)', - `info` longtext COMMENT '关联关系树', - `create_by` varchar(50) DEFAULT NULL COMMENT '创建人ID', - `create_time` bigint DEFAULT NULL COMMENT '创建时间', - `qrtz_instance` varchar(1024) DEFAULT NULL, - `sync_status` varchar(45) DEFAULT NULL COMMENT '同步状态', - `update_by` varchar(50) DEFAULT NULL COMMENT '更新人ID', - `last_update_time` bigint DEFAULT '0' COMMENT '最后同步时间', - `union_sql` longtext COMMENT '关联sql', - PRIMARY KEY (`id`) -); - -DROP TABLE IF EXISTS `core_dataset_table`; -CREATE TABLE `core_dataset_table` -( - `id` bigint NOT NULL COMMENT 'ID', - `name` varchar(128) DEFAULT NULL COMMENT '名称', - `table_name` varchar(128) DEFAULT NULL COMMENT '物理表名', - `datasource_id` bigint DEFAULT NULL COMMENT '数据源ID', - `dataset_group_id` bigint NOT NULL COMMENT '数据集ID', - `type` varchar(50) DEFAULT NULL COMMENT 'db,sql,union,excel,api', - `info` longtext COMMENT '表原始信息,表名,sql等', - `sql_variable_details` longtext COMMENT 'SQL参数', - PRIMARY KEY (`id`) -); - -DROP TABLE IF EXISTS `core_dataset_table_field`; -CREATE TABLE `core_dataset_table_field` -( - `id` bigint NOT NULL COMMENT 'ID', - `datasource_id` bigint DEFAULT NULL COMMENT '数据源ID', - `dataset_table_id` bigint DEFAULT NULL COMMENT '数据表ID', - `dataset_group_id` bigint DEFAULT NULL COMMENT '数据集ID', - `chart_id` bigint DEFAULT NULL COMMENT '图表ID', - `origin_name` longtext NOT NULL COMMENT '原始字段名', - `name` longtext DEFAULT NULL COMMENT '字段名用于展示', - `description` longtext DEFAULT NULL COMMENT '描述', - `dataease_name` varchar(255) DEFAULT NULL COMMENT 'de字段名用作唯一标识', - `field_short_name` varchar(255) DEFAULT NULL COMMENT 'de字段别名', - `group_type` varchar(50) DEFAULT NULL COMMENT '维度/指标标识 d:维度,q:指标', - `type` varchar(255) NOT NULL COMMENT '原始字段类型', - `size` int DEFAULT NULL, - `de_type` int NOT NULL COMMENT 'dataease字段类型:0-文本,1-时间,2-整型数值,3-浮点数值,4-布尔,5-地理位置,6-二进制,7-URL', - `de_extract_type` int NOT NULL COMMENT 'de记录的原始类型', - `ext_field` int DEFAULT NULL COMMENT '是否扩展字段 0原始 1复制 2计算字段...', - `checked` tinyint(1) DEFAULT '1' COMMENT '是否选中', - `column_index` int DEFAULT NULL COMMENT '列位置', - `last_sync_time` bigint DEFAULT NULL COMMENT '同步时间', - `accuracy` int DEFAULT '0' COMMENT '精度', - `date_format` varchar(255) DEFAULT NULL, - `date_format_type` varchar(255) DEFAULT NULL COMMENT '时间格式类型', - PRIMARY KEY (`id`) -); - --- --- Table structure for table `core_rsa` --- -DROP TABLE IF EXISTS `core_rsa`; -CREATE TABLE `core_rsa` -( - `id` int NOT NULL COMMENT '主键', - `private_key` text NOT NULL COMMENT '私钥', - `public_key` text NOT NULL COMMENT '公钥', - `create_time` bigint NOT NULL COMMENT '生成时间', - `aes_key` text NOT NULL, - PRIMARY KEY (`id`) -); - -DROP TABLE IF EXISTS `data_visualization_info`; -CREATE TABLE `data_visualization_info` -( - `id` varchar(50) NOT NULL, - `name` varchar(255) DEFAULT NULL COMMENT '名称', - `pid` varchar(50) DEFAULT NULL COMMENT '父id', - `org_id` varchar(50) DEFAULT NULL COMMENT '所属组织id', - `level` int DEFAULT NULL COMMENT '层级', - `node_type` varchar(255) DEFAULT NULL COMMENT '节点类型 folder or panel 目录或者文件夹', - `type` varchar(50) DEFAULT NULL COMMENT '类型', - `canvas_style_data` longtext COMMENT '样式数据', - `component_data` longtext COMMENT '组件数据', - `mobile_layout` varchar(255) DEFAULT NULL COMMENT '移动端布局', - `status` int DEFAULT '1' COMMENT '状态 0-未发布 1-已发布', - `self_watermark_status` int DEFAULT '0' COMMENT '是否单独打开水印 0-关闭 1-开启', - `sort` int DEFAULT '0' COMMENT '排序', - `create_time` bigint DEFAULT NULL COMMENT '创建时间', - `create_by` varchar(255) DEFAULT NULL COMMENT '创建人', - `update_time` bigint DEFAULT NULL COMMENT '更新时间', - `update_by` varchar(255) DEFAULT NULL COMMENT '更新人', - `remark` varchar(255) DEFAULT NULL COMMENT '备注', - `source` varchar(255) DEFAULT NULL COMMENT '数据来源', - `delete_flag` tinyint(1) DEFAULT '0' COMMENT '删除标志', - `delete_time` bigint DEFAULT NULL COMMENT '删除时间', - `delete_by` varchar(255) DEFAULT NULL COMMENT '删除人', - PRIMARY KEY (`id`) -); - - -DROP TABLE IF EXISTS `core_datasource_task`; -CREATE TABLE `core_datasource_task` -( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `ds_id` bigint NOT NULL COMMENT '数据源ID', - `name` varchar(255) NOT NULL COMMENT '任务名称', - `update_type` varchar(50) NOT NULL COMMENT '更新方式', - `start_time` bigint(13) DEFAULT NULL COMMENT '开始时间', - `sync_rate` varchar(50) NOT NULL COMMENT '执行频率:0 一次性 1 cron', - `cron` varchar(255) DEFAULT NULL COMMENT 'cron表达式', - `simple_cron_value` bigint(13) DEFAULT NULL COMMENT '简单重复间隔', - `simple_cron_type` varchar(50) DEFAULT NULL COMMENT '简单重复类型:分、时、天', - `end_limit` varchar(50) DEFAULT NULL COMMENT '结束限制 0 无限制 1 设定结束时间', - `end_time` bigint(13) DEFAULT NULL COMMENT '结束时间', - `create_time` bigint(13) DEFAULT NULL COMMENT '创建时间', - `last_exec_time` bigint(13) DEFAULT NULL COMMENT '上次执行时间', - `last_exec_status` varchar(50) DEFAULT NULL COMMENT '上次执行结果', - `extra_data` longtext, - `task_status` varchar(50) DEFAULT NULL COMMENT '任务状态', - PRIMARY KEY (`id`) -); - -DROP TABLE IF EXISTS `core_datasource_task_log`; -CREATE TABLE `core_datasource_task_log` -( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `ds_id` bigint(13) NOT NULL COMMENT '数据源ID', - `task_id` bigint(13) DEFAULT NULL COMMENT '任务ID', - `start_time` bigint(13) DEFAULT NULL COMMENT '开始时间', - `end_time` bigint(13) DEFAULT NULL COMMENT '结束时间', - `task_status` varchar(50) NOT NULL COMMENT '执行状态', - `table_name` varchar(255) NOT NULL COMMENT '表名', - `info` longtext COMMENT '错误信息', - `create_time` bigint(13) DEFAULT NULL COMMENT '创建时间', - `trigger_type` varchar(45) DEFAULT NULL, - PRIMARY KEY (`id`), - KEY `idx_dataset_table_task_log_ds_id` (`ds_id`), - KEY `idx_dataset_table_task_log_task_id` (`task_id`) -); - -DROP TABLE IF EXISTS `core_de_engine`; -CREATE TABLE `core_de_engine` -( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `name` varchar(50) DEFAULT NULL COMMENT '名称', - `description` varchar(50) DEFAULT NULL COMMENT '描述', - `type` varchar(50) NOT NULL COMMENT '类型', - `configuration` longtext NOT NULL COMMENT '详细信息', - `create_time` bigint(13) DEFAULT NULL COMMENT 'Create timestamp', - `update_time` bigint(13) DEFAULT NULL COMMENT 'Update timestamp', - `create_by` varchar(50) DEFAULT NULL COMMENT '创建人ID', - `status` varchar(45) DEFAULT NULL COMMENT '状态', - PRIMARY KEY (`id`) -); - -DROP TABLE IF EXISTS `core_chart_view`; -CREATE TABLE `core_chart_view` -( - `id` bigint NOT NULL COMMENT 'ID', - `title` varchar(1024) DEFAULT NULL COMMENT '标题', - `scene_id` bigint NOT NULL COMMENT '场景ID chart_type为private的时候 是仪表板id', - `table_id` bigint DEFAULT NULL COMMENT '数据集表ID', - `type` varchar(50) DEFAULT NULL COMMENT '图表类型', - `render` varchar(50) DEFAULT NULL COMMENT '图表渲染方式', - `result_count` int DEFAULT NULL COMMENT '展示结果', - `result_mode` varchar(50) DEFAULT NULL COMMENT '展示模式', - `x_axis` longtext COMMENT '横轴field', - `x_axis_ext` longtext COMMENT 'table-row', - `y_axis` longtext COMMENT '纵轴field', - `y_axis_ext` longtext COMMENT '副轴', - `ext_stack` longtext COMMENT '堆叠项', - `ext_bubble` longtext COMMENT '气泡大小', - `ext_label` longtext COMMENT '动态标签', - `ext_tooltip` longtext COMMENT '动态提示', - `custom_attr` longtext COMMENT '图形属性', - `custom_style` longtext COMMENT '组件样式', - `custom_filter` longtext COMMENT '结果过滤', - `drill_fields` longtext COMMENT '钻取字段', - `senior` longtext COMMENT '高级', - `create_by` varchar(50) DEFAULT NULL COMMENT '创建人ID', - `create_time` bigint DEFAULT NULL COMMENT '创建时间', - `update_time` bigint DEFAULT NULL COMMENT '更新时间', - `snapshot` longtext COMMENT '缩略图 ', - `style_priority` varchar(255) DEFAULT 'panel' COMMENT '样式优先级 panel 仪表板 view 图表', - `chart_type` varchar(255) DEFAULT 'private' COMMENT '图表类型 public 公共 历史可复用的图表,private 私有 专属某个仪表板', - `is_plugin` bit(1) DEFAULT NULL COMMENT '是否插件', - `data_from` varchar(255) DEFAULT 'dataset' COMMENT '数据来源 template 模板数据 dataset 数据集数据', - `view_fields` longtext COMMENT '图表字段集合', - `refresh_view_enable` tinyint(1) DEFAULT 0 COMMENT '是否开启刷新', - `refresh_unit` varchar(255) DEFAULT 'minute' COMMENT '刷新时间单位', - `refresh_time` int DEFAULT 5 COMMENT '刷新时间', - `linkage_active` tinyint(1) DEFAULT 0 COMMENT '是否开启联动', - `jump_active` tinyint(1) DEFAULT 0 COMMENT '是否开启跳转', - `copy_from` bigint DEFAULT NULL COMMENT '复制来源', - `copy_id` bigint DEFAULT NULL COMMENT '复制ID', - PRIMARY KEY (`id`) -); - -DROP TABLE IF EXISTS `area`; -CREATE TABLE `area` -( - `id` varchar(255) NOT NULL COMMENT '区域id,和文件对应', - `level` varchar(255) DEFAULT NULL COMMENT '区域级别,从高到低country,province,city,district,更细的待定', - `name` varchar(255) DEFAULT NULL COMMENT '区域名称', - `pid` varchar(255) NOT NULL COMMENT '父级区域id', - PRIMARY KEY (`id`) -); - -INSERT INTO area(id, name, level, pid) -VALUES ('156', '中国', 'country', '000'); -INSERT INTO area (id, level, name, pid) -VALUES ('156110000', 'province', '北京市', '156'), - ('156420000', 'province', '湖北省', '156'), - ('156450000', 'province', '广西壮族自治区', '156'), - ('156220000', 'province', '吉林省', '156'), - ('156340000', 'province', '安徽省', '156'), - ('156140000', 'province', '山西省', '156'), - ('156530000', 'province', '云南省', '156'), - ('156650000', 'province', '新疆维吾尔自治区', '156'), - ('156350000', 'province', '福建省', '156'), - ('156360000', 'province', '江西省', '156'), - ('156440000', 'province', '广东省', '156'), - ('156510000', 'province', '四川省', '156'), - ('156310000', 'province', '上海市', '156'), - ('156710000', 'province', '台湾省', '156'), - ('156620000', 'province', '甘肃省', '156'), - ('156150000', 'province', '内蒙古自治区', '156'), - ('156130000', 'province', '河北省', '156'), - ('156410000', 'province', '河南省', '156'), - ('156630000', 'province', '青海省', '156'), - ('156320000', 'province', '江苏省', '156'), - ('156500000', 'province', '重庆市', '156'), - ('156640000', 'province', '宁夏回族自治区', '156'), - ('156460000', 'province', '海南省', '156'), - ('156230000', 'province', '黑龙江省', '156'), - ('156820000', 'province', '澳门特别行政区', '156'), - ('156540000', 'province', '西藏自治区', '156'), - ('156370000', 'province', '山东省', '156'), - ('156610000', 'province', '陕西省', '156'), - ('156810000', 'province', '香港特别行政区', '156'), - ('156520000', 'province', '贵州省', '156'), - ('156120000', 'province', '天津市', '156'), - ('156430000', 'province', '湖南省', '156'), - ('156210000', 'province', '辽宁省', '156'), - ('156330000', 'province', '浙江省', '156'); -INSERT INTO area (id, level, name, pid) -VALUES ('156411200', 'city', '三门峡市', '156410000'), - ('156411500', 'city', '信阳市', '156410000'), - ('156211400', 'city', '葫芦岛市', '156210000'), - ('156513300', 'city', '甘孜藏族自治州', '156510000'), - ('156520500', 'city', '毕节市', '156520000'), - ('156370400', 'city', '枣庄市', '156370000'), - ('156654300', 'city', '阿勒泰地区', '156650000'), - ('156623000', 'city', '甘南藏族自治州', '156620000'), - ('156652300', 'city', '昌吉回族自治州', '156650000'), - ('156532300', 'city', '楚雄彝族自治州', '156530000'), - ('156340800', 'city', '安庆市', '156340000'), - ('156331100', 'city', '丽水市', '156330000'), - ('156410800', 'city', '焦作市', '156410000'), - ('156341600', 'city', '亳州市', '156340000'), - ('156530300', 'city', '曲靖市', '156530000'), - ('156653200', 'city', '和田地区', '156650000'), - ('156445200', 'city', '揭阳市', '156440000'), - ('156610600', 'city', '延安市', '156610000'), - ('156510600', 'city', '德阳市', '156510000'), - ('156450900', 'city', '玉林市', '156450000'), - ('156622900', 'city', '临夏回族自治州', '156620000'), - ('156340200', 'city', '芜湖市', '156340000'), - ('156411000', 'city', '许昌市', '156410000'), - ('156411600', 'city', '周口市', '156410000'), - ('156610300', 'city', '宝鸡市', '156610000'), - ('156640500', 'city', '中卫市', '156640000'), - ('156430900', 'city', '益阳市', '156430000'), - ('156340300', 'city', '蚌埠市', '156340000'), - ('156360100', 'city', '南昌市', '156360000'), - ('156420500', 'city', '宜昌市', '156420000'), - ('156411700', 'city', '驻马店市', '156410000'), - ('156330200', 'city', '宁波市', '156330000'), - ('156110100', 'city', '北京市', '156110000'), - ('156152500', 'city', '锡林郭勒盟', '156150000'), - ('156360600', 'city', '鹰潭市', '156360000'), - ('156230300', 'city', '鸡西市', '156230000'), - ('156331000', 'city', '台州市', '156330000'), - ('156530600', 'city', '昭通市', '156530000'), - ('156430100', 'city', '长沙市', '156430000'), - ('156610100', 'city', '西安市', '156610000'), - ('156340500', 'city', '马鞍山市', '156340000'), - ('156220100', 'city', '长春市', '156220000'), - ('156420600', 'city', '襄阳市', '156420000'), - ('156230900', 'city', '七台河市', '156230000'), - ('156431200', 'city', '怀化市', '156430000'), - ('156450200', 'city', '柳州市', '156450000'), - ('156430500', 'city', '邵阳市', '156430000'), - ('156510400', 'city', '攀枝花市', '156510000'), - ('156410100', 'city', '郑州市', '156410000'), - ('156441900', 'city', '东莞市', '156440000'), - ('156513400', 'city', '凉山彝族自治州', '156510000'), - ('156654200', 'city', '塔城地区', '156650000'), - ('156611000', 'city', '商洛市', '156610000'), - ('156430400', 'city', '衡阳市', '156430000'), - ('156532800', 'city', '西双版纳傣族自治州', '156530000'), - ('156540500', 'city', '山南市', '156540000'), - ('156231200', 'city', '绥化市', '156230000'), - ('156421000', 'city', '荆州市', '156420000'), - ('156210600', 'city', '丹东市', '156210000'), - ('156360800', 'city', '吉安市', '156360000'), - ('156330400', 'city', '嘉兴市', '156330000'), - ('156652700', 'city', '博尔塔拉蒙古自治州', '156650000'), - ('156230800', 'city', '佳木斯市', '156230000'), - ('156440600', 'city', '佛山市', '156440000'), - ('156320500', 'city', '苏州市', '156320000'), - ('156140600', 'city', '朔州市', '156140000'), - ('156340100', 'city', '合肥市', '156340000'), - ('156430300', 'city', '湘潭市', '156430000'), - ('156350600', 'city', '漳州市', '156350000'), - ('156360500', 'city', '新余市', '156360000'), - ('156632800', 'city', '海西蒙古族藏族自治州', '156630000'), - ('156620900', 'city', '酒泉市', '156620000'), - ('156131100', 'city', '衡水市', '156130000'), - ('156220800', 'city', '白城市', '156220000'), - ('156530500', 'city', '保山市', '156530000'), - ('156210200', 'city', '大连市', '156210000'), - ('156210400', 'city', '抚顺市', '156210000'), - ('156511700', 'city', '达州市', '156510000'), - ('156130600', 'city', '保定市', '156130000'), - ('156430200', 'city', '株洲市', '156430000'), - ('156210500', 'city', '本溪市', '156210000'), - ('156340700', 'city', '铜陵市', '156340000'), - ('156370300', 'city', '淄博市', '156370000'), - ('156211100', 'city', '盘锦市', '156210000'), - ('156210800', 'city', '营口市', '156210000'), - ('156510700', 'city', '绵阳市', '156510000'), - ('156220600', 'city', '白山市', '156220000'), - ('156511100', 'city', '乐山市', '156510000'), - ('156632700', 'city', '玉树藏族自治州', '156630000'), - ('156141000', 'city', '临汾市', '156140000'), - ('156441700', 'city', '阳江市', '156440000'), - ('156520300', 'city', '遵义市', '156520000'), - ('156620300', 'city', '金昌市', '156620000'), - ('156211300', 'city', '朝阳市', '156210000'), - ('156360700', 'city', '赣州市', '156360000'), - ('156321300', 'city', '宿迁市', '156320000'), - ('156141100', 'city', '吕梁市', '156140000'), - ('156320100', 'city', '南京市', '156320000'), - ('156421300', 'city', '随州市', '156420000'), - ('156533100', 'city', '德宏傣族景颇族自治州', '156530000'), - ('156211200', 'city', '铁岭市', '156210000'), - ('156231000', 'city', '牡丹江市', '156230000'), - ('156610700', 'city', '汉中市', '156610000'), - ('156530100', 'city', '昆明市', '156530000'), - ('156520200', 'city', '六盘水市', '156520000'), - ('156511600', 'city', '广安市', '156510000'), - ('156420900', 'city', '孝感市', '156420000'), - ('156130400', 'city', '邯郸市', '156130000'), - ('156421100', 'city', '黄冈市', '156420000'), - ('156440400', 'city', '珠海市', '156440000'), - ('156512000', 'city', '资阳市', '156510000'), - ('156150300', 'city', '乌海市', '156150000'), - ('156150900', 'city', '乌兰察布市', '156150000'), - ('156610800', 'city', '榆林市', '156610000'), - ('156640400', 'city', '固原市', '156640000'), - ('156441400', 'city', '梅州市', '156440000'), - ('156410500', 'city', '安阳市', '156410000'), - ('156330700', 'city', '金华市', '156330000'), - ('156640100', 'city', '银川市', '156640000'), - ('156632500', 'city', '海南藏族自治州', '156630000'), - ('156321200', 'city', '泰州市', '156320000'), - ('156140500', 'city', '晋城市', '156140000'), - ('156632200', 'city', '海北藏族自治州', '156630000'), - ('156522600', 'city', '黔东南苗族侗族自治州', '156520000'), - ('156410600', 'city', '鹤壁市', '156410000'), - ('156650100', 'city', '乌鲁木齐市', '156650000'), - ('156410300', 'city', '洛阳市', '156410000'), - ('156419000', 'city', '省直辖县级行政区划', '156410000'), - ('156232700', 'city', '大兴安岭地区', '156230000'), - ('156420100', 'city', '武汉市', '156420000'), - ('156370900', 'city', '泰安市', '156370000'), - ('156621000', 'city', '庆阳市', '156620000'), - ('156510900', 'city', '遂宁市', '156510000'), - ('156360900', 'city', '宜春市', '156360000'), - ('156460200', 'city', '三亚市', '156460000'), - ('156511300', 'city', '南充市', '156510000'), - ('156150600', 'city', '鄂尔多斯市', '156150000'), - ('156540600', 'city', '那曲市', '156540000'), - ('156511000', 'city', '内江市', '156510000'), - ('156341700', 'city', '池州市', '156340000'), - ('156140300', 'city', '阳泉市', '156140000'), - ('156360200', 'city', '景德镇市', '156360000'), - ('156410200', 'city', '开封市', '156410000'), - ('156650400', 'city', '吐鲁番市', '156650000'), - ('156650500', 'city', '哈密市', '156650000'), - ('156654000', 'city', '伊犁哈萨克自治州', '156650000'), - ('156371700', 'city', '菏泽市', '156370000'), - ('156610900', 'city', '安康市', '156610000'), - ('156450300', 'city', '桂林市', '156450000'), - ('156370200', 'city', '青岛市', '156370000'), - ('156522700', 'city', '黔南布依族苗族自治州', '156520000'), - ('156450100', 'city', '南宁市', '156450000'), - ('156320600', 'city', '南通市', '156320000'), - ('156150800', 'city', '巴彦淖尔市', '156150000'), - ('156350800', 'city', '龙岩市', '156350000'), - ('156411400', 'city', '商丘市', '156410000'), - ('156460300', 'city', '三沙市', '156460000'), - ('156310100', 'city', '上海市', '156310000'), - ('156230500', 'city', '双鸭山市', '156230000'), - ('156411100', 'city', '漯河市', '156410000'), - ('156632300', 'city', '黄南藏族自治州', '156630000'), - ('156410700', 'city', '新乡市', '156410000'), - ('156350400', 'city', '三明市', '156350000'), - ('156610400', 'city', '咸阳市', '156610000'), - ('156131000', 'city', '廊坊市', '156130000'), - ('156130300', 'city', '秦皇岛市', '156130000'), - ('156620400', 'city', '白银市', '156620000'), - ('156370100', 'city', '济南市', '156370000'), - ('156371100', 'city', '日照市', '156370000'), - ('156520600', 'city', '铜仁市', '156520000'), - ('156360400', 'city', '九江市', '156360000'), - ('156440300', 'city', '深圳市', '156440000'), - ('156130200', 'city', '唐山市', '156130000'), - ('156152900', 'city', '阿拉善盟', '156150000'), - ('156341100', 'city', '滁州市', '156340000'), - ('156340400', 'city', '淮南市', '156340000'), - ('156620600', 'city', '武威市', '156620000'), - ('156230600', 'city', '大庆市', '156230000'), - ('156371300', 'city', '临沂市', '156370000'), - ('156371000', 'city', '威海市', '156370000'), - ('156341500', 'city', '六安市', '156340000'), - ('156422800', 'city', '恩施土家族苗族自治州', '156420000'), - ('156659000', 'city', '自治区直辖县级行政区划', '156650000'), - ('156130800', 'city', '承德市', '156130000'), - ('156441500', 'city', '汕尾市', '156440000'), - ('156442000', 'city', '中山市', '156440000'), - ('156510300', 'city', '自贡市', '156510000'), - ('156410900', 'city', '濮阳市', '156410000'), - ('156630200', 'city', '海东市', '156630000'), - ('156220400', 'city', '辽源市', '156220000'), - ('156330800', 'city', '衢州市', '156330000'), - ('156620700', 'city', '张掖市', '156620000'), - ('156370500', 'city', '东营市', '156370000'), - ('156420200', 'city', '黄石市', '156420000'), - ('156652800', 'city', '巴音郭楞蒙古自治州', '156650000'), - ('156540300', 'city', '昌都市', '156540000'), - ('156451000', 'city', '百色市', '156450000'), - ('156530800', 'city', '普洱市', '156530000'), - ('156430700', 'city', '常德市', '156430000'), - ('156451100', 'city', '贺州市', '156450000'), - ('156653000', 'city', '克孜勒苏柯尔克孜自治州', '156650000'), - ('156371500', 'city', '聊城市', '156370000'), - ('156420300', 'city', '十堰市', '156420000'), - ('156230100', 'city', '哈尔滨市', '156230000'), - ('156440200', 'city', '韶关市', '156440000'), - ('156321100', 'city', '镇江市', '156320000'), - ('156130700', 'city', '张家口市', '156130000'), - ('156370700', 'city', '潍坊市', '156370000'), - ('156130900', 'city', '沧州市', '156130000'), - ('156210300', 'city', '鞍山市', '156210000'), - ('156230700', 'city', '伊春市', '156230000'), - ('156130500', 'city', '邢台市', '156130000'), - ('156320300', 'city', '徐州市', '156320000'), - ('156540400', 'city', '林芝市', '156540000'), - ('156410400', 'city', '平顶山市', '156410000'), - ('156431100', 'city', '永州市', '156430000'), - ('156211000', 'city', '辽阳市', '156210000'), - ('156130100', 'city', '石家庄市', '156130000'), - ('156431300', 'city', '娄底市', '156430000'), - ('156210900', 'city', '阜新市', '156210000'), - ('156533400', 'city', '迪庆藏族自治州', '156530000'), - ('156350900', 'city', '宁德市', '156350000'), - ('156429000', 'city', '省直辖县级行政区划', '156420000'), - ('156620200', 'city', '嘉峪关市', '156620000'), - ('156140100', 'city', '太原市', '156140000'), - ('156340600', 'city', '淮北市', '156340000'), - ('156140900', 'city', '忻州市', '156140000'), - ('156640200', 'city', '石嘴山市', '156640000'), - ('156451400', 'city', '崇左市', '156450000'), - ('156350100', 'city', '福州市', '156350000'), - ('156361000', 'city', '抚州市', '156360000'), - ('156441300', 'city', '惠州市', '156440000'), - ('156330500', 'city', '湖州市', '156330000'), - ('156511800', 'city', '雅安市', '156510000'), - ('156532900', 'city', '大理白族自治州', '156530000'), - ('156430600', 'city', '岳阳 市', '156430000'), - ('156140700', 'city', '晋中市', '156140000'), - ('156510100', 'city', '成都市', '156510000'), - ('156450400', 'city', '梧州市', '156450000'), - ('156431000', 'city', '郴州市', '156430000'), - ('156632600', 'city', '果洛藏族自治州', '156630000'), - ('156520400', 'city', '安顺市', '156520000'), - ('156370600', 'city', '烟台市', '156370000'), - ('156220700', 'city', '松原市', '156220000'), - ('156320700', 'city', '连云港市', '156320000'), - ('156371400', 'city', '德州市', '156370000'), - ('156411300', 'city', '南阳市', '156410000'), - ('156220200', 'city', '吉林市', '156220000'), - ('156140200', 'city', '大同市', '156140000'), - ('156540100', 'city', '拉萨市', '156540000'), - ('156150500', 'city', '通辽市', '156150000'), - ('156440100', 'city', '广州市', '156440000'), - ('156652900', 'city', '阿克苏地区', '156650000'), - ('156460100', 'city', '海口市', '156460000'), - ('156451200', 'city', '河池市', '156450000'), - ('156530400', 'city', '玉溪市', '156530000'), - ('156810100', 'city', '香港特别行政区', '156810000'), - ('156341000', 'city', '黄山市', '156340000'), - ('156230400', 'city', '鹤岗市', '156230000'), - ('156320200', 'city', '无锡市', '156320000'), - ('156220500', 'city', '通化市', '156220000'), - ('156620100', 'city', '兰州市', '156620000'), - ('156321000', 'city', '扬州市', '156320000'), - ('156430800', 'city', '张家界市', '156430000'), - ('156450600', 'city', '防城港市', '156450000'), - ('156445300', 'city', '云浮市', '156440000'), - ('156450700', 'city', '钦州市', '156450000'), - ('156510800', 'city', '广元市', '156510000'), - ('156511400', 'city', '眉山市', '156510000'), - ('156210100', 'city', '沈阳市', '156210000'), - ('156630100', 'city', '西宁市', '156630000'), - ('156640300', 'city', '吴忠市', '156640000'), - ('156445100', 'city', '潮州市', '156440000'), - ('156320400', 'city', '常州市', '156320000'), - ('156360300', 'city', '萍乡市', '156360000'), - ('156440500', 'city', '汕头市', '156440000'), - ('156350300', 'city', '莆田市', '156350000'), - ('156433100', 'city', '湘西土家族苗族自治州', '156430000'), - ('156140800', 'city', '运城市', '156140000'), - ('156150400', 'city', '赤峰市', '156150000'), - ('156621200', 'city', '陇南市', '156620000'), - ('156500100', 'city', '重庆市', '156500000'), - ('156540200', 'city', '日喀则市', '156540000'), - ('156500200', 'city', '县', '156500000'), - ('156320900', 'city', '盐城市', '156320000'), - ('156511500', 'city', '宜宾市', '156510000'), - ('156420700', 'city', '鄂州市', '156420000'), - ('156820100', 'city', '澳门特别行政区', '156820000'), - ('156320800', 'city', '淮安市', '156320000'), - ('156511900', 'city', '巴中市', '156510000'), - ('156460400', 'city', '儋州市', '156460000'), - ('156210700', 'city', '锦州市', '156210000'), - ('156469000', 'city', '省直辖县级行政区划', '156460000'), - ('156441600', 'city', '河源市', '156440000'), - ('156341300', 'city', '宿州市', '156340000'), - ('156150200', 'city', '包头市', '156150000'), - ('156522300', 'city', '黔西南布依族苗族自治州', '156520000'), - ('156152200', 'city', '兴安盟', '156150000'), - ('156350200', 'city', '厦门市', '156350000'), - ('156533300', 'city', '怒江傈僳族自治州', '156530000'), - ('156350700', 'city', '南平市', '156350000'), - ('156710100', 'city', '台湾省', '156710000'), - ('156440800', 'city', '湛江市', '156440000'), - ('156370800', 'city', '济宁市', '156370000'), - ('156530900', 'city', '临沧市', '156530000'), - ('156120100', 'city', '天津市', '156120000'), - ('156440900', 'city', '茂名市', '156440000'), - ('156421200', 'city', '咸宁市', '156420000'), - ('156330600', 'city', '绍兴市', '156330000'), - ('156450500', 'city', '北海市', '156450000'), - ('156653100', 'city', '喀什地区', '156650000'), - ('156620800', 'city', '平凉市', '156620000'), - ('156350500', 'city', '泉州市', '156350000'), - ('156150700', 'city', '呼伦贝尔市', '156150000'), - ('156441800', 'city', '清远市', '156440000'), - ('156532600', 'city', '文山壮族苗族自治州', '156530000'), - ('156330300', 'city', '温州市', '156330000'), - ('156420800', 'city', '荆门市', '156420000'), - ('156621100', 'city', '定西市', '156620000'), - ('156140400', 'city', '长治市', '156140000'), - ('156220300', 'city', '四平市', '156220000'), - ('156150100', 'city', '呼和浩特市', '156150000'), - ('156441200', 'city', '肇庆市', '156440000'), - ('156451300', 'city', '来宾市', '156450000'), - ('156610500', 'city', '渭南市', '156610000'), - ('156330100', 'city', '杭州市', '156330000'), - ('156230200', 'city', '齐齐哈尔市', '156230000'), - ('156341800', 'city', '宣城市', '156340000'), - ('156520100', 'city', '贵阳市', '156520000'), - ('156513200', 'city', '阿坝藏族羌族自 治州', '156510000'), - ('156341200', 'city', '阜阳市', '156340000'), - ('156610200', 'city', '铜川市', '156610000'), - ('156371600', 'city', '滨州市', '156370000'), - ('156510500', 'city', '泸州市', '156510000'), - ('156222400', 'city', '延边朝鲜族自治州', '156220000'), - ('156361100', 'city', '上饶市', '156360000'), - ('156650200', 'city', '克拉玛依市', '156650000'), - ('156620500', 'city', '天水市', '156620000'), - ('156450800', 'city', '贵港市', '156450000'), - ('156231100', 'city', '黑河市', '156230000'), - ('156542500', 'city', '阿里地区', '156540000'), - ('156532500', 'city', '红河哈尼族彝族自治州', '156530000'), - ('156530700', 'city', '丽江市', '156530000'), - ('156330900', 'city', '舟山市', '156330000'), - ('156440700', 'city', '江门市', '156440000'); -INSERT INTO area (id, level, name, pid) -VALUES ('156420526', 'district', '兴山县', '156420500'), - ('156540329', 'district', '洛隆县', '156540300'), - ('156430372', 'district', '湘潭昭山示范区', '156430300'), - ('156340811', 'district', '宜秀区', '156340800'), - ('156130408', 'district', '永年区', '156130400'), - ('156510802', 'district', '利州区', '156510800'), - ('156230407', 'district', '兴山区', '156230400'), - ('156610404', 'district', '渭城区', '156610400'), - ('156110114', 'district', '昌平区', '156110100'), - ('156411527', 'district', '淮滨县', '156411500'), - ('156230202', 'district', '龙沙区', '156230200'), - ('156510623', 'district', '中江县', '156510600'), - ('156441223', 'district', '广宁县', '156441200'), - ('156360103', 'district', '西湖区', '156360100'), - ('156410522', 'district', '安阳县', '156410500'), - ('156331024', 'district', '仙居县', '156331000'), - ('156441203', 'district', '鼎湖区', '156441200'), - ('156610822', 'district', '府谷县', '156610800'), - ('156340822', 'district', '怀宁县', '156340800'), - ('156230882', 'district', '富锦市', '156230800'), - ('156650104', 'district', '新市区', '156650100'), - ('156710020', 'district', '新竹县', '156710100'), - ('156210502', 'district', '平山区', '156210500'), - ('156420624', 'district', '南漳县', '156420600'), - ('156330324', 'district', '永嘉县', '156330300'), - ('156150425', 'district', '克什克腾旗', '156150400'), - ('156361126', 'district', '弋阳县', '156361100'), - ('156440204', 'district', '浈江区', '156440200'), - ('156621024', 'district', '合水县', '156621000'), - ('156140822', 'district', '万荣县', '156140800'), - ('156230281', 'district', '讷河市', '156230200'), - ('156430623', 'district', '华容县', '156430600'), - ('156540321', 'district', '江达县', '156540300'), - ('156350527', 'district', '金门县', '156350500'), - ('156420381', 'district', '丹江口市', '156420300'), - ('156150626', 'district', '乌审旗', '156150600'), - ('156610203', 'district', '印台区', '156610200'), - ('156451229', 'district', '大化瑶族自治县', '156451200'), - ('156350924', 'district', '寿宁县', '156350900'), - ('156469025', 'district', '白沙黎族自治县', '156469000'), - ('156220582', 'district', '集安市', '156220500'), - ('156130731', 'district', '涿鹿县', '156130700'), - ('156230723', 'district', '汤旺县', '156230700'), - ('156450102', 'district', '兴宁区', '156450100'), - ('156510185', 'district', '简阳市', '156510100'), - ('156500236', 'district', '奉节县', '156500200'), - ('156130108', 'district', '裕华区', '156130100'), - ('156630121', 'district', '大通回族土族自治县', '156630100'), - ('156511421', 'district', '仁寿县', '156511400'), - ('156130724', 'district', ' 沽源县', '156130700'), - ('156341702', 'district', '贵池区', '156341700'), - ('156411321', 'district', '南召县', '156411300'), - ('156630102', 'district', '城东区', '156630100'), - ('156640105', 'district', '西夏区', '156640100'), - ('156130403', 'district', '丛台区', '156130400'), - ('156141102', 'district', '离石区', '156141100'), - ('156210204', 'district', '沙河口区', '156210200'), - ('156230303', 'district', '恒山区', '156230300'), - ('156350602', 'district', '芗城区', '156350600'), - ('156511126', 'district', '夹江县', '156511100'), - ('156513221', 'district', '汶川县', '156513200'), - ('156542523', 'district', '噶尔县', '156542500'), - ('156410305', 'district', '涧西区', '156410300'), - ('156320585', 'district', '太仓市', '156320500'), - ('156620121', 'district', '永登县', '156620100'), - ('156231226', 'district', '绥棱县', '156231200'), - ('156370772', 'district', '潍坊滨海经济技术开发区', '156370700'), - ('156310115', 'district', '浦东新区', '156310100'), - ('156410822', 'district', '博爱县', '156410800'), - ('156500113', 'district', '巴南区', '156500100'), - ('156360734', 'district', '寻乌县', '156360700'), - ('156410202', 'district', '龙亭区', '156410200'), - ('156410482', 'district', '汝州市', '156410400'), - ('156420111', 'district', '洪山区', '156420100'), - ('156532801', 'district', '景洪市', '156532800'), - ('156120111', 'district', '西青区', '156120100'), - ('156140703', 'district', '太谷区', '156140700'), - ('156371322', 'district', '郯城县', '156371300'), - ('156140729', 'district', '灵石县', '156140700'), - ('156430723', 'district', '澧县', '156430700'), - ('156650109', 'district', '米东区', '156650100'), - ('156220322', 'district', '梨树县', '156220300'), - ('156431022', 'district', '宜章县', '156431000'), - ('156140525', 'district', '泽州县', '156140500'), - ('156350502', 'district', '鲤城区', '156350500'), - ('156430421', 'district', '衡阳县', '156430400'), - ('156451102', 'district', ' 八步区', '156451100'), - ('156150206', 'district', '白云鄂博矿区', '156150200'), - ('156130821', 'district', '承德县', '156130800'), - ('156440282', 'district', '南雄市', '156440200'), - ('156632701', 'district', '玉树市', '156632700'), - ('156140621', 'district', '山阴县', '156140600'), - ('156640202', 'district', '大武口区', '156640200'), - ('156340523', 'district', '和县', '156340500'), - ('156540628', 'district', '巴青县', '156540600'), - ('156440608', 'district', '高明区', '156440600'), - ('156530825', 'district', '镇沅彝族哈尼族拉祜族自治县', '156530800'), - ('156621228', 'district', '两当县', '156621200'), - ('156520623', 'district', '石阡县', '156520600'), - ('156610582', 'district', '华阴市', '156610500'), - ('156410106', 'district', '上街区', '156410100'), - ('156130506', 'district', '南和区', '156130500'), - ('156370126', 'district', '商河县', '156370100'), - ('156210323', 'district', '岫岩满族自治县', '156210300'), - ('156350628', 'district', '平和县', '156350600'), - ('156370685', 'district', '招远市', '156370600'), - ('156131127', 'district', '景县', '156131100'), - ('156220113', 'district', '九台区', '156220100'), - ('156350921', 'district', '霞浦县', '156350900'), - ('156152571', 'district', '乌拉盖管委会', '156152500'), - ('156530627', 'district', '镇雄县', '156530600'), - ('156430181', 'district', '浏阳市', '156430100'), - ('156522325', 'district', '贞丰县', '156522300'), - ('156361127', 'district', '余干县', '156361100'), - ('156431226', 'district', '麻阳苗族自治县', '156431200'), - ('156320106', 'district', '鼓楼区', '156320100'), - ('156420982', 'district', '安陆市', '156420900'), - ('156371403', 'district', '陵城区', '156371400'), - ('156530111', 'district', '官渡区', '156530100'), - ('156410303', 'district', '西工区', '156410300'), - ('156350125', 'district', '永泰县', '156350100'), - ('156320611', 'district', '港闸区', '156320600'), - ('156420325', 'district', '房县', '156420300'), - ('156230224', 'district', '泰来县', '156230200'), - ('156130321', 'district', '青龙满族自治县', '156130300'), - ('156370572', 'district', '东营港经济开发区', '156370500'), - ('156330105', 'district', '拱墅区', '156330100'), - ('156230718', 'district', '乌翠区', '156230700'), - ('156410506', 'district', '龙安区', '156410500'), - ('156430981', 'district', '沅江市', '156430900'), - ('156320322', 'district', '沛县', '156320300'), - ('156150402', 'district', '红山区', '156150400'), - ('156370827', 'district', '鱼台县', '156370800'), - ('156530322', 'district', '陆良县', '156530300'), - ('156320971', 'district', '盐城经济技术开发区', '156320900'), - ('156440513', 'district', '潮阳区', '156440500'), - ('156810013', 'district', '北区', '156810100'), - ('156421127', 'district', '黄梅县', '156421100'), - ('156330112', 'district', '临安区', '156330100'), - ('156532503', 'district', '蒙自市', '156532500'), - ('156510726', 'district', '北川羌族自治县', '156510700'), - ('156620821', 'district', '泾川县', '156620800'), - ('156140921', 'district', '定襄县', '156140900'), - ('156632857', 'district', '大柴旦行政委员会', '156632800'), - ('156430703', 'district', '鼎城区', '156430700'), - ('156361026', 'district', '宜黄县', '156361000'), - ('156410225', 'district', '兰考县', '156410200'), - ('156610426', 'district', '永寿县', '156610400'), - ('156130635', 'district', '蠡县', '156130600'), - ('156513324', 'district', '九龙县', '156513300'), - ('156371502', 'district', '东昌府区', '156371500'), - ('156410622', 'district', '淇县', '156410600'), - ('156210603', 'district', '振兴区', '156210600'), - ('156659003', 'district', '图木舒克市', '156659000'), - ('156310105', 'district', '长宁区', '156310100'), - ('156130535', 'district', '临西县', '156130500'), - ('156433130', 'district', '龙山县', '156433100'), - ('156510903', 'district', '船山区', '156510900'), - ('156210921', 'district', '阜新蒙古族自治县', '156210900'), - ('156419001', 'district', '济源市', '156419000'), - ('156500106', 'district', '沙坪坝区', '156500100'), - ('156653225', 'district', '策勒县', '156653200'), - ('156321002', 'district', '广陵区', '156321000'), - ('156340882', 'district', '潜山市', '156340800'), - ('156350823', 'district', '上杭县', '156350800'), - ('156431027', 'district', '桂东县', '156431000'), - ('156511822', 'district', '荥经县', '156511800'), - ('156450325', 'district', '兴安县', '156450300'), - ('156431127', 'district', '蓝山县', '156431100'), - ('156230125', 'district', '宾县', '156230100'), - ('156410902', 'district', '华龙区', '156410900'), - ('156430225', 'district', '炎陵县', '156430200'), - ('156450381', 'district', '荔浦市', '156450300'), - ('156110116', 'district', '怀柔区', '156110100'), - ('156530425', 'district', '易门县', '156530400'), - ('156513423', 'district', '盐源县', '156513400'), - ('156370883', 'district', '邹城市', '156370800'), - ('156653001', 'district', '阿图什市', '156653000'), - ('156360402', 'district', '濂溪区', '156360400'), - ('156331022', 'district', '三门县', '156331000'), - ('156469001', 'district', '五指山市', '156469000'), - ('156331126', 'district', '庆元县', '156331100'), - ('156654003', 'district', ' 奎屯市', '156654000'), - ('156610423', 'district', '泾阳县', '156610400'), - ('156410821', 'district', '修武县', '156410800'), - ('156140311', 'district', '郊区', '156140300'), - ('156130926', 'district', '肃宁县', '156130900'), - ('156511823', 'district', '汉源县', '156511800'), - ('156211281', 'district', '调兵山市', '156211200'), - ('156131023', 'district', '永清县', '156131000'), - ('156431227', 'district', '新晃侗族自治县', '156431200'), - ('156520521', 'district', '大方县', '156520500'), - ('156540626', 'district', '索县', '156540600'), - ('156150205', 'district', '石拐区', '156150200'), - ('156320505', 'district', '虎丘区', '156320500'), - ('156440403', 'district', '斗门区', '156440400'), - ('156510403', 'district', '西区', '156510400'), - ('156341171', 'district', '苏滁现代产业园', '156341100'), - ('156451481', 'district', '凭祥市', '156451400'), - ('156533325', 'district', '兰坪白族普米族自治县', '156533300'), - ('156522723', 'district', '贵定县', '156522700'), - ('156130303', 'district', '山海关区', '156130300'), - ('156441481', 'district', '兴宁市', '156441400'), - ('156469005', 'district', '文昌市', '156469000'), - ('156230203', 'district', '建华区', '156230200'), - ('156340303', 'district', '蚌山区', '156340300'), - ('156420114', 'district', '蔡甸区', '156420100'), - ('156340802', 'district', '迎江区', '156340800'), - ('156360821', 'district', '吉安县', '156360800'), - ('156230717', 'district', '伊美区', '156230700'), - ('156420324', 'district', '竹溪县', '156420300'), - ('156220171', 'district', '长春经济技术开发区', '156220100'), - ('156520524', 'district', '织金县', '156520500'), - ('156610625', 'district', '志丹县', '156610600'), - ('156654025', 'district', '新源县', '156654000'), - ('156350206', 'district', '湖里区', '156350200'), - ('156371424', 'district', '临邑县', '156371400'), - ('156340506', 'district', '博望区', '156340500'), - ('156450304', 'district', '象山区', '156450300'), - ('156220283', 'district', '舒兰市', '156220200'), - ('156610116', 'district', '长安区', '156610100'), - ('156150223', 'district', '达尔罕茂明安联合旗', '156150200'), - ('156530628', 'district', '彝良县', '156530600'), - ('156210104', 'district', '大东区', '156210100'), - ('156210422', 'district', '新宾满族自治县', '156210400'), - ('156632221', 'district', '门源回族自治县', '156632200'), - ('156520113', 'district', '白云区', '156520100'), - ('156431121', 'district', '祁阳县', '156431100'), - ('156650422', 'district', '托克逊县', '156650400'), - ('156140224', 'district', '灵丘县', '156140200'), - ('156350123', 'district', '罗源县', '156350100'), - ('156140927', 'district', '神池县', '156140900'), - ('156141181', 'district', '孝义市', '156141100'), - ('156371482', 'district', '禹城市', '156371400'), - ('156610830', 'district', '清涧县', '156610800'), - ('156340302', 'district', '龙子湖区', '156340300'), - ('156231225', 'district', '明水县', '156231200'), - ('156130822', 'district', '兴隆县', '156130800'), - ('156410726', 'district', '延津县', '156410700'), - ('156440703', 'district', '蓬江区', '156440700'), - ('156513301', 'district', '康定市', '156513300'), - ('156640425', 'district', '彭阳县', '156640400'), - ('156610202', 'district', '王益区', '156610200'), - ('156330681', 'district', '诸暨市', '156330600'), - ('156533423', 'district', '维西傈僳族自治县', '156533400'), - ('156500243', 'district', '彭水苗族土家族自治县', '156500200'), - ('156511703', 'district', '达川区', '156511700'), - ('156621221', 'district', '成县', '156621200'), - ('156420625', 'district', '谷城县', '156420600'), - ('156411002', 'district', '魏都区', '156411000'), - ('156640521', 'district', '中宁县', '156640500'), - ('156350702', 'district', '延平区', '156350700'), - ('156610323', 'district', '岐山县', '156610300'), - ('156220702', 'district', '宁江区', '156220700'), - ('156350782', 'district', '武夷山市', '156350700'), - ('156320623', 'district', '如东县', '156320600'), - ('156510725', 'district', '梓潼县', '156510700'), - ('156440811', 'district', '麻章区', '156440800'), - ('156360724', 'district', '上犹县', '156360700'), - ('156211403', 'district', '龙港区', '156211400'), - ('156140271', 'district', '山西大同经济开发区', '156140200'), - ('156540630', 'district', '双湖县', '156540600'), - ('156130372', 'district', '北戴河新区', '156130300'), - ('156130828', 'district', '围场满族蒙古族自治县', '156130800'), - ('156370103', 'district', '市中区', '156370100'), - ('156532932', 'district', '鹤庆县', '156532900'), - ('156640121', 'district', '永宁县', '156640100'), - ('156371312', 'district', '河东区', '156371300'), - ('156141002', 'district', '尧都区', '156141000'), - ('156510106', 'district', '金牛区', '156510100'), - ('156141129', 'district', '中阳县', '156141100'), - ('156450902', 'district', '玉州区', '156450900'), - ('156331121', 'district', '青田县', '156331100'), - ('156522323', 'district', '普安县', '156522300'), - ('156140226', 'district', '左云县', '156140200'), - ('156230826', 'district', '桦川县', '156230800'), - ('156653131', 'district', '塔什库尔干塔吉克自治县', '156653100'), - ('156445122', 'district', '饶平县', '156445100'), - ('156520602', 'district', '碧江区', '156520600'), - ('156371524', 'district', '东阿县', '156371500'), - ('156540621', 'district', '嘉黎县', '156540600'), - ('156371425', 'district', '齐河县', '156371400'), - ('156430271', 'district', '云龙示范区', '156430200'), - ('156430302', 'district', '雨湖区', '156430300'), - ('156141128', 'district', '方山县', '156141100'), - ('156341723', 'district', '青阳县', '156341700'), - ('156360602', 'district', '月湖区', '156360600'), - ('156131128', 'district', '阜城县', '156131100'), - ('156210882', 'district', '大石桥市', '156210800'), - ('156360603', 'district', '余江区', '156360600'), - ('156630123', 'district', '湟源县', '156630100'), - ('156341525', 'district', '霍山县', '156341500'), - ('156411681', 'district', '项城市', '156411600'), - ('156370214', 'district', '城阳区', '156370200'), - ('156430422', 'district', '衡南县', '156430400'), - ('156130730', 'district', '怀来县', '156130700'), - ('156220622', 'district', '靖宇县', '156220600'), - ('156210781', 'district', '凌海市', '156210700'), - ('156540233', 'district', '亚东县', '156540200'), - ('156320508', 'district', '姑苏区', '156320500'), - ('156421124', 'district', '英山县', '156421100'), - ('156230803', 'district', '向阳区', '156230800'), - ('156330109', 'district', '萧山区', '156330100'), - ('156130727', 'district', '阳原县', '156130700'), - ('156330282', 'district', '慈溪市', '156330200'), - ('156330402', 'district', '南湖区', '156330400'), - ('156370124', 'district', '平阴县', '156370100'), - ('156410171', 'district', '郑州经济技术开发区', '156410100'), - ('156510521', 'district', '泸县', '156510500'), - ('156532524', 'district', '建水县', '156532500'), - ('156340871', 'district', '安徽安庆经济开发区', '156340800'), - ('156150926', 'district', '察哈尔右翼前旗', '156150900'), - ('156371522', 'district', '莘县', '156371500'), - ('156130638', 'district', '雄县', '156130600'), - ('156140212', 'district', '新荣区', '156140200'), - ('156211005', 'district', '弓长岭区', '156211000'), - ('156431322', 'district', '新化县', '156431300'), - ('156440114', 'district', '花都区', '156440100'), - ('156410771', 'district', '新乡高新技术产业开发区', '156410700'), - ('156469027', 'district', '乐东黎族自治县', '156469000'), - ('156371328', 'district', '蒙阴县', '156371300'), - ('156211102', 'district', '双台子区', '156211100'), - ('156532922', 'district', '漾濞彝族自治县', '156532900'), - ('156530621', 'district', '鲁甸县', '156530600'), - ('156320402', 'district', '天宁区', '156320400'), - ('156360733', 'district', '会昌县', '156360700'), - ('156429006', 'district', '天门市', '156429000'), - ('156360983', 'district', '高安市', '156360900'), - ('156530126', 'district', '石林彝族自治县', '156530100'), - ('156450602', 'district', '港口区', '156450600'), - ('156441224', 'district', '怀集县', '156441200'), - ('156621126', 'district', '岷县', '156621100'), - ('156341222', 'district', '太和县', '156341200'), - ('156640502', 'district', '沙坡头区', '156640500'), - ('156420204', 'district', '下陆区', '156420200'), - ('156522726', 'district', '独山县', '156522700'), - ('156421002', 'district', '沙市区', '156421000'), - ('156610331', 'district', '太白县', '156610300'), - ('156451321', 'district', '忻城县', '156451300'), - ('156620702', 'district', '甘州区', '156620700'), - ('156371171', 'district', '日照经济技术开发区', '156371100'), - ('156410371', 'district', '洛阳高新技术产业开发区', '156410300'), - ('156411526', 'district', '潢川县', '156411500'), - ('156110106', 'district', '丰台区', '156110100'), - ('156431002', 'district', '北湖区', '156431000'), - ('156440103', 'district', '荔湾区', '156440100'), - ('156130802', 'district', '双桥区', '156130800'), - ('156131124', 'district', '饶阳县', '156131100'), - ('156810005', 'district', '油尖旺区', '156810100'), - ('156520628', 'district', '松桃苗族自治县', '156520600'), - ('156220821', 'district', '镇赉县', '156220800'), - ('156341021', 'district', '歙县', '156341000'), - ('156341126', 'district', '凤阳县', '156341100'), - ('156350625', 'district', '长泰县', '156350600'), - ('156440981', 'district', '高州市', '156440900'), - ('156341321', 'district', '砀山县', '156341300'), - ('156450621', 'district', '上思县', '156450600'), - ('156220203', 'district', '龙潭区', '156220200'), - ('156410704', 'district', '凤泉区', '156410700'), - ('156140681', 'district', '怀仁市', '156140600'), - ('156140931', 'district', '保德县', '156140900'), - ('156510502', 'district', '江阳区', '156510500'), - ('156231004', 'district', '爱民区', '156231000'), - ('156350923', 'district', '屏南县', '156350900'), - ('156130127', 'district', '高邑县', '156130100'), - ('156230113', 'district', '双城区', '156230100'), - ('156150521', 'district', '科尔沁左翼中旗', '156150500'), - ('156371521', 'district', '阳谷县', '156371500'), - ('156440229', 'district', '翁源县', '156440200'), - ('156320371', 'district', '徐州经济技术开发区', '156320300'), - ('156650105', 'district', '水磨沟区', '156650100'), - ('156520622', 'district', '玉屏侗族自治县', '156520600'), - ('156130923', 'district', '东光县', '156130900'), - ('156360112', 'district', '新建区', '156360100'), - ('156152502', 'district', '锡林浩特市', '156152500'), - ('156220184', 'district', '公主岭市', '156220100'), - ('156230302', 'district', '鸡冠区', '156230300'), - ('156510683', 'district', '绵竹市', '156510600'), - ('156230522', 'district', '友谊县', '156230500'), - ('156371121', 'district', '五莲县', '156371100'), - ('156652723', 'district', '温泉县', '156652700'), - ('156610826', 'district', '绥德县', '156610800'), - ('156411330', 'district', '桐柏县', '156411300'), - ('156330110', 'district', '余杭区', '156330100'), - ('156331125', 'district', '云和县', '156331100'), - ('156150823', 'district', '乌拉特前旗', '156150800'), - ('156360202', 'district', '昌江区', '156360200'), - ('156620621', 'district', '民勤县', '156620600'), - ('156652925', 'district', '新和县', '156652900'), - ('156420116', 'district', '黄陂区', '156420100'), - ('156532923', 'district', '祥云县', '156532900'), - ('156411302', 'district', '宛城区', '156411300'), - ('156210321', 'district', '台安县', '156210300'), - ('156430821', 'district', '慈利县', '156430800'), - ('156341202', 'district', '颍州区', '156341200'), - ('156330603', 'district', '柯桥区', '156330600'), - ('156340223', 'district', '南陵县', '156340200'), - ('156410926', 'district', '范县', '156410900'), - ('156150825', 'district', '乌拉特后旗', '156150800'), - ('156622925', 'district', '和政县', '156622900'), - ('156430502', 'district', '双清区', '156430500'), - ('156440310', 'district', '坪山区', '156440300'), - ('156540330', 'district', '边坝县', '156540300'), - ('156451423', 'district', '龙州县', '156451400'), - ('156130427', 'district', '磁县', '156130400'), - ('156421122', 'district', '红安县', '156421100'), - ('156540502', 'district', '乃东区', '156540500'), - ('156140823', 'district', '闻喜县', '156140800'), - ('156152525', 'district', '东乌珠穆沁旗', '156152500'), - ('156150723', 'district', '鄂伦春自治旗', '156150700'), - ('156321183', 'district', '句容市', '156321100'), - ('156330226', 'district', '宁海县', '156330200'), - ('156420703', 'district', '华容区', '156420700'), - ('156513426', 'district', '会东县', '156513400'), - ('156350803', 'district', '永定 区', '156350800'), - ('156440115', 'district', '南沙区', '156440100'), - ('156445222', 'district', '揭西县', '156445200'), - ('156140322', 'district', '盂县', '156140300'), - ('156230110', 'district', '香坊区', '156230100'), - ('156621027', 'district', '镇原县', '156621000'), - ('156520221', 'district', '水城县', '156520200'), - ('156410325', 'district', '嵩县', '156410300'), - ('156500240', 'district', '石柱土家族自治县', '156500200'), - ('156150821', 'district', '五原县', '156150800'), - ('156533323', 'district', '福贡县', '156533300'), - ('156420529', 'district', '五峰土家族自治县', '156420500'), - ('156433122', 'district', '泸溪县', '156433100'), - ('156630225', 'district', '循化撒拉族自治县', '156630200'), - ('156150423', 'district', '巴林右旗', '156150400'), - ('156320105', 'district', '建邺区', '156320100'), - ('156130732', 'district', '赤城县', '156130700'), - ('156410783', 'district', '长垣市', '156410700'), - ('156421071', 'district', '荆州经济技术开发区', '156421000'), - ('156210503', 'district', '溪湖区', '156210500'), - ('156141025', 'district', '古县', '156141000'), - ('156341621', 'district', '涡阳县', '156341600'), - ('156231084', 'district', '宁安市', '156231000'), - ('156510812', 'district', '朝天区', '156510800'), - ('156321112', 'district', '丹徒区', '156321100'), - ('156320324', 'district', '睢宁县', '156320300'), - ('156230229', 'district', '克山县', '156230200'), - ('156340124', 'district', '庐江县', '156340100'), - ('156131081', 'district', '霸州市', '156131000'), - ('156410703', 'district', '卫滨区', '156410700'), - ('156120116', 'district', '滨海新区', '156120100'), - ('156620924', 'district', '阿克塞哈萨克族自治县', '156620900'), - ('156330602', 'district', '越城区', '156330600'), - ('156341871', 'district', '宣城市经济开发区', '156341800'), - ('156131082', 'district', '三河市', '156131000'), - ('156659002', 'district', '阿拉尔市', '156659000'), - ('156130902', 'district', '新华区', '156130900'), - ('156511424', 'district', '丹棱县', '156511400'), - ('156513330', 'district', '德格县', '156513300'), - ('156232701', 'district', '漠河市', '156232700'), - ('156450107', 'district', '西乡塘区', '156450100'), - ('156330903', 'district', '普陀区', '156330900'), - ('156530114', 'district', '呈贡区', '156530100'), - ('156410311', 'district', '洛龙区', '156410300'), - ('156450804', 'district', '覃塘区', '156450800'), - ('156110102', 'district', '西城区', '156110100'), - ('156130525', 'district', '隆尧县', '156130500'), - ('156310118', 'district', '青浦区', '156310100'), - ('156621026', 'district', '宁县', '156621000'), - ('156610528', 'district', '富平县', '156610500'), - ('156451203', 'district', '宜州区', '156451200'), - ('156360429', 'district', '湖口县', '156360400'), - ('156610304', 'district', '陈仓区', '156610300'), - ('156330424', 'district', '海盐县', '156330400'), - ('156331123', 'district', '遂昌县', '156331100'), - ('156431171', 'district', '永州经济技术开发区', '156431100'), - ('156441825', 'district', '连山壮族瑶族自治县', '156441800'), - ('156140723', 'district', '和顺县', '156140700'), - ('156210624', 'district', '宽甸满族自治县', '156210600'), - ('156230502', 'district', '尖山区', '156230500'), - ('156500112', 'district', '渝北区', '156500100'), - ('156410702', 'district', '红旗区', '156410700'), - ('156632524', 'district', '兴海县', '156632500'), - ('156320923', 'district', '阜宁县', '156320900'), - ('156371481', 'district', '乐陵市', '156371400'), - ('156715000', 'district', '嘉义市', '156710100'), - ('156320282', 'district', '宜兴市', '156320200'), - ('156130171', 'district', '石家庄高新技术产业开发区', '156130100'), - ('156530927', 'district', '沧源佤族自治县', '156530900'), - ('156440883', 'district', '吴川市', '156440800'), - ('156450521', 'district', '合浦县', '156450500'), - ('156511113', 'district', '金口河区', '156511100'), - ('156340421', 'district', '凤台县', '156340400'), - ('156420302', 'district', '茅箭区', '156420300'), - ('156220722', 'district', '长岭县', '156220700'), - ('156330922', 'district', '嵊泗县', '156330900'), - ('156652826', 'district', '焉耆回族自治县', '156652800'), - ('156421281', 'district', '赤壁市', '156421200'), - ('156340402', 'district', '大通区', '156340400'), - ('156522625', 'district', '镇远县', '156522600'), - ('156371525', 'district', '冠县', '156371500'), - ('156450305', 'district', '七星区', '156450300'), - ('156650204', 'district', '白碱滩区', '156650200'), - ('156530103', 'district', '盘龙区', '156530100'), - ('156420303', 'district', '张湾区', '156420300'), - ('156230505', 'district', '四方台区', '156230500'), - ('156331122', 'district', '缙云 县', '156331100'), - ('156653129', 'district', '伽师县', '156653100'), - ('156140828', 'district', '夏县', '156140800'), - ('156510181', 'district', '都江堰市', '156510100'), - ('156210111', 'district', '苏家屯区', '156210100'), - ('156150122', 'district', '托克托县', '156150100'), - ('156231283', 'district', '海伦市', '156231200'), - ('156360728', 'district', '定南县', '156360700'), - ('156654223', 'district', '沙湾县', '156654200'), - ('156430624', 'district', '湘阴县', '156430600'), - ('156441623', 'district', '连平县', '156441600'), - ('156441821', 'district', '佛冈县', '156441800'), - ('156220303', 'district', '铁东区', '156220300'), - ('156231182', 'district', '五大连池市', '156231100'), - ('156810016', 'district', '沙田区', '156810100'), - ('156511722', 'district', '宣汉县', '156511700'), - ('156410671', 'district', '鹤壁经济技术开发区', '156410600'), - ('156350211', 'district', '集美区', '156350200'), - ('156411325', 'district', '内乡县', '156411300'), - ('156450922', 'district', '陆川县', '156450900'), - ('156150123', 'district', '和林格尔县', '156150100'), - ('156370902', 'district', '泰山区', '156370900'), - ('156420804', 'district', '掇刀区', '156420800'), - ('156410404', 'district', '石龙区', '156410400'), - ('156511025', 'district', '资中县', '156511000'), - ('156320682', 'district', '如皋市', '156320600'), - ('156410203', 'district', '顺河回族区', '156410200'), - ('156450205', 'district', '柳北区', '156450200'), - ('156341504', 'district', '叶集区', '156341500'), - ('156410621', 'district', '浚县', '156410600'), - ('156130631', 'district', '望都县', '156130600'), - ('156370703', 'district', '寒亭区', '156370700'), - ('156654028', 'district', '尼勒克县', '156654000'), - ('156431024', 'district', '嘉禾县', '156431000'), - ('156411103', 'district', '郾城区', '156411100'), - ('156710012', 'district', '新北市', '156710100'), - ('156430224', 'district', '茶陵县', '156430200'), - ('156710016', 'district', '台中市', '156710100'), - ('156410811', 'district', '山阳区', '156410800'), - ('156152528', 'district', '镶黄旗', '156152500'), - ('156140110', 'district', '晋源区', '156140100'), - ('156530828', 'district', '澜沧拉祜族自治县', '156530800'), - ('156610626', 'district', '吴起县', '156610600'), - ('156632802', 'district', '德令哈市', '156632800'), - ('156341122', 'district', '来安县', '156341100'), - ('156370611', 'district', '福山区', '156370600'), - ('156141026', 'district', '安泽县', '156141000'), - ('156320612', 'district', '通州区', '156320600'), - ('156620102', 'district', '城关区', '156620100'), - ('156440523', 'district', '南澳县', '156440500'), - ('156330106', 'district', '西湖区', '156330100'), - ('156130131', 'district', '平山县', '156130100'), - ('156330781', 'district', '兰溪市', '156330700'), - ('156361003', 'district', '东乡区', '156361000'), - ('156130803', 'district', '双滦区', '156130800'), - ('156520625', 'district', '印江土家族苗族自 治县', '156520600'), - ('156511322', 'district', '营山县', '156511300'), - ('156530424', 'district', '华宁县', '156530400'), - ('156522636', 'district', '丹寨县', '156522600'), - ('156510117', 'district', '郫都区', '156510100'), - ('156410185', 'district', '登封市', '156410100'), - ('156610925', 'district', '岚皋县', '156610900'), - ('156530129', 'district', '寻甸回族彝族自治县', '156530100'), - ('156130111', 'district', '栾城区', '156130100'), - ('156431129', 'district', '江华瑶 族自治县', '156431100'), - ('156230719', 'district', '友好区', '156230700'), - ('156513430', 'district', '金阳县', '156513400'), - ('156540235', 'district', '聂拉木县', '156540200'), - ('156150784', 'district', '额尔古纳市', '156150700'), - ('156411702', 'district', '驿城区', '156411700'), - ('156520328', 'district', '湄潭县', '156520300'), - ('156654002', 'district', '伊宁市', '156654000'), - ('156445202', 'district', '榕城区', '156445200'), - ('156131123', 'district', '武强县', '156131100'), - ('156445224', 'district', '惠来县', '156445200'), - ('156469024', 'district', '临高县', '156469000'), - ('156620111', 'district', '红古区', '156620100'), - ('156711000', 'district', '高雄市', '156710100'), - ('156341225', 'district', '阜南县', '156341200'), - ('156530624', 'district', '大关县', '156530600'), - ('156230921', 'district', '勃利县', '156230900'), - ('156610111', 'district', '灞桥区', '156610100'), - ('156320507', 'district', '相城区', '156320500'), - ('156371426', 'district', '平原县', '156371400'), - ('156340203', 'district', '弋江区', '156340200'), - ('156640302', 'district', '利通区', '156640300'), - ('156140430', 'district', '沁县', '156140400'), - ('156530802', 'district', '思茅区', '156530800'), - ('156371771', 'district', '菏泽经济技术开发区', '156371700'), - ('156350881', 'district', '漳平市', '156350800'), - ('156130930', 'district', '孟村回族自治县', '156130900'), - ('156150822', 'district', '磴口县', '156150800'), - ('156220104', 'district', '朝阳区', '156220100'), - ('156220122', 'district', '农安县', '156220100'), - ('156230903', 'district', '桃山区', '156230900'), - ('156510402', 'district', '东区', '156510400'), - ('156621102', 'district', '安定区', '156621100'), - ('156232761', 'district', '加格达奇区', '156232700'), - ('156640205', 'district', '惠农区', '156640200'), - ('156500231', 'district', '垫江县', '156500200'), - ('156430582', 'district', '邵东市', '156430500'), - ('156340602', 'district', '杜集区', '156340600'), - ('156130629', 'district', '容城县', '156130600'), - ('156410184', 'district', '新郑市', '156410100'), - ('156430725', 'district', '桃源县', '156430700'), - ('156140223', 'district', '广灵县', '156140200'), - ('156210311', 'district', '千山区', '156210300'), - ('156430529', 'district', '城步苗族自治县', '156430500'), - ('156532527', 'district', '泸西县', '156532500'), - ('156360203', 'district', '珠山区', '156360200'), - ('156210905', 'district', '清河门区', '156210900'), - ('156341271', 'district', '阜阳合肥现代产业园区', '156341200'), - ('156513335', 'district', '巴塘县', '156513300'), - ('156371703', 'district', '定陶区', '156371700'), - ('156445322', 'district', '郁南县', '156445300'), - ('156440982', 'district', '化州市', '156440900'), - ('156810001', 'district', '中西区', '156810100'), - ('156231081', 'district', '绥芬河市', '156231000'), - ('156360730', 'district', '宁都县', '156360700'), - ('156230405', 'district', '兴安区', '156230400'), - ('156653226', 'district', '于田县', '156653200'), - ('156433124', 'district', '花垣县', '156433100'), - ('156230221', 'district', '龙江县', '156230200'), - ('156341125', 'district', '定远县', '156341100'), - ('156370602', 'district', '芝罘区', '156370600'), - ('156420984', 'district', '汉川市', '156420900'), - ('156441523', 'district', '陆河县', '156441500'), - ('156620725', 'district', '山丹县', '156620700'), - ('156230904', 'district', '茄子河区', '156230900'), - ('156360731', 'district', '于都县', '156360700'), - ('156469006', 'district', '万宁市', '156469000'), - ('156150824', 'district', '乌拉特中旗', '156150800'), - ('156150725', 'district', '陈巴尔虎旗', '156150700'), - ('156360321', 'district', '莲花县', '156360300'), - ('156360483', 'district', '庐山市', '156360400'), - ('156340371', 'district', '蚌埠市高新技术开发区', '156340300'), - ('156451228', 'district', '都安瑶族自治县', '156451200'), - ('156511803', 'district', ' 名山区', '156511800'), - ('156210283', 'district', '庄河市', '156210200'), - ('156360281', 'district', '乐平市', '156360200'), - ('156411525', 'district', '固始县', '156411500'), - ('156340322', 'district', '五河县', '156340300'), - ('156420606', 'district', '樊城区', '156420600'), - ('156429021', 'district', '神农架林区', '156429000'), - ('156522629', 'district', '剑河县', '156522600'), - ('156222401', 'district', '延吉市', '156222400'), - ('156341221', 'district', '临泉县', '156341200'), - ('156150581', 'district', '霍林郭勒市', '156150500'), - ('156340121', 'district', '长丰县', '156340100'), - ('156810018', 'district', '离岛区', '156810100'), - ('156230881', 'district', '同江市', '156230800'), - ('156210505', 'district', '南芬区', '156210500'), - ('156130827', 'district', '宽城满族自治县', '156130800'), - ('156360902', 'district', '袁州区', '156360900'), - ('156420607', 'district', '襄州区', '156420600'), - ('156230111', 'district', '呼兰区', '156230100'), - ('156500156', 'district', '武隆区', '156500100'), - ('156130702', 'district', '桥东区', '156130700'), - ('156460203', 'district', '吉阳区', '156460200'), - ('156500155', 'district', '梁平区', '156500100'), - ('156370113', 'district', '长清区', '156370100'), - ('156430426', 'district', '祁东县', '156430400'), - ('156210903', 'district', '新邱区', '156210900'), - ('156130524', 'district', '柏乡县', '156130500'), - ('156421171', 'district', '龙感湖管理区', '156421100'), - ('156511403', 'district', '彭山区', '156511400'), - ('156610430', 'district', '淳化县', '156610400'), - ('156150302', 'district', '海勃湾区', '156150300'), - ('156130181', 'district', '辛集市', '156130100'), - ('156652926', 'district', '拜城县', '156652900'), - ('156341522', 'district', '霍邱县', '156341500'), - ('156310110', 'district', '杨浦区', '156310100'), - ('156441426', 'district', '平远县', '156441400'), - ('156431225', 'district', '会同县', '156431200'), - ('156130107', 'district', '井陉矿区', '156130100'), - ('156451122', 'district', '钟山县', '156451100'), - ('156370405', 'district', '台儿庄区', '156370400'), - ('156231003', 'district', '阳明区', '156231000'), - ('156654021', 'district', '伊宁县', '156654000'), - ('156360828', 'district', '万安县', '156360800'), - ('156422822', 'district', '建始县', '156422800'), - ('156220602', 'district', '浑江区', '156220600'), - ('156350304', 'district', '荔城区', '156350300'), - ('156511102', 'district', '市中区', '156511100'), - ('156450126', 'district', '宾阳县', '156450100'), - ('156530622', 'district', '巧家县', '156530600'), - ('156320924', 'district', '射阳县', '156320900'), - ('156513332', 'district', '石渠县', '156513300'), - ('156230524', 'district', '饶河县', '156230500'), - ('156433126', 'district', '古丈县', '156433100'), - ('156360313', 'district', '湘东区', '156360300'), - ('156330281', 'district', '余姚市', '156330200'), - ('156330921', 'district', '岱山县', '156330900'), - ('156141126', 'district', '石楼县', '156141100'), - ('156141081', 'district', '侯马市', '156141000'), - ('156210702', 'district', '古塔区', '156210700'), - ('156370211', 'district', '黄岛区', '156370200'), - ('156140406', 'district', '潞城区', '156140400'), - ('156654221', 'district', '额敏县', '156654200'), - ('156530324', 'district', '罗平县', '156530300'), - ('156421126', 'district', '蕲春县', '156421100'), - ('156610924', 'district', '紫阳县', '156610900'), - ('156130581', 'district', '南宫市', '156130500'), - ('156150785', 'district', '根河市', '156150700'), - ('156211404', 'district', '南票区', '156211400'), - ('156230227', 'district', '富裕县', '156230200'), - ('156350302', 'district', '城厢区', '156350300'), - ('156341882', 'district', '广德市', '156341800'), - ('156540172', 'district', '拉萨经济技术开发区', '156540100'), - ('156430771', 'district', '常德市西洞庭管理区', '156430700'), - ('156520424', 'district', '关岭布依族苗族自治县', '156520400'), - ('156610114', 'district', '阎良区', '156610100'), - ('156360323', 'district', '芦溪县', '156360300'), - ('156451103', 'district', '平桂区', '156451100'), - ('156330206', 'district', '北仑区', '156330200'), - ('156620104', 'district', '西固 区', '156620100'), - ('156230183', 'district', '尚志市', '156230100'), - ('156340221', 'district', '芜湖县', '156340200'), - ('156520526', 'district', '威宁彝族回族苗族自治县', '156520500'), - ('156530325', 'district', '富源县', '156530300'), - ('156370683', 'district', '莱州市', '156370600'), - ('156150826', 'district', '杭锦后旗', '156150800'), - ('156530824', 'district', '景谷傣族彝族自治县', '156530800'), - ('156140109', 'district', '万柏林区', '156140100'), - ('156460204', 'district', '天涯区', '156460200'), - ('156410727', 'district', '封丘县', '156410700'), - ('156130407', 'district', '肥乡区', '156130400'), - ('156140781', 'district', '介休市', '156140700'), - ('156652327', 'district', '吉木萨尔县', '156652300'), - ('156410502', 'district', '文峰区', '156410500'), - ('156540234', 'district', '吉隆县', '156540200'), - ('156370613', 'district', '莱山区', '156370600'), - ('156410803', 'district', '中站区', '156410800'), - ('156451226', 'district', '环江毛南族自治县', '156451200'), - ('156321102', 'district', '京口区', '156321100'), - ('156650121', 'district', '乌鲁木齐县', '156650100'), - ('156610630', 'district', '宜川县', '156610600'), - ('156469002', 'district', '琼海市', '156469000'), - ('156411623', 'district', '商水县', '156411600'), - ('156632626', 'district', '玛多县', '156632600'), - ('156652924', 'district', '沙雅县', '156652900'), - ('156540528', 'district', '加查县', '156540500'), - ('156130571', 'district', '河北 邢台经济开发区', '156130500'), - ('156341823', 'district', '泾县', '156341800'), - ('156820101', 'district', '澳门特别行政区', '156820100'), - ('156130304', 'district', '北戴河区', '156130300'), - ('156130531', 'district', '广宗县', '156130500'), - ('156530523', 'district', '龙陵县', '156530500'), - ('156211202', 'district', '银州区', '156211200'), - ('156716000', 'district', '嘉义县', '156710100'), - ('156510322', 'district', '富顺县', '156510300'), - ('156440309', 'district', ' 龙华区', '156440300'), - ('156150303', 'district', '海南区', '156150300'), - ('156522301', 'district', '兴义市', '156522300'), - ('156630103', 'district', '城中区', '156630100'), - ('156360521', 'district', '分宜县', '156360500'), - ('156540229', 'district', '仁布县', '156540200'), - ('156210124', 'district', '法库县', '156210100'), - ('156350824', 'district', '武平县', '156350800'), - ('156141022', 'district', '翼城县', '156141000'), - ('156220182', 'district', '榆树市', '156220100'), - ('156513433', 'district', '冕宁县', '156513400'), - ('156430204', 'district', '石峰区', '156430200'), - ('156370404', 'district', '峄城区', '156370400'), - ('156430104', 'district', '岳麓区', '156430100'), - ('156532625', 'district', ' 马关县', '156532600'), - ('156441581', 'district', '陆丰市', '156441500'), - ('156433127', 'district', '永顺县', '156433100'), - ('156152530', 'district', '正蓝旗', '156152500'), - ('156520422', 'district', '普定县', '156520400'), - ('156130925', 'district', '盐山县', '156130900'), - ('156621121', 'district', '通渭县', '156621100'), - ('156371003', 'district', '文登区', '156371000'), - ('156623025', 'district', '玛曲县', '156623000'), - ('156532823', 'district', '勐腊县', '156532800'), - ('156441823', 'district', '阳山县', '156441800'), - ('156623021', 'district', '临潭县', '156623000'), - ('156410773', 'district', '新乡市平原城乡一体化示范区', '156410700'), - ('156632321', 'district', '同仁县', '156632300'), - ('156532501', 'district', '个旧市', '156532500'), - ('156513424', 'district', '德昌县', '156513400'), - ('156130133', 'district', '赵县', '156130100'), - ('156654225', 'district', '裕民县', '156654200'), - ('156331102', 'district', '莲都区', '156331100'), - ('156540627', 'district', '班戈县', '156540600'), - ('156130202', 'district', '路南区', '156130200'), - ('156530381', 'district', '宣威市', '156530300'), - ('156440106', 'district', '天河区', '156440100'), - ('156420923', 'district', '云梦县', '156420900'), - ('156500116', 'district', '江津区', '156500100'), - ('156450202', 'district', '城中区', '156450200'), - ('156622927', 'district', '积石山保安族东乡族撒拉族自治县', '156622900'), - ('156610622', 'district', '延川县', '156610600'), - ('156450703', 'district', '钦北区', '156450700'), - ('156714000', 'district', '基隆市', '156710100'), - ('156513401', 'district', '西昌市', '156513400'), - ('156210682', 'district', '凤城市', '156210600'), - ('156141125', 'district', '柳林县', '156141100'), - ('156410402', 'district', '新华区', '156410400'), - ('156341102', 'district', '琅琊区', '156341100'), - ('156220822', 'district', '通榆县', '156220800'), - ('156420222', 'district', '阳新县', '156420200'), - ('156430811', 'district', '武陵源区', '156430800'), - ('156361028', 'district', '资溪县', '156361000'), - ('156411329', 'district', '新野县', '156411300'), - ('156360121', 'district', '南昌县', '156360100'), - ('156150624', 'district', '鄂托克旗', '156150600'), - ('156510108', 'district', '成华区', '156510100'), - ('156350428', 'district', '将乐县', '156350400'), - ('156150422', 'district', '巴林左旗', '156150400'), - ('156522727', 'district', '平塘县', '156522700'), - ('156532325', 'district', '姚安县', '156532300'), - ('156632323', 'district', '泽库县', '156632300'), - ('156411224', 'district', '卢氏县', '156411200'), - ('156511923', 'district', '平昌县', '156511900'), - ('156430424', 'district', '衡东县', '156430400'), - ('156810010', 'district', '荃湾区', '156810100'), - ('156360322', 'district', '上栗县', '156360300'), - ('156620321', 'district', '永昌县', '156620300'), - ('156510522', 'district', '合江县', '156510500'), - ('156120114', 'district', '武清 区', '156120100'), - ('156451024', 'district', '德保县', '156451000'), - ('156211104', 'district', '大洼区', '156211100'), - ('156321322', 'district', '沭阳县', '156321300'), - ('156445381', 'district', '罗定市', '156445300'), - ('156450881', 'district', '桂平市', '156450800'), - ('156410381', 'district', '偃师市', '156410300'), - ('156150623', 'district', '鄂托克前旗', '156150600'), - ('156610726', 'district', '宁强县', '156610700'), - ('156513435', 'district', '甘洛县', '156513400'), - ('156713000', 'district', '花莲县', '156710100'), - ('156350121', 'district', '闽侯县', '156350100'), - ('156350781', 'district', '邵武市', '156350700'), - ('156440704', 'district', '江海区', '156440700'), - ('156441901', 'district', ' 东莞市', '156441900'), - ('156513201', 'district', '马尔康市', '156513200'), - ('156120106', 'district', '红桥区', '156120100'), - ('156150724', 'district', '鄂温克族自治旗', '156150700'), - ('156530181', 'district', '安宁市', '156530100'), - ('156441881', 'district', '英德市', '156441800'), - ('156411602', 'district', '川汇区', '156411600'), - ('156222402', 'district', '图们市', '156222400'), - ('156430281', 'district', '醴陵市', '156430200'), - ('156360404', 'district', '柴桑区', '156360400'), - ('156140825', 'district', '新绛县', '156140800'), - ('156411081', 'district', '禹州市', '156411000'), - ('156330624', 'district', '新昌县', '156330600'), - ('156510525', 'district', '古蔺县', '156510500'), - ('156360111', 'district', '青山湖区', '156360100'), - ('156110112', 'district', '通州区', '156110100'), - ('156330182', 'district', '建德市', '156330100'), - ('156371625', 'district', '博兴县', '156371600'), - ('156370812', 'district', '兖州区', '156370800'), - ('156411481', 'district', '永城市', '156411400'), - ('156410928', 'district', '濮阳县', '156410900'), - ('156152531', 'district', '多伦县', '156152500'), - ('156140181', 'district', '古交市', '156140100'), - ('156520624', 'district', '思南县', '156520600'), - ('156451223', 'district', '凤山县', '156451200'), - ('156370102', 'district', '历下区', '156370100'), - ('156411728', 'district', '遂平县', '156411700'), - ('156810017', 'district', '葵青区', '156810100'), - ('156340621', 'district', '濉溪县', '156340600'), - ('156320981', 'district', '东台市', '156320900'), - ('156411024', 'district', '鄢陵县', '156411000'), - ('156210105', 'district', '皇姑区', '156210100'), - ('156652822', 'district', '轮台县', '156652800'), - ('156371002', 'district', '环翠区', '156371000'), - ('156350525', 'district', '永春县', '156350500'), - ('156513224', 'district', '松潘县', '156513200'), - ('156430405', 'district', '珠晖区', '156430400'), - ('156331023', 'district', '天台县', '156331000'), - ('156630224', 'district', '化隆回族自治县', '156630200'), - ('156130209', 'district', '曹妃甸区', '156130200'), - ('156410711', 'district', '牧野区', '156410700'), - ('156450312', 'district', '临桂区', '156450300'), - ('156451121', 'district', '昭平县', '156451100'), - ('156610328', 'district', '千阳县', '156610300'), - ('156320214', 'district', '新吴区', '156320200'), - ('156431202', 'district', '鹤城区', '156431200'), - ('156150602', 'district', '东胜区', '156150600'), - ('156230230', 'district', '克东县', '156230200'), - ('156320902', 'district', '亭湖区', '156320900'), - ('156429005', 'district', '潜江市', '156429000'), - ('156540402', 'district', '巴宜区', '156540400'), - ('156330502', 'district', '吴兴区', '156330500'), - ('156632822', 'district', '都兰县', '156632800'), - ('156360704', 'district', '赣县区', '156360700'), - ('156430111', 'district', '雨花区', '156430100'), - ('156320583', 'district', '昆山市', '156320500'), - ('156469026', 'district', '昌江黎族自治县', '156469000'), - ('156511702', 'district', '通川区', '156511700'), - ('156513322', 'district', '泸定县', '156513300'), - ('156420205', 'district', '铁山区', '156420200'), - ('156140929', 'district', '岢岚县', '156140900'), - ('156422826', 'district', '咸丰县', '156422800'), - ('156510981', 'district', '射洪市', '156510900'), - ('156520603', 'district', '万山区', '156520600'), - ('156451227', 'district', '巴马瑶族自治县', '156451200'), - ('156522626', 'district', '岑巩县', '156522600'), - ('156440783', 'district', '开平市', '156440700'), - ('156130306', 'district', '抚宁区', '156130300'), - ('156430922', 'district', '桃江县', '156430900'), - ('156520330', 'district', '习水县', '156520300'), - ('156370784', 'district', '安丘市', '156370700'), - ('156640181', 'district', '灵武市', '156640100'), - ('156540322', 'district', '贡觉县', '156540300'), - ('156632624', 'district', '达日县', '156632600'), - ('156220106', 'district', '绿园区', '156220100'), - ('156540121', 'district', '林周县', '156540100'), - ('156130825', 'district', '隆化县', '156130800'), - ('156140821', 'district', '临猗县', '156140800'), - ('156500109', 'district', '北碚区', '156500100'), - ('156231025', 'district', '林口县', '156231000'), - ('156210211', 'district', '甘井子区', '156210200'), - ('156620724', 'district', '高台县', '156620700'), - ('156510182', 'district', '彭州市', '156510100'), - ('156620502', 'district', '秦州区', '156620500'), - ('156441624', 'district', '和平县', '156441600'), - ('156610424', 'district', '乾县', '156610400'), - ('156140724', 'district', '昔阳县', '156140700'), - ('156152527', 'district', '太仆寺旗', '156152500'), - ('156410526', 'district', '滑县', '156410500'), - ('156542521', 'district', '普兰县', '156542500'), - ('156230382', 'district', '密山市', '156230300'), - ('156810006', 'district', '深水埗区', '156810100'), - ('156321311', 'district', '宿豫区', '156321300'), - ('156340828', 'district', '岳西县', '156340800'), - ('156350430', 'district', '建宁县', '156350400'), - ('156140423', 'district', '襄垣县', '156140400'), - ('156360222', 'district', '浮梁县', '156360200'), - ('156130104', 'district', '桥西区', '156130100'), - ('156130532', 'district', '平乡县', '156130500'), - ('156130672', 'district', '保定白沟新城', '156130600'), - ('156360823', 'district', '峡江县', '156360800'), - ('156540629', 'district', '尼玛县', '156540600'), - ('156441702', 'district', '江城区', '156441700'), - ('156422801', 'district', '恩施市', '156422800'), - ('156140123', 'district', '娄烦县', '156140100'), - ('156440118', 'district', '增城区', '156440100'), - ('156620523', 'district', '甘谷县', '156620500'), - ('156451031', 'district', '隆林各族自治县', '156451000'), - ('156620921', 'district', '金塔县', '156620900'), - ('156130271', 'district', '河北唐山芦台经济开发区', '156130200'), - ('156430525', 'district', '洞口县', '156430500'), - ('156130110', 'district', '鹿泉区', '156130100'), - ('156371072', 'district', '威海经济技术开发区', '156371000'), - ('156430182', 'district', '宁乡市', '156430100'), - ('156450332', 'district', '恭城瑶族自治县', '156450300'), - ('156533401', 'district', '香格里拉市', '156533400'), - ('156511824', 'district', '石棉县', '156511800'), - ('156150172', 'district', '呼和浩特经济技术开发区', '156150100'), - ('156530323', 'district', '师宗县', '156530300'), - ('156330327', 'district', '苍南县', '156330300'), - ('156460323', 'district', '中沙群岛的岛礁及其海域', '156460300'), - ('156530926', 'district', '耿马傣族佤族自治县', '156530900'), - ('156220323', 'district', '伊通满族自治县', '156220300'), - ('156440785', 'district', '恩平市', '156440700'), - ('156540323', 'district', '类乌齐县', '156540300'), - ('156370671', 'district', '烟台高新技术产业开发区', '156370600'), - ('156150207', 'district', '九原区', '156150200'), - ('156520122', 'district', '息烽县', '156520100'), - ('156522732', 'district', '三都水族自治县', '156522700'), - ('156230724', 'district', '丰林县', '156230700'), - ('156361125', 'district', '横峰县', '156361100'), - ('156520302', 'district', '红花岗区', '156520300'), - ('156513328', 'district', '甘孜县', '156513300'), - ('156431122', 'district', '东安县', '156431100'), - ('156330523', 'district', '安吉县', '156330500'), - ('156150404', 'district', '松山区', '156150400'), - ('156340103', 'district', '庐阳区', '156340100'), - ('156653127', 'district', '麦盖提县', '156653100'), - ('156652928', 'district', '阿瓦提县', '156652900'), - ('156420102', 'district', '江岸区', '156420100'), - ('156540226', 'district', '昂仁县', '156540200'), - ('156341182', 'district', '明光市', '156341100'), - ('156530521', 'district', '施甸县', '156530500'), - ('156450405', 'district', '长洲区', '156450400'), - ('156530113', 'district', '东川区', '156530100'), - ('156341324', 'district', '泗县', '156341300'), - ('156410883', 'district', '孟州市', '156410800'), - ('156450681', 'district', '东兴市', '156450600'), - ('156310104', 'district', '徐汇区', '156310100'), - ('156430223', 'district', '攸县', '156430200'), - ('156120115', 'district', '宝坻区', '156120100'), - ('156130105', 'district', '新华区', '156130100'), - ('156532323', 'district', '牟定县', '156532300'), - ('156370403', 'district', '薛城区', '156370400'), - ('156450923', 'district', '博白县', '156450900'), - ('156511111', 'district', '沙湾区', '156511100'), - ('156610324', 'district', '扶风县', '156610300'), - ('156141021', 'district', '曲沃县', '156141000'), - ('156512002', 'district', '雁江区', '156512000'), - ('156610104', 'district', '莲湖区', '156610100'), - ('156150802', 'district', ' 临河区', '156150800'), - ('156350503', 'district', '丰泽区', '156350500'), - ('156513338', 'district', '得荣县', '156513300'), - ('156431103', 'district', '冷水滩区', '156431100'), - ('156441284', 'district', '四会市', '156441200'), - ('156650402', 'district', '高昌区', '156650400'); -INSERT INTO area (id, level, name, pid) -VALUES ('156140524', 'district', '陵川县', '156140500'), - ('156410222', 'district', '通许县', '156410200'), - ('156330108', 'district', '滨江区', '156330100'), - ('156230104', 'district', '道外区', '156230100'), - ('156610729', 'district', '留坝县', '156610700'), - ('156513337', 'district', '稻城县', '156513300'), - ('156610629', 'district', '洛川县', '156610600'), - ('156330303', 'district', '龙湾区', '156330300'), - ('156152922', 'district', '阿拉善右旗', '156152900'), - ('156540231', 'district', '定结县', '156540200'), - ('156130130', 'district', '无极县', '156130100'), - ('156451030', 'district', '西林县', '156451000'), - ('156310109', 'district', '虹口区', '156310100'), - ('156341203', 'district', '颍东区', '156341200'), - ('156140215', 'district', '云州区', '156140200'), - ('156640324', 'district', '同心县', '156640300'), - ('156140213', 'district', '平城区', '156140200'), - ('156370283', 'district', '平度 市', '156370200'), - ('156522624', 'district', '三穗县', '156522600'), - ('156152526', 'district', '西乌珠穆沁旗', '156152500'), - ('156130430', 'district', '邱县', '156130400'), - ('156430503', 'district', '大祥区', '156430500'), - ('156652929', 'district', '柯坪县', '156652900'), - ('156513230', 'district', '壤塘县', '156513200'), - ('156620122', 'district', '皋兰县', '156620100'), - ('156361104', 'district', '广信区', '156361100'), - ('156340208', 'district', '三山区', '156340200'), - ('156410306', 'district', '吉利区', '156410300'), - ('156420582', 'district', '当阳市', '156420500'), - ('156450226', 'district', '三江侗族自治县', '156450200'), - ('156140981', 'district', '原平市', '156140900'), - ('156211481', 'district', '兴城市', '156211400'), - ('156350322', 'district', '仙游县', '156350300'), - ('156450422', 'district', '藤县', '156450400'), - ('156540103', 'district', '堆龙德庆区', '156540100'), - ('156231221', 'district', '望奎县', '156231200'), - ('156441202', 'district', '端州区', '156441200'), - ('156140932', 'district', '偏关县', '156140900'), - ('156360829', 'district', '安福县', '156360800'), - ('156370782', 'district', '诸城市', '156370700'), - ('156513231', 'district', '阿坝县', '156513200'), - ('156370783', 'district', '寿光市', '156370700'), - ('156652301', 'district', '昌吉市', '156652300'), - ('156130922', 'district', '青县', '156130900'), - ('156622926', 'district', '东乡族自治县', '156622900'), - ('156610524', 'district', '合阳县', '156610500'), - ('156131121', 'district', '枣强县', '156131100'), - ('156532523', 'district', '屏边苗族自治县', '156532500'), - ('156130602', 'district', '竞秀区', '156130600'), - ('156640323', 'district', '盐池县', '156640300'), - ('156130534', 'district', '清河县', '156130500'), - ('156220881', 'district', '洮南市', '156220800'), - ('156421081', 'district', '石首市', '156421000'), - ('156611026', 'district', '柞水县', '156611000'), - ('156340272', 'district', '安徽芜湖长江大桥经济开发区', '156340200'), - ('156371302', 'district', '兰山区', '156371300'), - ('156370725', 'district', '昌乐县', '156370700'), - ('156450225', 'district', '融水苗族自治县', '156450200'), - ('156150921', 'district', '卓资县', '156150900'), - ('156341323', 'district', '灵璧县', '156341300'), - ('156441324', 'district', '龙门县', '156441300'), - ('156530124', 'district', '富民县', '156530100'), - ('156610702', 'district', '汉台区', '156610700'), - ('156130971', 'district', '河北沧州经济开发区', '156130900'), - ('156522631', 'district', '黎平县', '156522600'), - ('156231223', 'district', '青冈县', '156231200'), - ('156632522', 'district', '同德县', '156632500'), - ('156520281', 'district', '盘州市', '156520200'), - ('156632223', 'district', '海晏县', '156632200'), - ('156511503', 'district', '南溪区', '156511500'), - ('156622921', 'district', '临夏县', '156622900'), - ('156371321', 'district', '沂南县', '156371300'), - ('156411622', 'district', '西华县', '156411600'), - ('156341302', 'district', '埇桥区', '156341300'), - ('156532628', 'district', '富宁县', '156532600'), - ('156430681', 'district', '汨罗市', '156430600'), - ('156220723', 'district', '乾安县', '156220700'), - ('156130424', 'district', '成安县', '156130400'), - ('156522728', 'district', '罗甸县', '156522700'), - ('156520201', 'district', '钟山区', '156520200'), - ('156542526', 'district', '改则县', '156542500'), - ('156530629', 'district', '威信县', '156530600'), - ('156540223', 'district', '定日县', '156540200'), - ('156371723', 'district', '成武县', '156371700'), - ('156610429', 'district', '旬邑县', '156610400'), - ('156450502', 'district', '海城区', '156450500'), - ('156500115', 'district', '长寿区', '156500100'), - ('156231222', 'district', '兰西县', '156231200'), - ('156500238', 'district', '巫溪县', '156500200'), - ('156321283', 'district', '泰兴市', '156321200'), - ('156451224', 'district', '东兰县', '156451200'), - ('156532531', 'district', '绿春县', '156532500'), - ('156540232', 'district', '仲巴县', '156540200'), - ('156320812', 'district', '清江浦区', '156320800'), - ('156410581', 'district', '林州市', '156410500'), - ('156330881', 'district', '江山市', '156330800'), - ('156321181', 'district', '丹阳市', '156321100'), - ('156511502', 'district', '翠屏区', '156511500'), - ('156350925', 'district', '周宁县', '156350900'), - ('156632621', 'district', '玛沁县', '156632600'), - ('156131126', 'district', '故城县', '156131100'), - ('156231002', 'district', '东安区', '156231000'), - ('156341103', 'district', '南谯区', '156341100'), - ('156510105', 'district', '青羊区', '156510100'), - ('156420626', 'district', '保康县', '156420600'), - ('156220871', 'district', '吉林白城经济开发区', '156220800'), - ('156360124', 'district', '进贤县', '156360100'), - ('156430726', 'district', '石门县', '156430700'), - ('156460107', 'district', '琼山区', '156460100'), - ('156621023', 'district', '华池县', '156621000'), - ('156360702', 'district', '章贡区', '156360700'), - ('156430621', 'district', '岳阳县', '156430600'), - ('156340503', 'district', '花山区', '156340500'), - ('156469022', 'district', '屯昌县', '156469000'), - ('156520523', 'district', '金沙县', '156520500'), - ('156320684', 'district', '海门市', '156320600'), - ('156320506', 'district', '吴中区', '156320500'), - ('156710021', 'district', '宜兰县', '156710100'), - ('156341226', 'district', '颍上县', '156341200'), - ('156230321', 'district', '鸡东县', '156230300'), - ('156131071', 'district', '廊坊经济技术开发区', '156131000'), - ('156440511', 'district', '金平区', '156440500'), - ('156510321', 'district', '荣县', '156510300'), - ('156330305', 'district', '洞头区', '156330300'), - ('156350922', 'district', '古田县', '156350900'), - ('156371323', 'district', '沂水县', '156371300'), - ('156330371', 'district', '温州经济技术开发区', '156330300'), - ('156222405', 'district', '龙井市', '156222400'), - ('156410181', 'district', '巩义市', '156410100'), - ('156140403', 'district', '潞州区', '156140400'), - ('156220174', 'district', '长春汽车经济技术开发区', '156220100'), - ('156410927', 'district', '台前县', '156410900'), - ('156350424', 'district', '宁化县', '156350400'), - ('156331083', 'district', '玉环市', '156331000'), - ('156500241', 'district', '秀山土家族苗族自治县', '156500200'), - ('156330703', 'district', '金东区', '156330700'), - ('156450223', 'district', '鹿寨县', '156450200'), - ('156532624', 'district', '麻栗坡县', '156532600'), - ('156469028', 'district', '陵水黎族自治县', '156469000'), - ('156211282', 'district', '开原市', '156211200'), - ('156370522', 'district', '利津县', '156370500'), - ('156422827', 'district', '来凤县', '156422800'), - ('156500151', 'district', '铜梁区', '156500100'), - ('156410212', 'district', '祥符区', '156410200'), - ('156410523', 'district', '汤阴县', '156410500'), - ('156371103', 'district', '岚山区', '156371100'), - ('156220221', 'district', '永吉县', '156220200'), - ('156220103', 'district', '宽城区', '156220100'), - ('156511129', 'district', '沐川县', '156511100'), - ('156445303', 'district', '云安区', '156445300'), - ('156330803', 'district', '衢江区', '156330800'), - ('156350722', 'district', '浦城县', '156350700'), - ('156411523', 'district', '新县', '156411500'), - ('156230902', 'district', '新兴区', '156230900'), - ('156140105', 'district', '小店区', '156140100'), - ('156511381', 'district', '阆中市', '156511300'), - ('156420503', 'district', '伍家岗区', '156420500'), - ('156654324', 'district', '哈巴河县', '156654300'), - ('156440784', 'district', '鹤山市', '156440700'), - ('156520203', 'district', ' 六枝特区', '156520200'), - ('156530821', 'district', '宁洱哈尼族彝族自治县', '156530800'), - ('156210504', 'district', '明山区', '156210500'), - ('156440606', 'district', '顺德区', '156440600'), - ('156130726', 'district', '蔚县', '156130700'), - ('156540426', 'district', '朗县', '156540400'), - ('156320412', 'district', '武进区', '156320400'), - ('156340521', 'district', '当涂县', '156340500'), - ('156360827', 'district', '遂川县', '156360800'), - ('156140404', 'district', '上党 区', '156140400'), - ('156610727', 'district', '略阳县', '156610700'), - ('156370871', 'district', '济宁高新技术产业开发区', '156370800'), - ('156130533', 'district', '威县', '156130500'), - ('156532322', 'district', '双柏县', '156532300'), - ('156610728', 'district', '镇巴县', '156610700'), - ('156621223', 'district', '宕昌县', '156621200'), - ('156621226', 'district', '礼县', '156621200'), - ('156653221', 'district', '和田县', '156653200'), - ('156220273', 'district', '吉林中国 新加坡食品区', '156220200'), - ('156371622', 'district', '阳信县', '156371600'), - ('156130637', 'district', '博野县', '156130600'), - ('156340825', 'district', '太湖县', '156340800'), - ('156140431', 'district', '沁源县', '156140400'), - ('156140302', 'district', '城区', '156140300'), - ('156141123', 'district', '兴县', '156141100'), - ('156623022', 'district', '卓尼县', '156623000'), - ('156410823', 'district', '武陟县', '156410800'), - ('156140405', 'district', '屯留区', '156140400'), - ('156210404', 'district', '望花区', '156210400'), - ('156632523', 'district', '贵德县', '156632500'), - ('156610525', 'district', '澄城县', '156610500'), - ('156361023', 'district', '南丰县', '156361000'), - ('156610522', 'district', '潼关县', '156610500'), - ('156632821', 'district', '乌兰县', '156632800'), - ('156511681', 'district', '华蓥市', '156511600'), - ('156510302', 'district', '自流井区', '156510300'), - ('156361130', 'district', '婺源县', '156361100'), - ('156511781', 'district', '万源市', '156511700'), - ('156130225', 'district', '乐亭县', '156130200'), - ('156620982', 'district', '敦煌市', '156620900'), - ('156441826', 'district', '连南瑶族自治县', '156441800'), - ('156420112', 'district', '东西湖区', '156420100'), - ('156220802', 'district', '洮北区', '156220800'), - ('156331081', 'district', '温岭市', '156331000'), - ('156350104', 'district', '仓山区', '156350100'), - ('156540122', 'district', '当雄县', '156540100'), - ('156220284', 'district', '磐石市', '156220200'), - ('156441423', 'district', '丰顺县', '156441400'), - ('156350982', 'district', '福鼎市', '156350900'), - ('156320305', 'district', '贾汪区', '156320300'), - ('156130826', 'district', '丰宁满族自治县', '156130800'), - ('156532525', 'district', '石屏县', '156532500'), - ('156231005', 'district', '西安区', '156231000'), - ('156422802', 'district', '利川市', '156422800'), - ('156511921', 'district', '通江县', '156511900'), - ('156632525', 'district', '贵南县', '156632500'), - ('156610602', 'district', '宝塔区', '156610600'), - ('156411722', 'district', '上蔡县', '156411700'), - ('156370112', 'district', '历城区', '156370100'), - ('156420106', 'district', '武昌区', '156420100'), - ('156540202', 'district', '桑珠孜区', '156540200'), - ('156420504', 'district', '点军区', '156420500'), - ('156140171', 'district', '山西转型综合改革示范区', '156140100'), - ('156610112', 'district', '未央区', '156610100'), - ('156140602', 'district', '朔城区', '156140600'), - ('156620123', 'district', '榆中县', '156620100'), - ('156130473', 'district', '邯郸冀南新区', '156130400'), - ('156451422', 'district', '宁明县', '156451400'), - ('156532327', 'district', '永仁县', '156532300'), - ('156620171', 'district', '兰州新区', '156620100'), - ('156410328', 'district', '洛宁县', '156410300'), - ('156371772', 'district', '菏泽高新技术开发区', '156371700'), - ('156150571', 'district', '通辽经济技术开发区', '156150500'), - ('156610523', 'district', '大荔县', '156610500'), - ('156152529', 'district', '正镶白旗', '156152500'), - ('156230622', 'district', '肇源县', '156230600'), - ('156441521', 'district', '海丰县', '156441500'), - ('156510303', 'district', '贡井区', '156510300'), - ('156130725', 'district', '尚义县', '156130700'), - ('156511321', 'district', '南部县', '156511300'), - ('156341003', 'district', '黄山区', '156341000'), - ('156610302', 'district', '渭滨区', '156610300'), - ('156360921', 'district', '奉新县', '156360900'), - ('156141033', 'district', '蒲县', '156141000'), - ('156371402', 'district', '德城区', '156371400'), - ('156440222', 'district', '始兴县', '156440200'), - ('156130683', 'district', '安国市', '156130600'), - ('156441622', 'district', '龙川县', '156441600'), - ('156220112', 'district', '双阳区', '156220100'), - ('156350181', 'district', '福清市', '156350100'), - ('156371082', 'district', '荣成市', '156371000'), - ('156610482', 'district', '彬州市', '156610400'), - ('156370203', 'district', '市北区', '156370200'), - ('156532502', 'district', '开远市', '156532500'), - ('156430671', 'district', '岳阳市屈原管理区', '156430600'), - ('156610581', 'district', '韩城市', '156610500'), - ('156632801', 'district', '格尔木市', '156632800'), - ('156510923', 'district', '大英县', '156510900'), - ('156130273', 'district', '唐山高新技术产业开发区', '156130200'), - ('156520402', 'district', '西秀区', '156520400'), - ('156533124', 'district', '陇川县', '156533100'), - ('156511827', 'district', '宝兴县', '156511800'), - ('156321071', 'district', '扬州经济技术开发区', '156321000'), - ('156451323', 'district', '武宣县', '156451300'), - ('156331004', 'district', '路桥区', '156331000'), - ('156532623', 'district', '西畴县', '156532600'), - ('156360924', 'district', '宜丰县', '156360900'), - ('156130582', 'district', '沙河市', '156130500'), - ('156330302', 'district', '鹿城区', '156330300'), - ('156350802', 'district', '新罗区', '156350800'), - ('156411624', 'district', '沈丘县', '156411600'), - ('156510107', 'district', '武侯区', '156510100'), - ('156530427', 'district', '新平彝族傣族自治县', '156530400'), - ('156321081', 'district', '仪征市', '156321000'), - ('156320381', 'district', '新沂市', '156320300'), - ('156230671', 'district', '大庆高新技术产业开发区', '156230600'), - ('156431382', 'district', '涟源市', '156431300'), - ('156440882', 'district', '雷州市', '156440800'), - ('156654026', 'district', '昭苏县', '156654000'), - ('156420202', 'district', '黄石港区', '156420200'), - ('156510121', 'district', '金堂县', '156510100'), - ('156441225', 'district', '封开县', '156441200'), - ('156341002', 'district', '屯溪区', '156341000'), - ('156341802', 'district', '宣州区', '156341800'), - ('156211204', 'district', '清河区', '156211200'), - ('156341503', 'district', '裕安区', '156341500'), - ('156360925', 'district', '靖安县', '156360900'), - ('156511112', 'district', '五通桥区', '156511100'), - ('156420117', 'district', '新洲区', '156420100'), - ('156430105', 'district', '开福区', '156430100'), - ('156211402', 'district', '连山区', '156211400'), - ('156540227', 'district', '谢通门县', '156540200'), - ('156320113', 'district', '栖霞区', '156320100'), - ('156341622', 'district', '蒙城县', '156341600'), - ('156510921', 'district', '蓬溪县', '156510900'), - ('156621022', 'district', '环县', '156621000'), - ('156140728', 'district', '平遥县', '156140700'), - ('156522632', 'district', '榕江县', '156522600'), - ('156533103', 'district', '芒市', '156533100'), - ('156130126', 'district', '灵寿县', '156130100'), - ('156230623', 'district', '林甸县', '156230600'), - ('156532626', 'district', '丘北县', '156532600'), - ('156231085', 'district', '穆棱市', '156231000'), - ('156371326', 'district', '平邑县', '156371300'), - ('156410422', 'district', '叶县', '156410400'), - ('156340281', 'district', '无为市', '156340200'), - ('156450321', 'district', '阳朔县', '156450300'), - ('156410221', 'district', '杞县', '156410200'), - ('156610322', 'district', '凤翔县', '156610300'), - ('156410882', 'district', '沁阳市', '156410800'), - ('156513325', 'district', '雅江县', '156513300'), - ('156152522', 'district', '阿巴嘎旗', '156152500'), - ('156360502', 'district', '渝水区', '156360500'), - ('156140221', 'district', '阳高县', '156140200'), - ('156522326', 'district', '望谟县', '156522300'), - ('156131122', 'district', '武邑县', '156131100'), - ('156500152', 'district', '潼南区', '156500100'), - ('156230223', 'district', '依安县', '156230200'), - ('156520323', 'district', '绥阳县', '156520300'), - ('156230422', 'district', '绥滨县', '156230400'), - ('156371371', 'district', ' 临沂高新技术产业开发区', '156371300'), - ('156420527', 'district', '秭归县', '156420500'), - ('156510421', 'district', '米易县', '156510400'), - ('156230404', 'district', '南山区', '156230400'), - ('156410223', 'district', '尉氏县', '156410200'), - ('156410802', 'district', '解放区', '156410800'), - ('156411322', 'district', '方城县', '156411300'), - ('156411723', 'district', '平舆县', '156411700'), - ('156445103', 'district', '潮安区', '156445100'), - ('156621002', 'district', ' 西峰区', '156621000'), - ('156511324', 'district', '仪陇县', '156511300'), - ('156410471', 'district', '平顶山高新技术产业开发区', '156410400'), - ('156150430', 'district', '敖汉旗', '156150400'), - ('156410602', 'district', '鹤山区', '156410600'), - ('156450124', 'district', '马山县', '156450100'), - ('156321171', 'district', '镇江新区', '156321100'), - ('156430103', 'district', '天心区', '156430100'), - ('156360824', 'district', '新干县', '156360800'), - ('156150922', 'district', '化德县', '156150900'), - ('156650502', 'district', '伊州区', '156650500'), - ('156130208', 'district', '丰润区', '156130200'), - ('156540324', 'district', '丁青县', '156540300'), - ('156540523', 'district', '桑日县', '156540500'), - ('156330381', 'district', '瑞安市', '156330300'), - ('156410105', 'district', '金水区', '156410100'), - ('156340422', 'district', '寿县', '156340400'), - ('156441226', 'district', '德庆县', '156441200'), - ('156620822', 'district', '灵台县', '156620800'), - ('156431125', 'district', '江永县', '156431100'), - ('156350981', 'district', '福安市', '156350900'), - ('156140829', 'district', '平陆县', '156140800'), - ('156431302', 'district', '娄星区', '156431300'), - ('156440904', 'district', '电白区', '156440900'), - ('156350581', 'district', '石狮市', '156350500'), - ('156440305', 'district', '南山区', '156440300'), - ('156440512', 'district', '濠江区', '156440500'), - ('156130608', 'district', '清苑区', '156130600'), - ('156130371', 'district', '秦皇岛市经济技术开发区', '156130300'), - ('156620524', 'district', '武山县', '156620500'), - ('156652328', 'district', '木垒哈萨克自治县', '156652300'), - ('156511922', 'district', '南江县', '156511900'), - ('156150627', 'district', '伊金霍洛旗', '156150600'), - ('156131102', 'district', '桃城区', '156131100'), - ('156230805', 'district', '东风区', '156230800'), - ('156360802', 'district', '吉州区', '156360800'), - ('156520121', 'district', '开阳县', '156520100'), - ('156500237', 'district', '巫山县', '156500200'), - ('156120105', 'district', '河北区', '156120100'), - ('156360982', 'district', '樟树市', '156360900'), - ('156141024', 'district', '洪洞县', '156141000'), - ('156130503', 'district', '信都区', '156130500'), - ('156230402', 'district', '向阳区', '156230400'), - ('156130529', 'district', '巨鹿县', '156130500'), - ('156420702', 'district', '梁子湖区', '156420700'), - ('156650522', 'district', '伊吾县', '156650500'), - ('156140225', 'district', '浑源县', '156140200'), - ('156522627', 'district', '天柱县', '156522600'), - ('156411104', 'district', '召陵区', '156411100'), - ('156532924', 'district', '宾川县', '156532900'), - ('156420304', 'district', '郧阳区', '156420300'), - ('156130281', 'district', '遵化市', '156130200'), - ('156321023', 'district', '宝应县', '156321000'), - ('156520626', 'district', '德江县', '156520600'), - ('156330702', 'district', '婺城区', '156330700'), - ('156441621', 'district', '紫 金县', '156441600'), - ('156640221', 'district', '平罗县', '156640200'), - ('156450512', 'district', '铁山港区', '156450500'), - ('156220281', 'district', '蛟河市', '156220200'), - ('156510904', 'district', '安居区', '156510900'), - ('156532504', 'district', '弥勒市', '156532500'), - ('156130402', 'district', '邯山区', '156130400'), - ('156371329', 'district', '临沭县', '156371300'), - ('156610124', 'district', '周至县', '156610100'), - ('156130973', 'district', '沧州渤海新区', '156130900'), - ('156532926', 'district', '南涧彝族自治县', '156532900'), - ('156231224', 'district', '庆安县', '156231200'), - ('156140922', 'district', '五台县', '156140900'), - ('156331082', 'district', '临海市', '156331000'), - ('156654224', 'district', '托里县', '156654200'), - ('156430203', 'district', '芦淞区', '156430200'), - ('156460401', 'district', '儋州市', '156460400'), - ('156522633', 'district', '从江县', '156522600'), - ('156500107', 'district', '九龙坡区', '156500100'), - ('156610703', 'district', '南郑区', '156610700'), - ('156410972', 'district', '濮阳经济技术开发区', '156410900'), - ('156652829', 'district', '博湖县', '156652800'), - ('156130205', 'district', '开平区', '156130200'), - ('156540171', 'district', '格尔木藏青工业园区', '156540100'), - ('156469030', 'district', '琼中黎族苗族自治县', '156469000'), - ('156420502', 'district', '西陵区', '156420500'), - ('156210922', 'district', '彰武县', '156210900'), - ('156150124', 'district', '清水河县', '156150100'), - ('156230225', 'district', '甘南县', '156230200'), - ('156341124', 'district', '全椒县', '156341100'), - ('156510116', 'district', '双流区', '156510100'), - ('156540328', 'district', '芒康县', '156540300'), - ('156610603', 'district', '安塞区', '156610600'), - ('156411503', 'district', '平桥区', '156411500'), - ('156140827', 'district', '垣曲县', '156140800'), - ('156141032', 'district', '永和县', '156141000'), - ('156211122', 'district', '盘山县', '156211100'), - ('156510304', 'district', '大安区', '156510300'), - ('156341023', 'district', '黟县', '156341000'), - ('156411372', 'district', '南阳市城乡一体化示范区', '156411300'), - ('156211303', 'district', '龙城区', '156211300'), - ('156652722', 'district', '精河县', '156652700'), - ('156520382', 'district', '仁怀市', '156520300'), - ('156451424', 'district', '大新县', '156451400'), - ('156370681', 'district', '龙口市', '156370600'), - ('156659006', 'district', '铁门关市', '156659000'), - ('156430724', 'district', '临澧县', '156430700'), - ('156530829', 'district', '西盟佤族自治县', '156530800'), - ('156232762', 'district', '松岭区', '156232700'), - ('156340706', 'district', '义安区', '156340700'), - ('156350629', 'district', '华安县', '156350600'), - ('156370502', 'district', '东营区', '156370500'), - ('156530127', 'district', '嵩明县', '156530100'), - ('156130706', 'district', '下花园区', '156130700'), - ('156421023', 'district', '监利县', '156421000'), - ('156350421', 'district', '明溪县', '156350400'), - ('156440804', 'district', '坡头区', '156440800'), - ('156140826', 'district', '绛县', '156140800'), - ('156532329', 'district', '武定县', '156532300'), - ('156330326', 'district', '平阳县', '156330300'), - ('156310107', 'district', '普陀区', '156310100'), - ('156440983', 'district', '信宜市', '156440900'), - ('156130634', 'district', '曲阳县', '156130600'), - ('156310106', 'district', '静安区', '156310100'), - ('156441302', 'district', '惠城区', '156441300'), - ('156150103', 'district', '回民区', '156150100'), - ('156230781', 'district', '铁力市', '156230700'), - ('156350105', 'district', '马尾区', '156350100'), - ('156150981', 'district', '丰镇市', '156150900'), - ('156320115', 'district', '江宁区', '156320100'), - ('156522327', 'district', '册亨县', '156522300'), - ('156533102', 'district', '瑞丽市', '156533100'), - ('156220882', 'district', '大安市', '156220800'), - ('156469023', 'district', '澄迈县', '156469000'), - ('156350403', 'district', '三元区', '156350400'), - ('156440307', 'district', '龙岗区', '156440300'), - ('156513228', 'district', '黑水县', '156513200'), - ('156450903', 'district', '福绵区', '156450900'), - ('156350102', 'district', '鼓楼区', '156350100'), - ('156411621', 'district', '扶沟县', '156411600'), - ('156130505', 'district', '任泽区', '156130500'), - ('156610632', 'district', '黄陵县', '156610600'), - ('156530102', 'district', '五华区', '156530100'), - ('156120110', 'district', '东丽区', '156120100'), - ('156610303', 'district', '金台区', '156610300'), - ('156430722', 'district', '汉寿县', '156430700'), - ('156131172', 'district', '衡水滨湖新区', '156131100'), - ('156350203', 'district', '思明区', '156350200'), - ('156360926', 'district', '铜鼓县', '156360900'), - ('156371603', 'district', '沾化区', '156371600'), - ('156653222', 'district', '墨玉县', '156653200'), - ('156411328', 'district', '唐河县', '156411300'), - ('156150222', 'district', '固阳县', '156150200'), - ('156445281', 'district', '普宁市', '156445200'), - ('156220204', 'district', '船营区', '156220200'), - ('156320117', 'district', '溧水区', '156320100'), - ('156540325', 'district', '察雅县', '156540300'), - ('156610326', 'district', '眉县', '156610300'), - ('156410603', 'district', '山城区', '156410600'), - ('156220272', 'district', '吉林高新技术产业开发区', '156220200'), - ('156331181', 'district', '龙泉市', '156331100'), - ('156630203', 'district', '平安区', '156630200'), - ('156350426', 'district', '尤溪县', '156350400'), - ('156120112', 'district', '津南区', '156120100'), - ('156542522', 'district', '札达县', '156542500'), - ('156440604', 'district', '禅城区', '156440600'), - ('156150204', 'district', '青山区', '156150200'), - ('156510504', 'district', '龙马潭区', '156510500'), - ('156610425', 'district', '礼泉县', '156610400'), - ('156441403', 'district', '梅县区', '156441400'), - ('156610803', 'district', '横山区', '156610800'), - ('156620722', 'district', '民乐县', '156620700'), - ('156330212', 'district', '鄞州区', '156330200'), - ('156421022', 'district', '公安县', '156421000'), - ('156341322', 'district', '萧县', '156341300'), - ('156623001', 'district', '合作市', '156623000'), - ('156411102', 'district', '源汇区', '156411100'), - ('156532627', 'district', '广南县', '156532600'), - ('156420684', 'district', '宜城市', '156420600'), - ('156441402', 'district', '梅江区', '156441400'), - ('156110101', 'district', '东城区', '156110100'), - ('156140923', 'district', '代县', '156140900'), - ('156620422', 'district', '会宁县', '156620400'), - ('156220202', 'district', '昌邑区', '156220200'), - ('156340405', 'district', '八公山区', '156340400'), - ('156430407', 'district', '石鼓区', '156430400'), - ('156410104', 'district', '管城回族区', '156410100'), - ('156421121', 'district', '团风县', '156421100'), - ('156411121', 'district', '舞阳县', '156411100'), - ('156130804', 'district', '鹰手营子矿区', '156130800'), - ('156422825', 'district', '宣恩县', '156422800'), - ('156330213', 'district', '奉化区', '156330200'), - ('156440112', 'district', '黄埔区', '156440100'), - ('156451026', 'district', '那坡县', '156451000'), - ('156210804', 'district', '鲅鱼圈区', '156210800'), - ('156141130', 'district', '交口县', '156141100'), - ('156371581', 'district', '临清市', '156371500'), - ('156532529', 'district', '红河县', '156532500'), - ('156441424', 'district', '五华县', '156441400'), - ('156520322', 'district', '桐梓县', '156520300'), - ('156513331', 'district', '白玉县', '156513300'), - ('156610329', 'district', '麟游县', '156610300'), - ('156130423', 'district', '临漳县', '156130400'), - ('156341022', 'district', '休宁县', '156341000'), - ('156131125', 'district', '安平县', '156131100'), - ('156411271', 'district', '河南三门峡经济开发区', '156411200'), - ('156445203', 'district', '揭东区', '156445200'), - ('156530923', 'district', ' 永德县', '156530900'), - ('156141028', 'district', '吉县', '156141000'), - ('156350623', 'district', '漳浦县', '156350600'), - ('156510129', 'district', '大邑县', '156510100'), - ('156130129', 'district', '赞皇县', '156130100'), - ('156421181', 'district', '麻城市', '156421100'), - ('156430524', 'district', '隆回县', '156430500'), - ('156810009', 'district', '观塘区', '156810100'), - ('156440117', 'district', '从化区', '156440100'), - ('156610628', 'district', '富县', '156610600'), - ('156511523', 'district', '江安县', '156511500'), - ('156430522', 'district', '新邵县', '156430500'), - ('156522324', 'district', '晴隆县', '156522300'), - ('156610724', 'district', '西乡县', '156610700'), - ('156360923', 'district', '上高 县', '156360900'), - ('156140622', 'district', '应县', '156140600'), - ('156130435', 'district', '曲周县', '156130400'), - ('156321111', 'district', '润州区', '156321100'), - ('156330521', 'district', '德清县', '156330500'), - ('156411327', 'district', '社旗县', '156411300'), - ('156430602', 'district', '岳阳楼区', '156430600'), - ('156320804', 'district', '淮阴区', '156320800'), - ('156450302', 'district', '秀峰区', '156450300'), - ('156654322', 'district', '富蕴县', '156654300'), - ('156533122', 'district', '梁河县', '156533100'), - ('156350926', 'district', '柘荣县', '156350900'), - ('156141127', 'district', '岚县', '156141100'), - ('156431381', 'district', '冷水江市', '156431300'), - ('156370321', 'district', '桓台 县', '156370300'), - ('156150526', 'district', '扎鲁特旗', '156150500'), - ('156350303', 'district', '涵江区', '156350300'), - ('156710011', 'district', '屏东县', '156710100'), - ('156411202', 'district', '湖滨区', '156411200'), - ('156460322', 'district', '南沙群岛', '156460300'), - ('156140721', 'district', '榆社县', '156140700'), - ('156530721', 'district', '玉龙纳西族自治县', '156530700'), - ('156411381', 'district', '邓州市', '156411300'), - ('156150625', 'district', '杭锦旗', '156150600'), - ('156420683', 'district', '枣阳市', '156420600'), - ('156130927', 'district', '南皮县', '156130900'), - ('156650102', 'district', '天山区', '156650100'), - ('156431003', 'district', '苏仙区', '156431000'), - ('156230606', 'district', '大同区', '156230600'), - ('156330304', 'district', '瓯海区', '156330300'), - ('156130183', 'district', '晋州市', '156130100'), - ('156232763', 'district', '新林区', '156232700'), - ('156320671', 'district', '南通经济技术开发区', '156320600'), - ('156431023', 'district', '永兴县', '156431000'), - ('156451029', 'district', '田林县', '156451000'), - ('156230828', 'district', '汤原县', '156230800'), - ('156420528', 'district', '长阳土家族自治县', '156420500'), - ('156341172', 'district', '滁州经济技术开发区', '156341100'), - ('156440781', 'district', '台山市', '156440700'), - ('156540526', 'district', '措美县', '156540500'), - ('156640381', 'district', '青铜峡市', '156640300'), - ('156340522', 'district', '含山 县', '156340500'), - ('156710018', 'district', '桃园市', '156710100'), - ('156350128', 'district', '平潭县', '156350100'), - ('156433125', 'district', '保靖县', '156433100'), - ('156451082', 'district', '平果市', '156451000'), - ('156411521', 'district', '罗山县', '156411500'), - ('156652325', 'district', '奇台县', '156652300'), - ('156330211', 'district', '镇海区', '156330200'), - ('156350505', 'district', '泉港区', '156350500'), - ('156610403', 'district', '杨陵区', '156610400'), - ('156632722', 'district', '杂多县', '156632700'), - ('156341004', 'district', '徽州区', '156341000'), - ('156350725', 'district', '政和县', '156350700'), - ('156310151', 'district', '崇明区', '156310100'), - ('156441721', 'district', '阳西 县', '156441700'), - ('156632222', 'district', '祁连县', '156632200'), - ('156652324', 'district', '玛纳斯县', '156652300'), - ('156530922', 'district', '云县', '156530900'), - ('156540327', 'district', '左贡县', '156540300'), - ('156320826', 'district', '涟水县', '156320800'), - ('156210112', 'district', '浑南区', '156210100'), - ('156410481', 'district', '舞钢市', '156410400'), - ('156611024', 'district', '山阳县', '156611000'), - ('156230406', 'district', '东山区', '156230400'), - ('156440203', 'district', '武江区', '156440200'), - ('156130606', 'district', '莲池区', '156130600'), - ('156441781', 'district', '阳春市', '156441700'), - ('156650107', 'district', '达坂城区', '156650100'), - ('156652901', 'district', '阿 克苏市', '156652900'), - ('156340603', 'district', '相山区', '156340600'), - ('156220172', 'district', '长春净月高新技术产业开发区', '156220100'), - ('156320213', 'district', '梁溪区', '156320200'), - ('156420802', 'district', '东宝区', '156420800'), - ('156511527', 'district', '筠连县', '156511500'), - ('156640122', 'district', '贺兰县', '156640100'), - ('156230305', 'district', '梨树区', '156230300'), - ('156370724', 'district', '临朐县', '156370700'), - ('156150502', 'district', '科尔沁区', '156150500'), - ('156130921', 'district', '沧县', '156130900'), - ('156140522', 'district', '阳城县', '156140500'), - ('156130102', 'district', '长安区', '156130100'), - ('156310117', 'district', '松江区', '156310100'), - ('156450329', 'district', '资源县', '156450300'), - ('156410923', 'district', '南乐县', '156410900'), - ('156330726', 'district', '浦江县', '156330700'), - ('156130406', 'district', '峰峰矿区', '156130400'), - ('156230605', 'district', '红岗区', '156230600'), - ('156431172', 'district', '永州市金洞管理区', '156431100'), - ('156450924', 'district', '兴业县', '156450900'), - ('156360822', 'district', '吉水县', '156360800'), - ('156371503', 'district', '茌平区', '156371500'), - ('156371073', 'district', '威海临港经济技术开发区', '156371000'), - ('156411303', 'district', '卧龙区', '156411300'), - ('156620902', 'district', '肃州区', '156620900'), - ('156370523', 'district', '广饶县', '156370500'), - ('156230503', 'district', '岭 东区', '156230500'), - ('156320706', 'district', '海州区', '156320700'), - ('156330503', 'district', '南浔区', '156330500'), - ('156520325', 'district', '道真仡佬族苗族自治县', '156520300'), - ('156522328', 'district', '安龙县', '156522300'), - ('156530925', 'district', '双江拉祜族佤族布朗族傣族自治县', '156530900'), - ('156330483', 'district', '桐乡市', '156330400'), - ('156421102', 'district', '黄州区', '156421100'), - ('156654226', 'district', '和布克赛尔蒙古自治县', '156654200'), - ('156500233', 'district', '忠县', '156500200'), - ('156370781', 'district', '青州市', '156370700'), - ('156659001', 'district', '石河子市', '156659000'), - ('156511771', 'district', '达州经济开发区', '156511700'), - ('156610902', 'district', '汉滨区', '156610900'), - ('156440111', 'district', '白云区', '156440100'), - ('156210711', 'district', '太和区', '156210700'), - ('156622922', 'district', '康乐县', '156622900'), - ('156130682', 'district', '定州市', '156130600'), - ('156231102', 'district', '爱辉区', '156231100'), - ('156440306', 'district', '宝安区', '156440300'), - ('156350627', 'district', '南靖县', '156350600'), - ('156350583', 'district', '南安市', '156350500'), - ('156513432', 'district', '喜德县', '156513400'), - ('156370114', 'district', '章丘区', '156370100'), - ('156130773', 'district', '张家口市塞北管理区', '156130700'), - ('156152524', 'district', '苏尼特右旗', '156152500'), - ('156331124', 'district', '松阳县', '156331100'), - ('156320404', 'district', '钟楼区', '156320400'), - ('156130624', 'district', '阜平县', '156130600'), - ('156440803', 'district', '霞山区', '156440800'), - ('156130628', 'district', '高阳县', '156130600'), - ('156410782', 'district', '辉县市', '156410700'), - ('156540236', 'district', '萨嘎县', '156540200'), - ('156610402', 'district', '秦都区', '156610400'), - ('156210202', 'district', '中山区', '156210200'), - ('156522702', 'district', '福泉市', '156522700'), - ('156653121', 'district', '疏附县', '156653100'), - ('156510722', 'district', '三台县', '156510700'), - ('156653022', 'district', '阿克陶县', '156653000'), - ('156370923', 'district', '东平县', '156370900'), - ('156360922', 'district', '万载县', '156360900'), - ('156131026', 'district', '文安县', '156131000'), - ('156511302', 'district', '顺庆区', '156511300'), - ('156210123', 'district', '康平县', '156210100'), - ('156451081', 'district', '靖西市', '156451000'), - ('156440902', 'district', '茂南区', '156440900'), - ('156620622', 'district', '古浪县', '156620600'), - ('156510524', 'district', '叙永县', '156510500'), - ('156710013', 'district', '台东县', '156710100'), - ('156513225', 'district', '九寨沟县', '156513200'), - ('156371325', 'district', '费县', '156371300'), - ('156451322', 'district', '象州县', '156451300'), - ('156654024', 'district', '巩留县', '156654000'), - ('156532925', 'district', '弥渡县', '156532900'), - ('156623023', 'district', '舟曲县', '156623000'), - ('156511725', 'district', '渠县', '156511700'), - ('156451202', 'district', '金城江区', '156451200'), - ('156230811', 'district', '郊区', '156230800'), - ('156341721', 'district', '东至县', '156341700'), - ('156330411', 'district', '秀洲区', '156330400'), - ('156632724', 'district', '治多县', '156632700'), - ('156431223', 'district', '辰溪县', '156431200'), - ('156341024', 'district', '祁门县', '156341000'), - ('156141023', 'district', '襄汾县', '156141000'), - ('156230207', 'district', '碾子山区', '156230200'), - ('156321204', 'district', '姜堰区', '156321200'), - ('156371083', 'district', '乳山市', '156371000'), - ('156511181', 'district', '峨眉山市', '156511100'), - ('156150102', 'district', '新城区', '156150100'), - ('156131025', 'district', '大城县', '156131000'), - ('156440205', 'district', '曲江区', '156440200'), - ('156450204', 'district', '柳南区', '156450200'), - ('156611002', 'district', '商州区', '156611000'), - ('156430121', 'district', '长沙县', '156430100'), - ('156460321', 'district', '西沙群岛', '156460300'), - ('156321012', 'district', '江都区', '156321000'), - ('156222426', 'district', '安图县', '156222400'), - ('156532928', 'district', '永平县', '156532900'), - ('156310113', 'district', '宝山区', '156310100'), - ('156450326', 'district', '永福县', '156450300'), - ('156442001', 'district', '中山市', '156442000'), - ('156220581', 'district', '梅河口市', '156220500'), - ('156230421', 'district', '萝北县', '156230400'), - ('156371327', 'district', '莒南县', '156371300'), - ('156230108', 'district', '平房区', '156230100'), - ('156341181', 'district', '天长市', '156341100'), - ('156371725', 'district', '郓城县', '156371700'), - ('156340826', 'district', '宿松县', '156340800'), - ('156371721', 'district', '曹县', '156371700'), - ('156210213', 'district', '金州区', '156210200'), - ('156361128', 'district', '鄱阳县', '156361100'), - ('156130502', 'district', '襄都区', '156130500'), - ('156361123', 'district', '玉山县', '156361100'), - ('156150902', 'district', '集宁区', '156150900'), - ('156330784', 'district', '永康市', '156330700'), - ('156530902', 'district', '临翔区', '156530900'), - ('156530921', 'district', '凤庆县', '156530900'), - ('156341204', 'district', '颍泉区', '156341200'), - ('156421083', 'district', '洪湖市', '156421000'), - ('156370832', 'district', '梁山县', '156370800'), - ('156410323', 'district', '新安县', '156410300'), - ('156520303', 'district', '汇川区', '156520300'), - ('156211223', 'district', '西丰县', '156211200'), - ('156530827', 'district', '孟连傣族拉祜族佤族自治县', '156530800'), - ('156340881', 'district', '桐城市', '156340800'), - ('156540423', 'district', '墨脱县', '156540400'), - ('156150927', 'district', '察哈尔右翼中旗', '156150900'), - ('156450303', 'district', '叠彩区', '156450300'), - ('156530302', 'district', '麒麟区', '156530300'), - ('156350213', 'district', '翔安区', '156350200'), - ('156370115', 'district', '济阳区', '156370100'), - ('156540421', 'district', '工布江达县', '156540400'), - ('156150125', 'district', '武川县', '156150100'), - ('156530125', 'district', '宜良县', '156530100'), - ('156421123', 'district', '罗田县', '156421100'), - ('156131103', 'district', '冀州区', '156131100'), - ('156341502', 'district', '金安区', '156341500'), - ('156440303', 'district', '罗湖区', '156440300'), - ('156320904', 'district', '大丰区', '156320900'), - ('156532929', 'district', '云龙县', '156532900'), - ('156230822', 'district', '桦南县', '156230800'), - ('156520525', 'district', '纳雍县', '156520500'), - ('156450203', 'district', '鱼峰区', '156450200'), - ('156370831', 'district', '泗水县', '156370800'), - ('156421202', 'district', '咸安区', '156421200'), - ('156610921', 'district', '汉阴县', '156610900'), - ('156511325', 'district', '西充县', '156511300'), - ('156653024', 'district', '乌恰县', '156653000'), - ('156511071', 'district', '内江经济开发区', '156511000'), - ('156500230', 'district', '丰都县', '156500200'), - ('156451123', 'district', '富川瑶族自治县', '156451100'), - ('156431028', 'district', '安仁县', '156431000'), - ('156632622', 'district', '班玛县', '156632600'), - ('156130432', 'district', '广平县', '156130400'), - ('156140428', 'district', '长子县', '156140400'), - ('156510603', 'district', '旌阳区', '156510600'), - ('156710010', 'district', '澎湖县', '156710100'), - ('156321182', 'district', '扬中市', '156321100'), - ('156632726', 'district', '曲麻莱县', '156632700'), - ('156140121', 'district', '清徐县', '156140100'), - ('156717000', 'district', '苗栗县', '156710100'), - ('156360703', 'district', '南康区', '156360700'), - ('156370881', 'district', '曲阜市', '156370800'), - ('156441803', 'district', '清新区', '156441800'), - ('156430528', 'district', '新宁县', '156430500'), - ('156340321', 'district', '怀远县', '156340300'), - ('156420281', 'district', '大冶市', '156420200'), - ('156540237', 'district', '岗巴县', '156540200'), - ('156500117', 'district', '合川区', '156500100'), - ('156610827', 'district', '米脂县', '156610800'), - ('156451003', 'district', '田阳区', '156451000'), - ('156430304', 'district', '岳塘区', '156430300'), - ('156511524', 'district', '长宁县', '156511500'), - ('156411524', 'district', '商城县', '156411500'), - ('156410122', 'district', '中牟县', '156410100'), - ('156370171', 'district', '济南高新技术产业开发区', '156370100'), - ('156431173', 'district', '永州市回龙圩管理区', '156431100'), - ('156330127', 'district', '淳安县', '156330100'), - ('156410324', 'district', '栾川县', '156410300'), - ('156511602', 'district', '广安区', '156511600'), - ('156211381', 'district', '北票市', '156211300'), - ('156320571', 'district', '苏州工业园区', '156320500'), - ('156341272', 'district', '阜阳经济技术开发区', '156341200'), - ('156370302', 'district', '淄川区', '156370300'), - ('156410472', 'district', '平顶山市城乡一体化示范区', '156410400'), - ('156340102', 'district', '瑶海区', '156340100'), - ('156511402', 'district', '东坡区', '156511400'), - ('156520103', 'district', '云岩区', '156520100'), - ('156130203', 'district', '路北区', '156130200'), - ('156120113', 'district', '北辰区', '156120100'), - ('156510821', 'district', '旺苍县', '156510800'), - ('156211103', 'district', '兴隆台区', '156211100'), - ('156371428', 'district', '武城县', '156371400'), - ('156654201', 'district', '塔城市', '156654200'), - ('156371122', 'district', '莒县', '156371100'), - ('156371102', 'district', '东港区', '156371100'), - ('156530524', 'district', '昌宁县', '156530500'), - ('156230205', 'district', '昂昂溪区', '156230200'), - ('156130125', 'district', '行唐县', '156130100'), - ('156511425', 'district', '青神县', '156511400'), - ('156530303', 'district', '沾益区', '156530300'), - ('156520527', 'district', '赫章县', '156520500'), - ('156422828', 'district', '鹤峰县', '156422800'), - ('156532822', 'district', '勐海县', '156532800'), - ('156361002', 'district', '临川区', '156361000'), - ('156140106', 'district', '迎泽区', '156140100'), - ('156411171', 'district', '漯河经济技术开发区', '156411100'), - ('156440607', 'district', '三水区', '156440600'), - ('156130609', 'district', '徐水区', '156130600'), - ('156450110', 'district', '武鸣区', '156450100'), - ('156532931', 'district', '剑川县', '156532900'), - ('156530423', 'district', '通海县', '156530400'), - ('156410173', 'district', '郑州航空港经济综合实验区', '156410100'), - ('156150525', 'district', '奈曼旗', '156150500'), - ('156533422', 'district', '德钦县', '156533400'), - ('156450603', 'district', '防城区', '156450600'), - ('156340323', 'district', '固镇县', '156340300'), - ('156340311', 'district', '淮上区', '156340300'), - ('156211081', 'district', '灯塔市', '156211000'), - ('156450127', 'district', '横县', '156450100'), - ('156210281', 'district', '瓦房店市', '156210200'), - ('156210902', 'district', '海 州区', '156210900'), - ('156370285', 'district', '莱西市', '156370200'), - ('156230603', 'district', '龙凤区', '156230600'), - ('156630222', 'district', '民和回族土族自治县', '156630200'), - ('156370826', 'district', '微山县', '156370800'), - ('156411522', 'district', '光山县', '156411500'), - ('156341602', 'district', '谯城区', '156341600'), - ('156130522', 'district', '临城县', '156130500'), - ('156450323', 'district', '灵川县', '156450300'), - ('156511724', 'district', '大竹县', '156511700'), - ('156610881', 'district', '神木市', '156610800'), - ('156210681', 'district', '东港市', '156210600'), - ('156150429', 'district', '宁城县', '156150400'), - ('156130984', 'district', '河间市', '156130900'), - ('156320707', 'district', '赣榆区', '156320700'), - ('156230102', 'district', '道里区', '156230100'), - ('156220105', 'district', '二道区', '156220100'), - ('156150621', 'district', '达拉特旗', '156150600'), - ('156130433', 'district', '馆陶县', '156130400'), - ('156220271', 'district', '吉林经济开发区', '156220200'), - ('156513431', 'district', '昭觉县', '156513400'), - ('156150121', 'district', '土默特左旗', '156150100'), - ('156540530', 'district', '错那县', '156540500'), - ('156420505', 'district', '猇亭区', '156420500'), - ('156231083', 'district', '海林市', '156231000'), - ('156320921', 'district', '响水县', '156320900'), - ('156640106', 'district', '金凤区', '156640100'), - ('156130708', 'district', '万全区', '156130700'), - ('156140925', 'district', '宁武县', '156140900'), - ('156810011', 'district', '屯门区', '156810100'), - ('156230751', 'district', '金林区', '156230700'), - ('156540302', 'district', '卡若区', '156540300'), - ('156623024', 'district', '迭部县', '156623000'), - ('156370829', 'district', '嘉祥县', '156370800'), - ('156140971', 'district', '五台山风景名胜区', '156140900'), - ('156410182', 'district', '荥阳市', '156410100'), - ('156371427', 'district', '夏津县', '156371400'), - ('156350481', 'district', '永安市', '156350400'), - ('156610627', 'district', '甘泉县', '156610600'), - ('156540521', 'district', '扎囊县', '156540500'), - ('156231202', 'district', '北林区', '156231200'), - ('156621124', 'district', '临洮县', '156621100'), - ('156420704', 'district', '鄂城区', '156420700'), - ('156220403', 'district', '西安区', '156220400'), - ('156320813', 'district', '洪泽区', '156320800'), - ('156810014', 'district', '大埔区', '156810100'), - ('156141122', 'district', '交城县', '156141100'), - ('156220173', 'district', '长春高新技术产业开发区', '156220100'), - ('156510131', 'district', '蒲江县', '156510100'), - ('156620105', 'district', '安宁区', '156620100'), - ('156532326', 'district', '大姚县', '156532300'), - ('156810004', 'district', '南区', '156810100'), - ('156520425', 'district', '紫云苗族布依族自治县', '156520400'), - ('156210881', 'district', '盖州市', '156210800'), - ('156140926', 'district', '静乐县', '156140900'), - ('156610725', 'district', '勉县', '156610700'), - ('156441427', 'district', '蕉岭县', '156441400'), - ('156513436', 'district', '美姑县', '156513400'), - ('156500118', 'district', '永川区', '156500100'), - ('156540225', 'district', '拉孜县', '156540200'), - ('156620881', 'district', '华亭市', '156620800'), - ('156321003', 'district', '邗江区', '156321000'), - ('156210214', 'district', '普兰店区', '156210200'), - ('156654325', 'district', '青河县', '156654300'), - ('156220781', 'district', '扶余市', '156220700'), - ('156623027', 'district', '夏河县', '156623000'), - ('156360735', 'district', '石城县', '156360700'), - ('156220282', 'district', '桦甸市', '156220200'), - ('156220422', 'district', '东辽县', '156220400'), - ('156350524', 'district', '安溪县', '156350500'), - ('156110117', 'district', '平谷区', '156110100'), - ('156810002', 'district', '湾仔区', '156810100'), - ('156520115', 'district', '观山湖区', '156520100'), - ('156320703', 'district', '连云区', '156320700'), - ('156150403', 'district', '元宝山区', '156150400'), - ('156410781', 'district', '卫辉市', '156410700'), - ('156440113', 'district', '番禺区', '156440100'), - ('156360722', 'district', '信丰县', '156360700'), - ('156511621', 'district', '岳池 县', '156511600'), - ('156140429', 'district', '武乡县', '156140400'), - ('156530823', 'district', '景东彝族自治县', '156530800'), - ('156540529', 'district', '隆子县', '156540500'), - ('156130121', 'district', '井陉县', '156130100'), - ('156430412', 'district', '南岳区', '156430400'), - ('156610204', 'district', '耀州区', '156610200'), - ('156130426', 'district', '涉县', '156130400'), - ('156533324', 'district', '贡山独龙族怒族自治县', '156533300'), - ('156350703', 'district', ' 建阳区', '156350700'), - ('156350582', 'district', '晋江市', '156350500'), - ('156110107', 'district', '石景山区', '156110100'), - ('156431229', 'district', '靖州苗族侗族自治县', '156431200'), - ('156140425', 'district', '平顺县', '156140400'), - ('156360123', 'district', '安义县', '156360100'), - ('156371728', 'district', '东明县', '156371700'), - ('156420115', 'district', '江夏区', '156420100'), - ('156500153', 'district', '荣昌区', '156500100'), - ('156620981', 'district', '玉 门市', '156620900'), - ('156540622', 'district', '比如县', '156540600'), - ('156610681', 'district', '子长市', '156610600'), - ('156140426', 'district', '黎城县', '156140400'), - ('156110115', 'district', '大兴区', '156110100'), - ('156610481', 'district', '兴平市', '156610400'), - ('156131003', 'district', '广阳区', '156131000'), - ('156320871', 'district', '淮安经济技术开发区', '156320800'), - ('156370213', 'district', '李沧区', '156370200'), - ('156220421', 'district', '东丰县', '156220400'), - ('156810007', 'district', '九龙城区', '156810100'), - ('156150105', 'district', '赛罕区', '156150100'), - ('156411324', 'district', '镇平县', '156411300'), - ('156220621', 'district', '抚松县', '156220600'), - ('156330783', 'district', '东阳市', '156330700'), - ('156320723', 'district', '灌云县', '156320700'), - ('156210304', 'district', '立山区', '156210300'), - ('156130824', 'district', '滦平县', '156130800'), - ('156330825', 'district', '龙游县', '156330800'), - ('156532530', 'district', '金平苗族瑶族傣族自治县', '156532500'), - ('156410505', 'district', '殷都区', '156410500'), - ('156230523', 'district', '宝清县', '156230500'), - ('156532532', 'district', '河口瑶族自治县', '156532500'), - ('156522635', 'district', '麻江县', '156522600'), - ('156140303', 'district', '矿区', '156140300'), - ('156450330', 'district', '平乐县', '156450300'), - ('156140722', 'district', '左权县', '156140700'), - ('156430902', 'district', '资阳区', '156430900'), - ('156421303', 'district', '曾都区', '156421300'), - ('156370406', 'district', '山亭区', '156370400'), - ('156220502', 'district', '东昌区', '156220500'), - ('156540531', 'district', '浪卡子县', '156540500'), - ('156610722', 'district', '城固县', '156610700'), - ('156371422', 'district', '宁津县', '156371400'), - ('156540123', 'district', '尼木县', '156540100'), - ('156350305', 'district', '秀屿区', '156350300'), - ('156211324', 'district', '喀喇沁左翼蒙古族自治县', '156211300'), - ('156341881', 'district', '宁国市', '156341800'), - ('156520403', 'district', '平坝区', '156520400'), - ('156120117', 'district', '宁河区', '156120100'), - ('156410322', 'district', '孟津县', '156410300'), - ('156140824', 'district', '稷山县', '156140800'), - ('156440281', 'district', '乐昌市', '156440200'), - ('156652825', 'district', '且末县', '156652800'), - ('156652828', 'district', '和硕县', '156652800'), - ('156320722', 'district', '东海县', '156320700'), - ('156130772', 'district', '张家口市察北管理区', '156130700'), - ('156610828', 'district', '佳县', '156610800'), - ('156350624', 'district', '诏安县', '156350600'), - ('156350622', 'district', '云霄县', '156350600'), - ('156654202', 'district', '乌苏市', '156654200'), - ('156360681', 'district', '贵溪市', '156360600'), - ('156500120', 'district', '璧山区', '156500100'), - ('156440224', 'district', '仁化县', '156440200'), - ('156410825', 'district', '温县', '156410800'), - ('156320411', 'district', '新北区', '156320400'), - ('156361103', 'district', '广丰区', '156361100'), - ('156140521', 'district', '沁水县', '156140500'), - ('156330802', 'district', '柯城区', '156330800'), - ('156440802', 'district', '赤坎区', '156440800'), - ('156210802', 'district', '站前区', '156210800'), - ('156320685', 'district', '海安市', '156320600'), - ('156120119', 'district', '蓟州区', '156120100'), - ('156450481', 'district', '岑溪市', '156450400'); -INSERT INTO area (id, level, name, pid) -VALUES ('156150221', 'district', '土默特右旗', '156150200'), - ('156222424', 'district', '汪清县', '156222400'), - ('156653130', 'district', '巴楚县', '156653100'), - ('156340372', 'district', '蚌埠市经济开发区', '156340300'), - ('156451381', 'district', '合山市', '156451300'), - ('156310112', 'district', '闵行区', '156310100'), - ('156350723', 'district', '光泽县', '156350700'), - ('156370828', 'district', '金乡县', '156370800'), - ('156450328', 'district', '龙胜各族自治县', '156450300'), - ('156370704', 'district', '坊子区', '156370700'), - ('156330822', 'district', '常山县', '156330800'), - ('156410172', 'district', '郑州高新技术产业开发区', '156410100'), - ('156441502', 'district', '城区', '156441500'), - ('156632521', 'district', '共和县', '156632500'), - ('156620423', 'district', '景泰县', '156620400'), - ('156320681', 'district', '启东市', '156320600'), - ('156430903', 'district', '赫山区', '156430900'), - ('156512021', 'district', '安岳县', '156512000'), - ('156420581', 'district', '宜都市', '156420500'), - ('156370215', 'district', '即墨区', '156370200'), - ('156320211', 'district', '滨湖区', '156320200'), - ('156654301', 'district', '阿勒泰市', '156654300'), - ('156520522', 'district', '黔西县', '156520500'), - ('156610122', 'district', '蓝田县', '156610100'), - ('156652827', 'district', '和静县', '156652800'), - ('156321084', 'district', '高邮市', '156321000'), - ('156510112', 'district', '龙泉驿区', '156510100'), - ('156130404', 'district', '复兴区', '156130400'), - ('156610824', 'district', '靖边县', '156610800'), - ('156511423', 'district', '洪雅县', '156511400'), - ('156230722', 'district', '嘉荫县', '156230700'), - ('156370117', 'district', '钢城区', '156370100'), - ('156630223', 'district', '互助土族自治县', '156630200'), - ('156530304', 'district', '马龙区', '156530300'), - ('156150722', 'district', '莫力达瓦达斡尔族自治旗', '156150700'), - ('156532601', 'district', '文山市', '156532600'), - ('156360732', 'district', '兴国县', '156360700'), - ('156500229', 'district', '城口县', '156500200'), - ('156120118', 'district', '静海区', '156120100'), - ('156150782', 'district', '牙克石市', '156150700'), - ('156532301', 'district', '楚雄市', '156532300'), - ('156440311', 'district', '光明区', '156440300'), - ('156320102', 'district', '玄武区', '156320100'), - ('156540102', 'district', '城关区', '156540100'), - ('156513437', 'district', '雷波县', '156513400'), - ('156620402', 'district', '白银区', '156620400'), - ('156530481', 'district', '澄江市', '156530400'), - ('156330103', 'district', '下城区', '156330100'), - ('156540222', 'district', '江孜县', '156540200'), - ('156230129', 'district', '延寿县', '156230100'), - ('156341371', 'district', '宿州马鞍山现代产业园区', '156341300'), - ('156150104', 'district', '玉泉区', '156150100'), - ('156340406', 'district', '潘集区', '156340400'), - ('156640104', 'district', '兴庆区', '156640100'), - ('156350122', 'district', '连江县', '156350100'), - ('156130633', 'district', '易县', '156130600'), - ('156370271', 'district', '青岛高新技术产业开发区', '156370200'), - ('156140802', 'district', '盐湖区', '156140800'), - ('156130229', 'district', '玉田县', '156130200'), - ('156140671', 'district', '山西朔州经济开发区', '156140600'), - ('156520304', 'district', '播州区', '156520300'), - ('156370212', 'district', '崂山区', '156370200'), - ('156320116', 'district', '六合区', '156320100'), - ('156511132', 'district', '峨边彝族自治县', '156511100'), - ('156441322', 'district', '博罗县', '156441300'), - ('156530402', 'district', '红塔区', '156530400'), - ('156361129', 'district', '万年县', '156361100'), - ('156150603', 'district', '康巴什区', '156150600'), - ('156610102', 'district', '新城区', '156610100'), - ('156320303', 'district', '云龙区', '156320300'), - ('156320581', 'district', '常熟市', '156320500'), - ('156421223', 'district', '崇阳县', '156421200'), - ('156620802', 'district', '崆峒区', '156620800'), - ('156532901', 'district', '大理市', '156532900'), - ('156360430', 'district', '彭泽县', '156360400'), - ('156130425', 'district', '大名县', '156130400'), - ('156630106', 'district', '湟中区', '156630100'), - ('156500102', 'district', '涪陵区', '156500100'), - ('156430702', 'district', '武陵区', '156430700'), - ('156340181', 'district', '巢湖市', '156340100'), - ('156621224', 'district', '康县', '156621200'), - ('156431025', 'district', '临武县', '156431000'), - ('156210113', 'district', '沈北新区', '156210100'), - ('156530128', 'district', '禄劝彝族苗族自治县', '156530100'), - ('156511083', 'district', '隆昌市', '156511000'), - ('156511902', 'district', '巴州区', '156511900'), - ('156632324', 'district', '河南蒙古族自治县', '156632300'), - ('156360113', 'district', '红谷滩区', '156360100'), - ('156620522', 'district', '秦安县', '156620500'), - ('156120102', 'district', '河 东区', '156120100'), - ('156110109', 'district', '门头沟区', '156110100'), - ('156220681', 'district', '临江市', '156220600'), - ('156530822', 'district', '墨江哈尼族自治县', '156530800'), - ('156632623', 'district', '甘德县', '156632600'), - ('156411424', 'district', '柘城县', '156411400'), - ('156511971', 'district', '巴中经济开发区', '156511900'), - ('156530115', 'district', '晋宁区', '156530100'), - ('156431128', 'district', '新田县', '156431100'), - ('156431221', 'district', '中方县', '156431200'), - ('156450327', 'district', '灌阳县', '156450300'), - ('156150522', 'district', '科尔沁左翼后旗', '156150500'), - ('156340104', 'district', '蜀山区', '156340100'), - ('156411727', 'district', '汝南县', '156411700'), - ('156150421', 'district', '阿鲁科尔沁旗', '156150400'), - ('156500235', 'district', '云阳县', '156500200'), - ('156330481', 'district', '海宁市', '156330400'), - ('156430971', 'district', '益阳市大通湖管理区', '156430900'), - ('156620302', 'district', '金川区', '156620300'), - ('156620823', 'district', '崇信县', '156620800'), - ('156420203', 'district', '西塞山区', '156420200'), - ('156320111', 'district', '浦口区', '156320100'), - ('156421125', 'district', '浠水县', '156421100'), - ('156411071', 'district', '许昌经济技术开发区', '156411000'), - ('156440823', 'district', '遂溪县', '156440800'), - ('156150702', 'district', '海拉尔区', '156150700'), - ('156411671', 'district', '河南周口经济开发区', '156411600'), - ('156411603', 'district', '淮阳区', '156411600'), - ('156430921', 'district', '南县', '156430900'), - ('156450108', 'district', '良庆区', '156450100'), - ('156522601', 'district', '凯里市', '156522600'), - ('156530723', 'district', '华坪县', '156530700'), - ('156110108', 'district', '海淀区', '156110100'), - ('156130607', 'district', '满城区', '156130600'), - ('156211224', 'district', '昌图县', '156211200'), - ('156450125', 'district', '上林县', '156450100'), - ('156370921', 'district', '宁阳县', '156370900'), - ('156610723', 'district', '洋县', '156610700'), - ('156130684', 'district', '高碑店市', '156130600'), - ('156321302', 'district', '宿城区', '156321300'), - ('156620403', 'district', '平川区', '156620400'), - ('156350429', 'district', '泰宁县', '156350400'), - ('156440308', 'district', '盐田区', '156440300'), - ('156211422', 'district', '建昌县', '156211400'), - ('156371623', 'district', '无棣县', '156371600'), - ('156511525', 'district', '高县', '156511500'), - ('156360482', 'district', '共青城市', '156360400'), - ('156210522', 'district', '桓仁满族自治县', '156210500'), - ('156620421', 'district', '靖远县', '156620400'), - ('156371602', 'district', '滨城区', '156371600'), - ('156511723', 'district', '开江县', '156511700'), - ('156211004', 'district', '宏伟区', '156211000'), - ('156513233', 'district', '红原县', '156513200'), - ('156450802', 'district', '港北区', '156450800'), - ('156530602', 'district', '昭阳区', '156530600'), - ('156130929', 'district', '献县', '156130900'), - ('156652801', 'district', '库尔勒市', '156652800'), - ('156710023', 'district', '彰化县', '156710100'), - ('156632625', 'district', '久治县', '156632600'), - ('156410804', 'district', '马村区', '156410800'), - ('156530924', 'district', '镇康县', '156530900'), - ('156330782', 'district', '义乌市', '156330700'), - ('156410922', 'district', '清丰县', '156410900'), - ('156361181', 'district', '德兴市', '156361100'), - ('156220211', 'district', '丰满区', '156220200'), - ('156420822', 'district', '沙洋县', '156420800'), - ('156150783', 'district', '扎兰屯市', '156150700'), - ('156320413', 'district', '金坛区', '156320400'), - ('156350902', 'district', '蕉城区', '156350900'), - ('156330382', 'district', '乐清市', '156330300'), - ('156450103', 'district', '青秀区', '156450100'), - ('156650103', 'district', '沙依巴克区', '156650100'), - ('156652922', 'district', '温宿县', '156652900'), - ('156450423', 'district', '蒙 山县', '156450400'), - ('156420506', 'district', '夷陵区', '156420500'), - ('156431081', 'district', '资兴市', '156431000'), - ('156451002', 'district', '右江区', '156451000'), - ('156421224', 'district', '通山县', '156421200'), - ('156511024', 'district', '威远县', '156511000'), - ('156610103', 'district', '碑林区', '156610100'), - ('156620826', 'district', '静宁县', '156620800'), - ('156610923', 'district', '宁陕县', '156610900'), - ('156511529', 'district', '屏山县', '156511500'), - ('156210102', 'district', '和平区', '156210100'), - ('156421221', 'district', '嘉鱼县', '156421200'), - ('156410329', 'district', '伊川县', '156410300'), - ('156130722', 'district', '张北县', '156130700'), - ('156371472', 'district', '德 州运河经济开发区', '156371400'), - ('156140623', 'district', '右玉县', '156140600'), - ('156513425', 'district', '会理县', '156513400'), - ('156220503', 'district', '二道江区', '156220500'), - ('156411221', 'district', '渑池县', '156411200'), - ('156210803', 'district', '西市区', '156210800'), - ('156650205', 'district', '乌尔禾区', '156650200'), - ('156520102', 'district', '南明区', '156520100'), - ('156411422', 'district', '睢县', '156411400'), - ('156321323', 'district', '泗阳 县', '156321300'), - ('156210181', 'district', '新民市', '156210100'), - ('156451302', 'district', '兴宾区', '156451300'), - ('156540104', 'district', '达孜区', '156540100'), - ('156361024', 'district', '崇仁县', '156361000'), - ('156360783', 'district', '龙南市', '156360700'), - ('156450109', 'district', '邕宁区', '156450100'), - ('156130881', 'district', '平泉市', '156130800'), - ('156211321', 'district', '朝阳县', '156211300'), - ('156130322', 'district', '昌黎县', '156130300'), - ('156520324', 'district', '正安县', '156520300'), - ('156370304', 'district', '博山区', '156370300'), - ('156510681', 'district', '广汉市', '156510600'), - ('156440881', 'district', '廉江市', '156440800'), - ('156500101', 'district', '万州 区', '156500100'), - ('156360729', 'district', '全南县', '156360700'), - ('156222406', 'district', '和龙市', '156222400'), - ('156130671', 'district', '保定高新技术产业开发区', '156130600'), - ('156130636', 'district', '顺平县', '156130600'), - ('156320602', 'district', '崇川区', '156320600'), - ('156370402', 'district', '市中区', '156370400'), - ('156630104', 'district', '城西区', '156630100'), - ('156540422', 'district', '米林县', '156540400'), - ('156370105', 'district', '天桥 区', '156370100'), - ('156420104', 'district', '硚口区', '156420100'), - ('156532324', 'district', '南华县', '156532300'), - ('156650106', 'district', '头屯河区', '156650100'), - ('156210224', 'district', '长海县', '156210200'), - ('156510503', 'district', '纳溪区', '156510500'), - ('156370705', 'district', '奎文区', '156370700'), - ('156140222', 'district', '天镇县', '156140200'), - ('156222403', 'district', '敦化市', '156222400'), - ('156610831', 'district', '子洲县', '156610800'), - ('156220183', 'district', '德惠市', '156220100'), - ('156653126', 'district', '叶城县', '156653100'), - ('156513323', 'district', '丹巴县', '156513300'), - ('156511304', 'district', '嘉陵区', '156511300'), - ('156341282', 'district', '界 首市', '156341200'), - ('156320925', 'district', '建湖县', '156320900'), - ('156370983', 'district', '肥城市', '156370900'), - ('156371071', 'district', '威海火炬高技术产业开发区', '156371000'), - ('156340207', 'district', '鸠江区', '156340200'), - ('156431228', 'district', '芷江侗族自治县', '156431200'), - ('156130623', 'district', '涞水县', '156130600'), - ('156370785', 'district', '高密市', '156370700'), - ('156632823', 'district', '天峻县', '156632800'), - ('156530626', 'district', '绥江县', '156530600'), - ('156370104', 'district', '槐荫区', '156370100'), - ('156330683', 'district', '嵊州市', '156330600'), - ('156130982', 'district', '任丘市', '156130900'), - ('156441422', 'district', '大埔县', '156441400'), - ('156411402', 'district', '梁园区', '156411400'), - ('156210302', 'district', '铁东区', '156210300'), - ('156360426', 'district', '德安县', '156360400'), - ('156340122', 'district', '肥东县', '156340100'), - ('156360781', 'district', '瑞金市', '156360700'), - ('156410103', 'district', '二七区', '156410100'), - ('156500111', 'district', '大足区', '156500100'), - ('156230206', 'district', '富拉尔基区', '156230200'), - ('156430423', 'district', '衡山县', '156430400'), - ('156522628', 'district', '锦屏县', '156522600'), - ('156210703', 'district', '凌河区', '156210700'), - ('156360830', 'district', '永新县', '156360800'), - ('156320302', 'district', '鼓楼区', '156320300'), - ('156620721', 'district', '肃南裕固族自治县', '156620700'), - ('156140727', 'district', '祁县', '156140700'), - ('156654023', 'district', '霍城县', '156654000'), - ('156450421', 'district', '苍梧县', '156450400'), - ('156320481', 'district', '溧阳市', '156320400'), - ('156522302', 'district', '兴仁市', '156522300'), - ('156211021', 'district', '辽阳县', '156211000'), - ('156430923', 'district', '安化县', '156430900'), - ('156620723', 'district', '临泽县', '156620700'), - ('156150426', 'district', '翁牛特旗', '156150400'), - ('156440605', 'district', '南海区', '156440600'), - ('156540525', 'district', '曲松县', '156540500'), - ('156530403', 'district', '江川区', '156530400'), - ('156500110', 'district', '綦江区', '156500100'), - ('156410571', 'district', '安阳高新技术产业开发区', '156410500'), - ('156510727', 'district', '平武县', '156510700'), - ('156431271', 'district', '怀化市洪江管理区', '156431200'), - ('156532622', 'district', '砚山县', '156532600'), - ('156652302', 'district', '阜康市', '156652300'), - ('156140581', 'district', '高平市', '156140500'), - ('156420602', 'district', '襄城区', '156420600'), - ('156450206', 'district', '柳江区', '156450200'), - ('156510183', 'district', '邛崃市', '156510100'), - ('156421222', 'district', '通城 县', '156421200'), - ('156130128', 'district', '深泽县', '156130100'), - ('156131022', 'district', '固安县', '156131000'), - ('156653101', 'district', '喀什市', '156653100'), - ('156371311', 'district', '罗庄区', '156371300'), - ('156210782', 'district', '北镇市', '156210700'), - ('156512022', 'district', '乐至县', '156512000'), - ('156450324', 'district', '全州县', '156450300'), - ('156460205', 'district', '崖州区', '156460200'), - ('156610431', 'district', '武功县', '156610400'), - ('156370322', 'district', '高青县', '156370300'), - ('156350111', 'district', '晋安区', '156350100'), - ('156420113', 'district', '汉南区', '156420100'), - ('156150721', 'district', '阿荣旗', '156150700'), - ('156140882', 'district', '河津 市', '156140800'), - ('156640424', 'district', '泾源县', '156640400'), - ('156130528', 'district', '宁晋县', '156130500'), - ('156511303', 'district', '高坪区', '156511300'), - ('156350724', 'district', '松溪县', '156350700'), - ('156321203', 'district', '高港区', '156321200'), - ('156231181', 'district', '北安市', '156231100'), - ('156350821', 'district', '长汀县', '156350800'), - ('156430202', 'district', '荷塘区', '156430200'), - ('156520502', 'district', '七星关区', '156520500'), - ('156350124', 'district', '闽清县', '156350100'), - ('156130530', 'district', '新河县', '156130500'), - ('156522722', 'district', '荔波县', '156522700'), - ('156652902', 'district', '库车市', '156652900'), - ('156530112', 'district', '西 山区', '156530100'), - ('156620521', 'district', '清水县', '156620500'), - ('156340304', 'district', '禹会区', '156340300'), - ('156371621', 'district', '惠民县', '156371600'), - ('156320724', 'district', '灌南县', '156320700'), - ('156230506', 'district', '宝山区', '156230500'), - ('156210402', 'district', '新抚区', '156210400'), - ('156371702', 'district', '牡丹区', '156371700'), - ('156360403', 'district', '浔阳区', '156360400'), - ('156440104', 'district', '越秀区', '156440100'), - ('156450224', 'district', '融安县', '156450200'), - ('156513434', 'district', '越西县', '156513400'), - ('156220524', 'district', '柳河县', '156220500'), - ('156520181', 'district', '清镇市', '156520100'), - ('156540221', 'district', '南 木林县', '156540200'), - ('156540524', 'district', '琼结县', '156540500'), - ('156321371', 'district', '宿迁经济技术开发区', '156321300'), - ('156152201', 'district', '乌兰浩特市', '156152200'), - ('156320321', 'district', '丰县', '156320300'), - ('156450503', 'district', '银海区', '156450500'), - ('156411122', 'district', '临颍县', '156411100'), - ('156130771', 'district', '张家口经济开发区', '156130700'), - ('156522630', 'district', '台江县', '156522600'), - ('156540228', 'district', '白朗县', '156540200'), - ('156350402', 'district', '梅列区', '156350400'), - ('156513222', 'district', '理县', '156513200'), - ('156411082', 'district', '长葛市', '156411000'), - ('156632224', 'district', '刚察县', '156632200'), - ('156231086', 'district', '东宁市', '156231000'), - ('156513336', 'district', '乡城县', '156513300'), - ('156411421', 'district', '民权县', '156411400'), - ('156440233', 'district', '新丰县', '156440200'), - ('156500119', 'district', '南川区', '156500100'), - ('156450222', 'district', '柳城县', '156450200'), - ('156360423', 'district', '武宁县', '156360400'), - ('156150428', 'district', '喀喇沁旗', '156150400'), - ('156210203', 'district', '西岗区', '156210200'), - ('156320382', 'district', '邳州市', '156320300'), - ('156321324', 'district', '泗洪县', '156321300'), - ('156410871', 'district', '焦作城乡一体化示范区', '156410800'), - ('156620525', 'district', '张家川回族自治县', '156620500'), - ('156510682', 'district', '什 邡市', '156510600'), - ('156620825', 'district', '庄浪县', '156620800'), - ('156621225', 'district', '西和县', '156621200'), - ('156610428', 'district', '长武县', '156610400'), - ('156653123', 'district', '英吉沙县', '156653100'), - ('156653223', 'district', '皮山县', '156653200'), - ('156719000', 'district', '台北市', '156710100'), - ('156152221', 'district', '科尔沁右翼前旗', '156152200'), - ('156360425', 'district', '永修县', '156360400'), - ('156441882', 'district', '连州市', '156441800'), - ('156150781', 'district', '满洲里市', '156150700'), - ('156430112', 'district', '望城区', '156430100'), - ('156152223', 'district', '扎赉特旗', '156152200'), - ('156211011', 'district', '太子河区', '156211000'), - ('156652323', 'district', '呼图壁县', '156652300'), - ('156330104', 'district', '江干区', '156330100'), - ('156340403', 'district', '田家庵区', '156340400'), - ('156533301', 'district', '泸水市', '156533300'), - ('156533123', 'district', '盈江县', '156533100'), - ('156130481', 'district', '武安市', '156130400'), - ('156510822', 'district', '青川县', '156510800'), - ('156532930', 'district', '洱源县', '156532900'), - ('156340404', 'district', '谢家集区', '156340400'), - ('156632725', 'district', '囊谦县', '156632700'), - ('156510811', 'district', '昭化区', '156510800'), - ('156211221', 'district', '铁岭县', '156211200'), - ('156430321', 'district', '湘潭县', '156430300'), - ('156230621', 'district', '肇州县', '156230600'), - ('156360102', 'district', '东湖区', '156360100'), - ('156150202', 'district', '东河区', '156150200'), - ('156652702', 'district', '阿拉山口市', '156652700'), - ('156361021', 'district', '南城县', '156361000'), - ('156710019', 'district', '新竹市', '156710100'), - ('156350504', 'district', '洛江区', '156350500'), - ('156340711', 'district', '郊区', '156340700'), - ('156350427', 'district', '沙县', '156350400'), - ('156420682', 'district', '老河口市', '156420600'), - ('156130903', 'district', '运河区', '156130900'), - ('156331002', 'district', '椒江区', '156331000'), - ('156410183', 'district', '新密市', '156410100'), - ('156410403', 'district', '卫东区', '156410400'), - ('156370786', 'district', '昌邑市', '156370700'), - ('156141124', 'district', '临县', '156141100'), - ('156411426', 'district', '夏邑县', '156411400'), - ('156510411', 'district', '仁和区', '156510400'), - ('156211003', 'district', '文圣区', '156211000'), - ('156621123', 'district', '渭源县', '156621100'), - ('156350112', 'district', '长乐区', '156350100'), - ('156511504', 'district', '叙州区', '156511500'), - ('156654323', 'district', '福海县', '156654300'), - ('156430408', 'district', '蒸湘区', '156430400'), - ('156659004', 'district', '五家渠市', '156659000'), - ('156411425', 'district', '虞城县', '156411400'), - ('156150203', 'district', '昆都仑区', '156150200'), - ('156371681', 'district', '邹平市', '156371600'), - ('156510118', 'district', '新津区', '156510100'), - ('156210106', 'district', '铁西区', '156210100'), - ('156510704', 'district', '游仙区', '156510700'), - ('156654326', 'district', '吉木乃县', '156654300'), - ('156420981', 'district', '应城市', '156420900'), - ('156653122', 'district', '疏勒县', '156653100'), - ('156141030', 'district', '大宁县', '156141000'), - ('156130983', 'district', '黄骅市', '156130900'), - ('156130972', 'district', '沧州高新技术产业开发区', '156130900'), - ('156610527', 'district', '白水县', '156610500'), - ('156350423', 'district', '清流县', '156350400'), - ('156610113', 'district', '雁塔区', '156610100'), - ('156340171', 'district', '合肥高新技术产业开发区', '156340100'), - ('156330205', 'district', '江北区', '156330200'), - ('156371724', 'district', '巨野县', '156371700'), - ('156211322', 'district', '建平县', '156211300'), - ('156653227', 'district', '民丰县', '156653200'), - ('156330102', 'district', '上城区', '156330100'), - ('156650521', 'district', '巴里坤哈萨克自治县', '156650500'), - ('156210115', 'district', '辽中区', '156210100'), - ('156150928', 'district', '察哈尔右翼后旗', '156150900'), - ('156440232', 'district', '乳源瑶族自治县', '156440200'), - ('156370306', 'district', '周村区', '156370300'), - ('156410527', 'district', '内黄县', '156410500'), - ('156130324', 'district', '卢龙县', '156130300'), - ('156130709', 'district', '崇礼区', '156130700'), - ('156430511', 'district', '北塔区', '156430500'), - ('156210904', 'district', '太平区', '156210900'), - ('156411726', 'district', '泌阳县', '156411700'), - ('156230126', 'district', '巴彦县', '156230100'), - ('156511623', 'district', '邻水县', '156511600'), - ('156652871', 'district', '库尔勒经济技术开发区', '156652800'), - ('156431222', 'district', '沅陵县', '156431200'), - ('156620103', 'district', '七里河区', '156620100'), - ('156231282', 'district', '肇东市', '156231200'), - ('156230204', 'district', '铁锋区', '156230200'), - ('156610802', 'district', '榆阳区', '156610800'), - ('156411025', 'district', '襄城县', '156411000'), - ('156130284', 'district', '滦州市', '156130200'), - ('156659010', 'district', '胡杨河市', '156659000'), - ('156220102', 'district', '南关区', '156220100'), - ('156440404', 'district', ' 金湾区', '156440400'), - ('156230109', 'district', '松北区', '156230100'), - ('156150703', 'district', '扎赉诺尔区', '156150700'), - ('156532927', 'district', '巍山彝族回族自治县', '156532900'), - ('156445102', 'district', '湘桥区', '156445100'), - ('156653124', 'district', '泽普县', '156653100'), - ('156341821', 'district', '郎溪县', '156341800'), - ('156440105', 'district', '海珠区', '156440100'), - ('156520329', 'district', '余庆县', '156520300'), - ('156231124', 'district', ' 孙吴县', '156231100'), - ('156320104', 'district', '秦淮区', '156320100'), - ('156440515', 'district', '澄海区', '156440500'), - ('156350783', 'district', '建瓯市', '156350700'), - ('156370911', 'district', '岱岳区', '156370900'), - ('156130204', 'district', '古冶区', '156130200'), - ('156431124', 'district', '道县', '156431100'), - ('156441602', 'district', '源城区', '156441600'), - ('156370672', 'district', '烟台经济技术开发区', '156370600'), - ('156511323', 'district', '蓬安县', '156511300'), - ('156511123', 'district', '犍为县', '156511100'), - ('156420583', 'district', '枝江市', '156420500'), - ('156510113', 'district', '青白江区', '156510100'), - ('156360302', 'district', '安源区', '156360300'), - ('156370505', 'district', '垦利区', '156370500'), - ('156430472', 'district', '湖南衡阳高新技术产业园区', '156430400'), - ('156513427', 'district', '宁南县', '156513400'), - ('156540174', 'district', '达孜工业园区', '156540100'), - ('156610327', 'district', '陇县', '156610300'), - ('156440514', 'district', '潮南区', '156440500'), - ('156431321', 'district', '双峰县', '156431300'), - ('156330122', 'district', '桐庐县', '156330100'), - ('156410204', 'district', '鼓楼区', '156410200'), - ('156460105', 'district', '秀英区', '156460100'), - ('156653023', 'district', '阿合奇县', '156653000'), - ('156610526', 'district', '蒲城县', '156610500'), - ('156621227', 'district', '徽县', '156621200'), - ('156230103', 'district', '南岗区', '156230100'), - ('156621202', 'district', '武都区', '156621200'), - ('156231281', 'district', '安达市', '156231200'), - ('156130703', 'district', '桥西区', '156130700'), - ('156211002', 'district', '白塔区', '156211000'), - ('156810008', 'district', ' 黄大仙区', '156810100'), - ('156640422', 'district', '西吉县', '156640400'), - ('156130132', 'district', '元氏县', '156130100'), - ('156430382', 'district', '韶山市', '156430300'), - ('156410411', 'district', '湛河区', '156410400'), - ('156410421', 'district', '宝丰县', '156410400'), - ('156150923', 'district', '商都县', '156150900'), - ('156150726', 'district', '新巴尔虎左旗', '156150700'), - ('156230128', 'district', '通河县', '156230100'), - ('156610928', 'district', '旬阳县', '156610900'), - ('156370305', 'district', '临淄区', '156370300'), - ('156610922', 'district', '石泉县', '156610900'), - ('156340172', 'district', '合肥经济技术开发区', '156340100'), - ('156469021', 'district', '定安县', '156469000'), - ('156520112', 'district', '乌当区', '156520100'), - ('156230521', 'district', '集贤县', '156230500'), - ('156620201', 'district', '嘉峪关市', '156620200'), - ('156510311', 'district', '沿滩区', '156510300'), - ('156110119', 'district', '延庆区', '156110100'), - ('156370614', 'district', '蓬莱区', '156370600'), - ('156130227', 'district', '迁西县', '156130200'), - ('156321271', 'district', '泰州医药高新技术产业开发区', '156321200'), - ('156610730', 'district', '佛坪县', '156610700'), - ('156430211', 'district', '天元区', '156430200'), - ('156150304', 'district', '乌达区', '156150300'), - ('156320803', 'district', '淮安区', '156320800'), - ('156620602', 'district', '凉州区', '156620600'), - ('156540425', 'district', '察隅县', '156540400'), - ('156130172', 'district', '石家庄循环化工园区', '156130100'), - ('156131182', 'district', '深州市', '156131100'), - ('156540623', 'district', '聂荣县', '156540600'), - ('156510115', 'district', '温江区', '156510100'), - ('156220623', 'district', '长白朝鲜族自治县', '156220600'), - ('156530581', 'district', '腾冲市', '156530500'), - ('156340222', 'district', '繁昌县', '156340200'), - ('156131171', 'district', '河北衡水高新技术产业开发区', '156131100'), - ('156130283', 'district', '迁安市', '156130200'), - ('156320114', 'district', '雨花台区', '156320100'), - ('156360424', 'district', '修水县', '156360400'), - ('156410326', 'district', '汝阳县', '156410300'), - ('156340803', 'district', '大观区', '156340800'), - ('156431230', 'district', '通道侗族自治县', '156431200'), - ('156511603', 'district', '前锋区', '156511600'), - ('156540230', 'district', '康马县', '156540200'), - ('156530326', 'district', '会泽县', '156530300'), - ('156540527', 'district', '洛扎县', '156540500'), - ('156140928', 'district', '五寨县', '156140900'), - ('156410971', 'district', '河南濮阳工业园区', '156410900'), - ('156611023', 'district', '商南县', '156611000'), - ('156659005', 'district', '北屯市', '156659000'), - ('156330522', 'district', '长兴县', '156330500'), - ('156320903', 'district', '盐都区', '156320900'), - ('156610118', 'district', '鄠邑区', '156610100'), - ('156350212', 'district', '同安区', '156350200'), - ('156360104', 'district', '青云谱区', '156360100'), - ('156210811', 'district', '老边区', '156210800'), - ('156451028', 'district', '乐业县', '156451000'), - ('156210403', 'district', '东洲区', '156210400'), - ('156131024', 'district', '香河县', '156131000'), - ('156411281', 'district', '义马市', '156411200'), - ('156131028', 'district', '大厂回族自治县', '156131000'), - ('156632322', 'district', '尖扎县', '156632300'), - ('156140902', 'district', '忻府区', '156140900'), - ('156321202', 'district', '海陵 区', '156321200'), - ('156411471', 'district', '豫东综合物流产业聚集区', '156411400'), - ('156511903', 'district', '恩阳区', '156511900'), - ('156210212', 'district', '旅顺口区', '156210200'), - ('156513333', 'district', '色达县', '156513300'), - ('156370503', 'district', '河口区', '156370500'), - ('156230381', 'district', '虎林市', '156230300'), - ('156360481', 'district', '瑞昌市', '156360400'), - ('156230184', 'district', '五常市', '156230100'), - ('156410724', 'district', '获 嘉县', '156410700'), - ('156530826', 'district', '江城哈尼族彝族自治县', '156530800'), - ('156230883', 'district', '抚远市', '156230800'), - ('156621025', 'district', '正宁县', '156621000'), - ('156620922', 'district', '瓜州县', '156620900'), - ('156231071', 'district', '牡丹江经济技术开发区', '156231000'), - ('156450702', 'district', '钦南区', '156450700'), - ('156152921', 'district', '阿拉善左旗', '156152900'), - ('156130630', 'district', '涞源县', '156130600'), - ('156130627', 'district', '唐县', '156130600'), - ('156654321', 'district', '布尔津县', '156654300'), - ('156220771', 'district', '吉林松原经济开发区', '156220700'), - ('156350825', 'district', '连城县', '156350800'), - ('156320772', 'district', '连云港高新技术产业开发区', '156320700'), - ('156411282', 'district', '灵宝市', '156411200'), - ('156340271', 'district', '芜湖经济技术开发区', '156340200'), - ('156540224', 'district', '萨迦县', '156540200'), - ('156610222', 'district', '宜君县', '156610200'), - ('156431021', 'district', '桂阳县', '156431000'), - ('156511124', 'district', '井研县', '156511100'), - ('156370811', 'district', '任城区', '156370800'), - ('156210114', 'district', '于洪区', '156210100'), - ('156718000', 'district', '南投县', '156710100'), - ('156621125', 'district', '漳县', '156621100'), - ('156411724', 'district', '正阳县', '156411700'), - ('156341524', 'district', '金寨县', '156341500'), - ('156610829', 'district', '吴堡县', '156610800'), - ('156130431', 'district', '鸡泽县', '156130400'), - ('156130207', 'district', '丰南区', '156130200'), - ('156370830', 'district', '汶上县', '156370800'), - ('156152224', 'district', '突泉县', '156152200'), - ('156341372', 'district', '宿州经济技术开发区', '156341300'), - ('156130523', 'district', '内丘县', '156130500'), - ('156320118', 'district', '高淳区', '156320100'), - ('156130632', 'district', '安新县', '156130600'), - ('156500114', 'district', '黔江区', '156500100'), - ('156350205', 'district', '海沧区', '156350200'), - ('156542527', 'district', '措勤县', '156542500'), - ('156652824', 'district', '若羌县', '156652800'), - ('156152923', 'district', '额济纳旗', '156152900'), - ('156530623', 'district', '盐津县', '156530600'), - ('156540424', 'district', '波密县', '156540400'), - ('156152222', 'district', '科尔沁右翼中旗', '156152200'), - ('156451022', 'district', '田东县', '156451000'), - ('156610502', 'district', '临渭区', '156610500'), - ('156120101', 'district', '和平区', '156120100'), - ('156331127', 'district', '景宁畲族自治县', '156331100'), - ('156451222', 'district', '天峨县', '156451200'), - ('156371722', 'district', '单县', '156371700'), - ('156450821', 'district', '平南县', '156450800'), - ('156422823', 'district', '巴东县', '156422800'), - ('156220382', 'district', '双辽市', '156220300'), - ('156220721', 'district', '前郭尔罗斯蒙古族自治县', '156220700'), - ('156150622', 'district', '准格尔旗', '156150600'), - ('156510184', 'district', '崇州市', '156510100'), - ('156210411', 'district', '顺城区', '156210400'), - ('156110111', 'district', '房山区', '156110100'), - ('156150271', 'district', '包头稀土高新技术产业开发区', '156150200'), - ('156610503', 'district', '华州区', '156610500'), - ('156622924', 'district', '广河县', '156622900'), - ('156320311', 'district', '泉山区', '156320300'), - ('156320312', 'district', '铜山区', '156320300'), - ('156361030', 'district', '广昌县', '156361000'), - ('156141031', 'district', '隰县', '156141000'), - ('156430482', 'district', '常宁市', '156430400'), - ('156140427', 'district', '壶关县', '156140400'), - ('156360723', 'district', '大余县', '156360700'), - ('156530722', 'district', '永胜县', '156530700'), - ('156330421', 'district', '嘉善县', '156330400'), - ('156440402', 'district', '香洲区', '156440400'), - ('156210103', 'district', '沈河区', '156210100'), - ('156511528', 'district', '兴文县', '156511500'), - ('156421381', 'district', '广水市', '156421300'), - ('156350425', 'district', '大田县', '156350400'), - ('156540127', 'district', '墨竹工卡县', '156540100'), - ('156659007', 'district', '双河市', '156659000'), - ('156450105', 'district', '江南区', '156450100'), - ('156341722', 'district', '石台县', '156341700'), - ('156513226', 'district', '金川县', '156513200'), - ('156511622', 'district', '武胜县', '156511600'), - ('156540602', 'district', '色尼区', '156540600'), - ('156522701', 'district', '都匀市', '156522700'), - ('156653125', 'district', '莎车县', '156653100'), - ('156140603', 'district', '平鲁区', '156140600'), - ('156340202', 'district', '镜湖区', '156340200'), - ('156630105', 'district', '城北区', '156630100'), - ('156650421', 'district', '鄯善县', '156650400'), - ('156420103', 'district', '江汉区', '156420100'), - ('156431102', 'district', '零陵区', '156431100'), - ('156430481', 'district', '耒阳市', '156430400'), - ('156410425', 'district', '郏县', '156410400'), - ('156610117', 'district', '高陵区', '156610100'), - ('156120104', 'district', '南开区', '156120100'), - ('156232722', 'district', '塔河县', '156232700'), - ('156220402', 'district', '龙山区', '156220400'), - ('156500103', 'district', '渝中区', '156500100'), - ('156450311', 'district', '雁山区', '156450300'), - ('156411625', 'district', '郸城县', '156411600'), - ('156430212', 'district', '渌口区', '156430200'), - ('156330824', 'district', '开化县', '156330800'), - ('156421003', 'district', '荆州区', '156421000'), - ('156513429', 'district', '布拖县', '156513400'), - ('156150424', 'district', '林西县', '156150400'), - ('156469007', 'district', '东方市', '156469000'), - ('156211382', 'district', '凌源市', '156211300'), - ('156522634', 'district', '雷山县', '156522600'), - ('156411423', 'district', '宁陵县', '156411400'), - ('156513326', 'district', '道孚县', '156513300'), - ('156520627', 'district', '沿河土家族自治县', '156520600'), - ('156360825', 'district', '永丰县', '156360800'), - ('156451225', 'district', '罗城仫佬族自治县', '156451200'), - ('156130723', 'district', '康保县', '156130700'), - ('156321282', 'district', '靖江市', '156321200'), - ('156130981', 'district', '泊头市', '156130900'), - ('156370323', 'district', '沂源县', '156370300'), - ('156210727', 'district', '义县', '156210700'), - ('156340827', 'district', '望江县', '156340800'), - ('156522731', 'district', '惠水县', '156522700'), - ('156330482', 'district', '平湖市', '156330400'), - ('156622901', 'district', '临夏市', '156622900'), - ('156540173', 'district', '西藏文化旅游创意园区', '156540100'), - ('156370481', 'district', '滕州市', '156370400'), - ('156411627', 'district', '太康县', '156411600'), - ('156130928', 'district', '吴桥县', '156130900'), - ('156321281', 'district', '兴化市', '156321200'), - ('156140122', 'district', '阳曲县', '156140100'), - ('156340123', 'district', '肥西县', '156340100'), - ('156420322', 'district', '郧西县', '156420300'), - ('156420525', 'district', '远安县', '156420500'), - ('156511011', 'district', '东兴区', '156511000'), - ('156411203', 'district', '陕州区', '156411200'), - ('156370303', 'district', '张店区', '156370300'), - ('156513329', 'district', '新龙 县', '156513300'), - ('156150523', 'district', '开鲁县', '156150500'), - ('156140924', 'district', '繁峙县', '156140900'), - ('156650202', 'district', '独山子区', '156650200'), - ('156350603', 'district', '龙文区', '156350600'), - ('156522730', 'district', '龙里县', '156522700'), - ('156210381', 'district', '海城市', '156210300'), - ('156230602', 'district', '萨尔图区', '156230600'), - ('156150929', 'district', '四子王旗', '156150900'), - ('156411729', 'district', '新蔡县', '156411700'), - ('156652701', 'district', '博乐市', '156652700'), - ('156371423', 'district', '庆云县', '156371400'), - ('156441323', 'district', '惠东县', '156441300'), - ('156445321', 'district', '新兴县', '156445300'), - ('156232721', 'district', '呼玛县', '156232700'), - ('156370612', 'district', '牟平区', '156370600'), - ('156320771', 'district', '连云港经济技术开发区', '156320700'), - ('156360803', 'district', '青原区', '156360800'), - ('156430373', 'district', '湘潭九华示范区', '156430300'), - ('156431123', 'district', '双牌县', '156431100'), - ('156411628', 'district', '鹿邑县', '156411600'), - ('156440705', 'district', '新会区', '156440700'), - ('156130123', 'district', '正定县', '156130100'), - ('156210521', 'district', '本溪满族自治县', '156210500'), - ('156220605', 'district', '江源区', '156220600'), - ('156430682', 'district', '临湘市', '156430600'), - ('156620923', 'district', '肃北蒙古族自治县', '156620900'), - ('156630202', 'district', '乐都区', '156630200'), - ('156532328', 'district', '元谋县', '156532300'), - ('156530426', 'district', '峨山彝族自治县', '156530400'), - ('156140502', 'district', '城区', '156140500'), - ('156411323', 'district', '西峡县', '156411300'), - ('156441625', 'district', '东源县', '156441600'), - ('156511825', 'district', '天全县', '156511800'), - ('156150924', 'district', '兴和县', '156150900'), - ('156430581', 'district', '武冈市', '156430500'), - ('156513232', 'district', '若尔盖县', '156513200'), - ('156140471', 'district', '山西长治高新技术产业园区', '156140400'), - ('156150727', 'district', '新巴尔虎右旗', '156150700'), - ('156513327', 'district', '炉霍县', '156513300'), - ('156360725', 'district', '崇义县', '156360700'), - ('156532331', 'district', '禄丰县', '156532300'), - ('156230231', 'district', '拜泉县', '156230200'), - ('156450921', 'district', '容县', '156450900'), - ('156510604', 'district', '罗江区', '156510600'), - ('156152501', 'district', '二连浩特市', '156152500'), - ('156610422', 'district', '三原县', '156610400'), - ('156320922', 'district', '滨海县', '156320900'), - ('156330225', 'district', '象山县', '156330200'), - ('156411721', 'district', '西平县', '156411700'), - ('156341825', 'district', '旌德县', '156341800'), - ('156511826', 'district', '芦山县', '156511800'), - ('156310120', 'district', '奉贤区', '156310100'), - ('156340722', 'district', '枞阳县', '156340700'), - ('156141029', 'district', '乡宁县', '156141000'), - ('156611025', 'district', '镇安县', '156611000'), - ('156230604', 'district', '让胡路区', '156230600'), - ('156410772', 'district', '新乡经济技术开发区', '156410700'), - ('156530681', 'district', '水富市', '156530600'), - ('156230624', 'district', '杜尔伯特蒙古族自治县', '156230600'), - ('156130224', 'district', '滦南县', '156130200'), - ('156340111', 'district', '包河区', '156340100'), - ('156451027', 'district', '凌云县', '156451000'), - ('156500104', 'district', '大渡口区', '156500100'), - ('156411472', 'district', '河南商丘经济开发区', '156411400'), - ('156420922', 'district', '大悟县', '156420900'), - ('156210602', 'district', '元宝区', '156210600'), - ('156500105', 'district', '江北区', '156500100'), - ('156420323', 'district', '竹山县', '156420300'), - ('156420882', 'district', '京山市', '156420800'), - ('156140702', 'district', '榆次区', '156140700'), - ('156520123', 'district', '修文县', '156520100'), - ('156610631', 'district', '黄龙县', '156610600'), - ('156510703', 'district', '涪城区', '156510700'), - ('156370682', 'district', '莱阳市', '156370600'), - ('156530428', 'district', '元江哈尼族彝族傣族自治县', '156530400'), - ('156210421', 'district', '抚顺县', '156210400'), - ('156330203', 'district', '海曙区', '156330200'), - ('156810015', 'district', '西贡区', '156810100'), - ('156130626', 'district', '定兴县', '156130600'), - ('156210303', 'district', '铁西区', '156210300'), - ('156411003', 'district', '建安区', '156411000'), - ('156542524', 'district', '日土县', '156542500'), - ('156450981', 'district', '北流市', '156450900'), - ('156510781', 'district', '江油市', '156510700'), - ('156370687', 'district', '海阳市', '156370600'), - ('156610929', 'district', ' 白河县', '156610900'), - ('156210604', 'district', '振安区', '156210600'), - ('156410611', 'district', '淇滨区', '156410600'), - ('156370571', 'district', '东营经济技术开发区', '156370500'), - ('156330111', 'district', '富阳区', '156330100'), - ('156610115', 'district', '临潼区', '156610100'), - ('156410302', 'district', '老城区', '156410300'), - ('156370116', 'district', '莱芜区', '156370100'), - ('156330727', 'district', '磐安县', '156330700'), - ('156640402', 'district', '原州 区', '156640400'), - ('156370982', 'district', '新泰市', '156370900'), - ('156410102', 'district', '中原区', '156410100'), - ('156511002', 'district', '市中区', '156511000'), - ('156441303', 'district', '惠阳区', '156441300'), - ('156430527', 'district', '绥宁县', '156430500'), - ('156420107', 'district', '青山区', '156420100'), - ('156654027', 'district', '特克斯县', '156654000'), - ('156511802', 'district', '雨城区', '156511800'), - ('156320206', 'district', '惠山区', '156320200'), - ('156230403', 'district', '工农区', '156230400'), - ('156511526', 'district', '珙县', '156511500'), - ('156430781', 'district', '津市市', '156430700'), - ('156623026', 'district', '碌曲县', '156623000'), - ('156220523', 'district', '辉南 县', '156220500'), - ('156420105', 'district', '汉阳区', '156420100'), - ('156330329', 'district', '泰顺县', '156330300'), - ('156654004', 'district', '霍尔果斯市', '156654000'), - ('156430102', 'district', '芙蓉区', '156430100'), - ('156510114', 'district', '新都区', '156510100'), - ('156340604', 'district', '烈山区', '156340600'), - ('156350626', 'district', '东山县', '156350600'), - ('156350721', 'district', '顺昌县', '156350700'), - ('156611022', 'district', '丹凤县', '156611000'), - ('156370702', 'district', '潍城区', '156370700'), - ('156410423', 'district', '鲁山县', '156410400'), - ('156310114', 'district', '嘉定区', '156310100'), - ('156430802', 'district', '永定区', '156430800'), - ('156210911', 'district', ' 细河区', '156210900'), - ('156530724', 'district', '宁蒗彝族自治县', '156530700'), - ('156500108', 'district', '南岸区', '156500100'), - ('156510723', 'district', '盐亭县', '156510700'), - ('156210423', 'district', '清原满族自治县', '156210400'), - ('156710022', 'district', '云林县', '156710100'), - ('156430471', 'district', '衡阳综合保税区', '156430400'), - ('156522729', 'district', '长顺县', '156522700'), - ('156320205', 'district', '锡山区', '156320200'), - ('156360826', 'district', '泰和县', '156360800'), - ('156110105', 'district', '朝阳区', '156110100'), - ('156141034', 'district', '汾西县', '156141000'), - ('156450403', 'district', '万秀区', '156450400'), - ('156141082', 'district', '霍州市', '156141000'), - ('156222404', 'district', '珲春市', '156222400'), - ('156430721', 'district', '安乡县', '156430700'), - ('156659009', 'district', '昆玉市', '156659000'), - ('156410108', 'district', '惠济区', '156410100'), - ('156430371', 'district', '湖南湘潭高新技术产业园区', '156430300'), - ('156410503', 'district', '北关区', '156410500'), - ('156130184', 'district', '新乐市', '156130100'), - ('156130302', 'district', '海港区', '156130300'), - ('156411725', 'district', '确山县', '156411700'), - ('156360881', 'district', '井冈山市', '156360800'), - ('156450803', 'district', '港南区', '156450800'), - ('156320582', 'district', '张家港市', '156320500'), - ('156522622', 'district', '黄平县', '156522600'), - ('156340705', 'district', '铜官 区', '156340700'), - ('156140881', 'district', '永济市', '156140800'), - ('156230804', 'district', '前进区', '156230800'), - ('156371526', 'district', '高唐县', '156371500'), - ('156411771', 'district', '河南驻马店经济开发区', '156411700'), - ('156520423', 'district', '镇宁布依族苗族自治县', '156520400'), - ('156130471', 'district', '邯郸经济技术开发区', '156130400'), - ('156440507', 'district', '龙湖区', '156440500'), - ('156140107', 'district', '杏花岭区', '156140100'), - ('156433123', 'district', '凤凰县', '156433100'), - ('156610927', 'district', '镇坪县', '156610900'), - ('156530702', 'district', '古城区', '156530700'), - ('156410304', 'district', '瀍河回族区', '156410300'), - ('156540625', 'district', '申扎县', '156540600'), - ('156140830', 'district', '芮城县', '156140800'), - ('156310116', 'district', '金山区', '156310100'), - ('156130924', 'district', '海兴县', '156130900'), - ('156431026', 'district', '汝城县', '156431000'), - ('156632723', 'district', '称多县', '156632700'), - ('156331003', 'district', '黄岩区', '156331000'), - ('156710014', 'district', '台南市', '156710100'), - ('156371471', 'district', '德州经济技术开发区', '156371400'), - ('156430523', 'district', '邵阳县', '156430500'), - ('156530502', 'district', '隆阳区', '156530500'), - ('156450721', 'district', '灵山县', '156450700'), - ('156361102', 'district', '信州区', '156361100'), - ('156451425', 'district', '天等县', '156451400'), - ('156350526', 'district', '德化县', '156350500'), - ('156510104', 'district', '锦江区', '156510100'), - ('156230208', 'district', '梅里斯达斡尔族区', '156230200'), - ('156540124', 'district', '曲水县', '156540100'), - ('156430972', 'district', '湖南益阳高新技术产业园区', '156430900'), - ('156421024', 'district', '江陵县', '156421000'), - ('156433101', 'district', '吉首市', '156433100'), - ('156350103', 'district', '台江区', '156350100'), - ('156320831', 'district', '金湖县', '156320800'), - ('156371726', 'district', '鄄城县', '156371700'), - ('156230307', 'district', '麻山区', '156230300'), - ('156510422', 'district', '盐边县', '156510400'), - ('156451221', 'district', '南丹县', '156451200'), - ('156540522', 'district', '贡嘎县', '156540500'), - ('156620623', 'district', '天祝藏族自治县', '156620600'), - ('156621122', 'district', '陇西县', '156621100'), - ('156210726', 'district', '黑山县', '156210700'), - ('156150925', 'district', '凉城县', '156150900'), - ('156640522', 'district', '海原县', '156640500'), - ('156220302', 'district', '铁西区', '156220300'), - ('156653201', 'district', '和田市', '156653200'), - ('156440825', 'district', '徐闻县', '156440800'), - ('156361124', 'district', '铅山县', '156361100'), - ('156420881', 'district', '钟祥市', '156420800'), - ('156513334', 'district', '理塘县', '156513300'), - ('156659008', 'district', '可克达拉市', '156659000'), - ('156150524', 'district', '库伦旗', '156150500'), - ('156131002', 'district', '安次区', '156131000'), - ('156441802', 'district', '清城区', '156441800'), - ('156522623', 'district', '施秉县', '156522600'), - ('156653224', 'district', '洛浦县', '156653200'), - ('156441204', 'district', '高要区', '156441200'), - ('156211421', 'district', '绥中县', '156211400'), - ('156652823', 'district', '尉犁县', '156652800'), - ('156152202', 'district', '阿尔山市', '156152200'), - ('156460108', 'district', '美兰区', '156460100'), - ('156350521', 'district', '惠安县', '156350500'), - ('156513227', 'district', '小金县', '156513200'), - ('156520381', 'district', '赤水市', '156520300'), - ('156350681', 'district', '龙海市', '156350600'), - ('156140930', 'district', '河曲县', '156140900'), - ('156371324', 'district', '兰陵县', '156371300'), - ('156230124', 'district', '方正县', '156230100'), - ('156450722', 'district', '浦北县', '156450700'), - ('156542525', 'district', '革吉县', '156542500'), - ('156130109', 'district', '藁城区', '156130100'), - ('156430822', 'district', '桑植县', '156430800'), - ('156120103', 'district', '河西区', '156120100'), - ('156140214', 'district', '云冈区', '156140200'), - ('156310101', 'district', '黄浦区', '156310100'), - ('156130434', 'district', '魏县', '156130400'), - ('156320509', 'district', '吴江区', '156320500'), - ('156610825', 'district', '定边县', '156610800'), - ('156320281', 'district', '江阴市', '156320200'), - ('156510824', 'district', '苍溪县', '156510800'), - ('156520327', 'district', '凤冈县', '156520300'), - ('156211302', 'district', '双塔区', '156211300'), - ('156130274', 'district', '河北唐山海港经济开发区', '156130200'), - ('156361027', 'district', '金溪县', '156361000'), - ('156450406', 'district', '龙圩区', '156450400'), - ('156530625', 'district', '永善县', '156530600'), - ('156320830', 'district', '盱眙县', '156320800'), - ('156420902', 'district', '孝南区', '156420900'), - ('156230127', 'district', '木兰县', '156230100'), - ('156611021', 'district', '洛南县', '156611000'), - ('156653128', 'district', '岳普湖县', '156653100'), - ('156411403', 'district', '睢阳区', '156411400'), - ('156330383', 'district', '龙港市', '156330300'), - ('156330902', 'district', '定海区', '156330900'), - ('156130272', 'district', '唐山市汉沽管理区', '156130200'), - ('156522725', 'district', '瓮安县', '156522700'), - ('156632803', 'district', '茫崖市', '156632800'), - ('156500242', 'district', '酉阳土家族苗族自治县', '156500200'), - ('156130728', 'district', '怀安县', '156130700'), - ('156441704', 'district', '阳东区', '156441700'), - ('156500154', 'district', '开州区', '156500100'), - ('156640303', 'district', '红寺堡区', '156640300'), - ('156370281', 'district', '胶州市', '156370200'), - ('156231123', 'district', '逊克县', '156231100'), - ('156141182', 'district', '汾阳市', '156141100'), - ('156360726', 'district', '安远县', '156360700'), - ('156440304', 'district', '福田区', '156440300'), - ('156451324', 'district', '金秀瑶族自治县', '156451300'), - ('156652927', 'district', '乌什县', '156652900'), - ('156411502', 'district', '浉河区', '156411500'), - ('156341523', 'district', '舒城县', '156341500'), - ('156361022', 'district', '黎川县', '156361000'), - ('156411528', 'district', '息县', '156411500'), - ('156330604', 'district', '上虞区', '156330600'), - ('156621222', 'district', '文县', '156621200'), - ('156510705', 'district', '安州区', '156510700'), - ('156430603', 'district', '云溪区', '156430600'), - ('156650203', 'district', '克拉玛依区', '156650200'), - ('156110118', 'district', '密云区', '156110100'), - ('156520326', 'district', '务川仡佬族苗族自治县', '156520300'), - ('156232764', 'district', '呼中区', '156232700'), - ('156411571', 'district', '信阳高新技术产业开发区', '156411500'), - ('156410205', 'district', '禹王台区', '156410200'), - ('156340173', 'district', '合肥新站高新技术产业开发区', '156340100'), - ('156511133', 'district', '马边彝族自治县', '156511100'), - ('156230306', 'district', '城子河区', '156230300'), - ('156520111', 'district', '花溪区', '156520100'), - ('156621021', 'district', '庆城县', '156621000'), - ('156520621', 'district', '江口县', '156520600'), - ('156141027', 'district', '浮山县', '156141000'), - ('156361025', 'district', '乐安县', '156361000'), - ('156540624', 'district', '安多县', '156540600'), - ('156410725', 'district', '原阳县', '156410700'), - ('156430626', 'district', '平江县', '156430600'), - ('156231183', 'district', '嫩江市', '156231100'), - ('156330723', 'district', '武义县', '156330700'), - ('156340504', 'district', '雨山区', '156340500'), - ('156360428', 'district', '都昌县', '156360400'), - ('156431224', 'district', '溆浦县', '156431200'), - ('156654022', 'district', '察布查尔锡伯自治县', '156654000'), - ('156510823', 'district', '剑阁县', '156510800'), - ('156341623', 'district', '利辛县', '156341600'), - ('156220521', 'district', '通化县', '156220500'), - ('156141121', 'district', '文 水县', '156141100'), - ('156410721', 'district', '新乡县', '156410700'), - ('156140725', 'district', '寿阳县', '156140700'), - ('156410327', 'district', '宜阳县', '156410300'), - ('156360981', 'district', '丰城市', '156360900'), - ('156341824', 'district', '绩溪县', '156341800'), - ('156430406', 'district', '雁峰区', '156430400'), - ('156513428', 'district', '普格县', '156513400'), - ('156230112', 'district', '阿城区', '156230100'), - ('156430381', 'district', '湘乡市', '156430300'), - ('156532528', 'district', '元阳县', '156532500'), - ('156152523', 'district', '苏尼特左旗', '156152500'), - ('156640423', 'district', '隆德县', '156640400'), - ('156110113', 'district', '顺义区', '156110100'), - ('156230304', 'district', '滴道区', '156230300'), - ('156610621', 'district', '延长县', '156610600'), - ('156450123', 'district', '隆安县', '156450100'), - ('156130871', 'district', '承德高新技术产业开发区', '156130800'), - ('156230123', 'district', '依兰县', '156230100'), - ('156411371', 'district', '南阳高新技术产业开发区', '156411300'), - ('156622923', 'district', '永靖县', '156622900'), - ('156152971', 'district', '内蒙古阿拉善经济开发区', '156152900'), - ('156411326', 'district', '淅川县', '156411300'), - ('156330328', 'district', '文成县', '156330300'); -INSERT INTO area (id, level, name, pid) -VALUES ('156451402', 'district', '江州区', '156451400'), - ('156130681', 'district', '涿州市', '156130600'), - ('156469029', 'district', '保亭黎族苗族自治县', '156469000'), - ('156610926', 'district', '平利县', '156610900'), - ('156540326', 'district', '八宿县', '156540300'), - ('156451421', 'district', '扶绥县', '156451400'), - ('156421321', 'district', '随县', '156421300'), - ('156230725', 'district', '大箐山县', '156230700'), - ('156810012', 'district', '元朗区', '156810100'), - ('156130705', 'district', '宣化区', '156130700'), - ('156421182', 'district', '武穴市', '156421100'), - ('156140108', 'district', '尖草坪区', '156140100'), - ('156370686', 'district', '栖霞市', '156370600'), - ('156513422', 'district', '木里藏族自治县', '156513400'), - ('156140321', 'district', '平定县', '156140300'), - ('156513223', 'district', '茂县', '156513200'), - ('156429004', 'district', '仙桃市', '156429000'), - ('156460106', 'district', '龙华区', '156460100'), - ('156431126', 'district', '宁远县', '156431100'), - ('156420921', 'district', '孝昌县', '156420900'), - ('156370202', 'district', '市南区', '156370200'), - ('156431281', 'district', '洪江市', '156431200'), - ('156445302', 'district', '云城区', '156445300'), - ('156430473', 'district', '湖南衡阳松木经济开发区', '156430400'), - ('156230726', 'district', '南岔县', '156230700'), - ('156430611', 'district', '君山区', '156430600'), - ('156810003', 'district', '东区', '156810100'), - ('156620503', 'district', '麦积区', '156620500'), - ('156610330', 'district', '凤县', '156610300'), - ('156421087', 'district', '松滋市', '156421000'), - ('156460202', 'district', '海棠区', '156460200'); - -CREATE TABLE QRTZ_CALENDARS -( - SCHED_NAME VARCHAR(120) NOT NULL, - CALENDAR_NAME VARCHAR(200) NOT NULL, - CALENDAR BLOB NOT NULL -); -CREATE TABLE QRTZ_CRON_TRIGGERS -( - SCHED_NAME VARCHAR(120) NOT NULL, - TRIGGER_NAME VARCHAR(200) NOT NULL, - TRIGGER_GROUP VARCHAR(200) NOT NULL, - CRON_EXPRESSION VARCHAR(120) NOT NULL, - TIME_ZONE_ID VARCHAR(80) -); - -CREATE TABLE QRTZ_FIRED_TRIGGERS -( - SCHED_NAME VARCHAR(120) NOT NULL, - ENTRY_ID VARCHAR(95) NOT NULL, - TRIGGER_NAME VARCHAR(200) NOT NULL, - TRIGGER_GROUP VARCHAR(200) NOT NULL, - INSTANCE_NAME VARCHAR(200) NOT NULL, - FIRED_TIME BIGINT NOT NULL, - SCHED_TIME BIGINT NOT NULL, - PRIORITY INTEGER NOT NULL, - STATE VARCHAR(16) NOT NULL, - JOB_NAME VARCHAR(200) NULL, - JOB_GROUP VARCHAR(200) NULL, - IS_NONCONCURRENT BOOLEAN NULL, - REQUESTS_RECOVERY BOOLEAN NULL -); - -CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS -( - SCHED_NAME VARCHAR(120) NOT NULL, - TRIGGER_GROUP VARCHAR(200) NOT NULL -); - -CREATE TABLE QRTZ_SCHEDULER_STATE -( - SCHED_NAME VARCHAR(120) NOT NULL, - INSTANCE_NAME VARCHAR(200) NOT NULL, - LAST_CHECKIN_TIME BIGINT NOT NULL, - CHECKIN_INTERVAL BIGINT NOT NULL -); - -CREATE TABLE QRTZ_LOCKS -( - SCHED_NAME VARCHAR(120) NOT NULL, - LOCK_NAME VARCHAR(40) NOT NULL -); - -CREATE TABLE QRTZ_JOB_DETAILS -( - SCHED_NAME VARCHAR(120) NOT NULL, - JOB_NAME VARCHAR(200) NOT NULL, - JOB_GROUP VARCHAR(200) NOT NULL, - DESCRIPTION VARCHAR(250) NULL, - JOB_CLASS_NAME VARCHAR(250) NOT NULL, - IS_DURABLE BOOLEAN NOT NULL, - IS_NONCONCURRENT BOOLEAN NOT NULL, - IS_UPDATE_DATA BOOLEAN NOT NULL, - REQUESTS_RECOVERY BOOLEAN NOT NULL, - JOB_DATA BLOB NULL -); - -CREATE TABLE QRTZ_SIMPLE_TRIGGERS -( - SCHED_NAME VARCHAR(120) NOT NULL, - TRIGGER_NAME VARCHAR(200) NOT NULL, - TRIGGER_GROUP VARCHAR(200) NOT NULL, - REPEAT_COUNT BIGINT NOT NULL, - REPEAT_INTERVAL BIGINT NOT NULL, - TIMES_TRIGGERED BIGINT NOT NULL -); - -CREATE TABLE qrtz_simprop_triggers -( - SCHED_NAME VARCHAR(120) NOT NULL, - TRIGGER_NAME VARCHAR(200) NOT NULL, - TRIGGER_GROUP VARCHAR(200) NOT NULL, - STR_PROP_1 VARCHAR(512) NULL, - STR_PROP_2 VARCHAR(512) NULL, - STR_PROP_3 VARCHAR(512) NULL, - INT_PROP_1 INTEGER NULL, - INT_PROP_2 INTEGER NULL, - LONG_PROP_1 BIGINT NULL, - LONG_PROP_2 BIGINT NULL, - DEC_PROP_1 NUMERIC(13, 4) NULL, - DEC_PROP_2 NUMERIC(13, 4) NULL, - BOOL_PROP_1 BOOLEAN NULL, - BOOL_PROP_2 BOOLEAN NULL -); - -CREATE TABLE QRTZ_BLOB_TRIGGERS -( - SCHED_NAME VARCHAR(120) NOT NULL, - TRIGGER_NAME VARCHAR(200) NOT NULL, - TRIGGER_GROUP VARCHAR(200) NOT NULL, - BLOB_DATA BLOB NULL -); - -CREATE TABLE QRTZ_TRIGGERS -( - SCHED_NAME VARCHAR(120) NOT NULL, - TRIGGER_NAME VARCHAR(200) NOT NULL, - TRIGGER_GROUP VARCHAR(200) NOT NULL, - JOB_NAME VARCHAR(200) NOT NULL, - JOB_GROUP VARCHAR(200) NOT NULL, - DESCRIPTION VARCHAR(250) NULL, - NEXT_FIRE_TIME BIGINT NULL, - PREV_FIRE_TIME BIGINT NULL, - PRIORITY INTEGER NULL, - TRIGGER_STATE VARCHAR(16) NOT NULL, - TRIGGER_TYPE VARCHAR(8) NOT NULL, - START_TIME BIGINT NOT NULL, - END_TIME BIGINT NULL, - CALENDAR_NAME VARCHAR(200) NULL, - MISFIRE_INSTR SMALLINT NULL, - JOB_DATA BLOB NULL -); - -ALTER TABLE QRTZ_CALENDARS - ADD - CONSTRAINT PK_QRTZ_CALENDARS PRIMARY KEY - ( - SCHED_NAME, - CALENDAR_NAME - ); - -ALTER TABLE QRTZ_CRON_TRIGGERS - ADD - CONSTRAINT PK_QRTZ_CRON_TRIGGERS PRIMARY KEY - ( - SCHED_NAME, - TRIGGER_NAME, - TRIGGER_GROUP - ); - -ALTER TABLE QRTZ_FIRED_TRIGGERS - ADD - CONSTRAINT PK_QRTZ_FIRED_TRIGGERS PRIMARY KEY - ( - SCHED_NAME, - ENTRY_ID - ); - -ALTER TABLE QRTZ_PAUSED_TRIGGER_GRPS - ADD - CONSTRAINT PK_QRTZ_PAUSED_TRIGGER_GRPS PRIMARY KEY - ( - SCHED_NAME, - TRIGGER_GROUP - ); - -ALTER TABLE QRTZ_SCHEDULER_STATE - ADD - CONSTRAINT PK_QRTZ_SCHEDULER_STATE PRIMARY KEY - ( - SCHED_NAME, - INSTANCE_NAME - ); - -ALTER TABLE QRTZ_LOCKS - ADD - CONSTRAINT PK_QRTZ_LOCKS PRIMARY KEY - ( - SCHED_NAME, - LOCK_NAME - ); - -ALTER TABLE QRTZ_JOB_DETAILS - ADD - CONSTRAINT PK_QRTZ_JOB_DETAILS PRIMARY KEY - ( - SCHED_NAME, - JOB_NAME, - JOB_GROUP - ); - -ALTER TABLE QRTZ_SIMPLE_TRIGGERS - ADD - CONSTRAINT PK_QRTZ_SIMPLE_TRIGGERS PRIMARY KEY - ( - SCHED_NAME, - TRIGGER_NAME, - TRIGGER_GROUP - ); - -ALTER TABLE QRTZ_SIMPROP_TRIGGERS - ADD - CONSTRAINT PK_QRTZ_SIMPROP_TRIGGERS PRIMARY KEY - ( - SCHED_NAME, - TRIGGER_NAME, - TRIGGER_GROUP - ); - -ALTER TABLE QRTZ_TRIGGERS - ADD - CONSTRAINT PK_QRTZ_TRIGGERS PRIMARY KEY - ( - SCHED_NAME, - TRIGGER_NAME, - TRIGGER_GROUP - ); - -ALTER TABLE QRTZ_CRON_TRIGGERS - ADD - CONSTRAINT FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS FOREIGN KEY - ( - SCHED_NAME, - TRIGGER_NAME, - TRIGGER_GROUP - ) REFERENCES QRTZ_TRIGGERS ( - SCHED_NAME, - TRIGGER_NAME, - TRIGGER_GROUP - ) ON DELETE CASCADE; - - -ALTER TABLE QRTZ_SIMPLE_TRIGGERS - ADD - CONSTRAINT FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS FOREIGN KEY - ( - SCHED_NAME, - TRIGGER_NAME, - TRIGGER_GROUP - ) REFERENCES QRTZ_TRIGGERS ( - SCHED_NAME, - TRIGGER_NAME, - TRIGGER_GROUP - ) ON DELETE CASCADE; - -ALTER TABLE QRTZ_SIMPROP_TRIGGERS - ADD - CONSTRAINT FK_QRTZ_SIMPROP_TRIGGERS_QRTZ_TRIGGERS FOREIGN KEY - ( - SCHED_NAME, - TRIGGER_NAME, - TRIGGER_GROUP - ) REFERENCES QRTZ_TRIGGERS ( - SCHED_NAME, - TRIGGER_NAME, - TRIGGER_GROUP - ) ON DELETE CASCADE; - - -ALTER TABLE QRTZ_TRIGGERS - ADD - CONSTRAINT FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS FOREIGN KEY - ( - SCHED_NAME, - JOB_NAME, - JOB_GROUP - ) REFERENCES QRTZ_JOB_DETAILS ( - SCHED_NAME, - JOB_NAME, - JOB_GROUP - ); - - --- ---------------------------- --- Table structure for visualization_background --- ---------------------------- -DROP TABLE IF EXISTS `visualization_background`; -CREATE TABLE `visualization_background` -( - `id` varchar(64) NOT NULL, - `name` varchar(255) DEFAULT NULL, - `classification` varchar(255) NOT NULL, - `content` longtext, - `remark` varchar(255) DEFAULT NULL, - `sort` int DEFAULT NULL, - `upload_time` bigint DEFAULT NULL, - `base_url` varchar(255) DEFAULT NULL, - `url` varchar(255) DEFAULT NULL, - PRIMARY KEY (`id`) -); - -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, - `base_url`, `url`) -VALUES ('board_1', '边框1', 'default', '', NULL, NULL, NULL, 'img/board', 'board/board_1.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, - `base_url`, `url`) -VALUES ('board_2', '边框2', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_2.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, - `base_url`, `url`) -VALUES ('board_3', '边框3', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_3.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, - `base_url`, `url`) -VALUES ('board_4', '边框4', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_4.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, - `base_url`, `url`) -VALUES ('board_5', '边框5', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_5.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, - `base_url`, `url`) -VALUES ('board_6', '边框6', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_6.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, - `base_url`, `url`) -VALUES ('board_7', '边框7', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_7.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, - `base_url`, `url`) -VALUES ('board_8', '边框8', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_8.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, - `base_url`, `url`) -VALUES ('board_9', '边框9', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_9.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, - `base_url`, `url`) -VALUES ('dark_1', '边框10', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/dark_1.svg'); - --- ---------------------------- --- Table structure for visualization_background_image --- ---------------------------- -DROP TABLE IF EXISTS `visualization_background_image`; -CREATE TABLE `visualization_background_image` -( - `id` varchar(64) NOT NULL, - `name` varchar(255) DEFAULT NULL, - `classification` varchar(255) NOT NULL, - `content` longtext, - `remark` varchar(255) DEFAULT NULL, - `sort` int DEFAULT NULL, - `upload_time` bigint DEFAULT NULL, - `base_url` varchar(255) DEFAULT NULL, - `url` varchar(255) DEFAULT NULL, - PRIMARY KEY (`id`) -); --- ---------------------------- --- Table structure for visualization_subject --- ---------------------------- -DROP TABLE IF EXISTS `visualization_subject`; -CREATE TABLE `visualization_subject` -( - `id` varchar(50) NOT NULL, - `name` varchar(255) DEFAULT NULL COMMENT '主题名称', - `type` varchar(255) DEFAULT NULL COMMENT '主题类型 system 系统主题,self 自定义主题', - `details` longtext COMMENT '主题内容', - `delete_flag` tinyint(1) DEFAULT '0' COMMENT '删除标记', - `cover_url` longtext COMMENT '封面信息', - `create_num` int NOT NULL DEFAULT '0', - `create_time` bigint DEFAULT NULL COMMENT '创建时间', - `create_by` varchar(255) DEFAULT NULL COMMENT '创建人', - `update_time` bigint DEFAULT NULL COMMENT '更新时间', - `update_by` varchar(255) DEFAULT NULL COMMENT '更新人', - `delete_time` bigint DEFAULT NULL COMMENT '删除时间', - `delete_by` bigint DEFAULT NULL COMMENT '删除人', - PRIMARY KEY (`id`) -); - - - -COMMIT; - -DROP TABLE IF EXISTS `core_dataset_table_sql_log`; -CREATE TABLE `core_dataset_table_sql_log` -( - `id` varchar(50) NOT NULL DEFAULT '' COMMENT 'ID', - `table_id` varchar(50) NOT NULL DEFAULT '' COMMENT '数据集SQL节点ID', - `start_time` bigint(13) DEFAULT NULL COMMENT '开始时间', - `end_time` bigint(13) DEFAULT NULL COMMENT '结束时间', - `spend` bigint(13) DEFAULT NULL COMMENT '耗时(毫秒)', - `sql` longtext NOT NULL COMMENT '详细信息', - `status` varchar(45) DEFAULT NULL COMMENT '状态', - PRIMARY KEY (`id`) -); - -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - --- ---------------------------- --- Table structure for visualization_link_jump --- ---------------------------- -DROP TABLE IF EXISTS `visualization_link_jump`; -CREATE TABLE `visualization_link_jump` -( - `id` bigint NOT NULL, - `source_dv_id` bigint DEFAULT NULL COMMENT '源仪表板ID', - `source_view_id` bigint DEFAULT NULL COMMENT '源图表ID', - `link_jump_info` varchar(4000) DEFAULT NULL COMMENT '跳转信息', - `checked` tinyint(1) DEFAULT NULL COMMENT '是否启用', - `copy_from` bigint DEFAULT NULL, - `copy_id` bigint DEFAULT NULL, - PRIMARY KEY (`id`) -); - --- ---------------------------- --- Table structure for visualization_link_jump_info --- ---------------------------- -DROP TABLE IF EXISTS `visualization_link_jump_info`; -CREATE TABLE `visualization_link_jump_info` -( - `id` bigint NOT NULL, - `link_jump_id` bigint DEFAULT NULL COMMENT 'link jump ID', - `link_type` varchar(255) DEFAULT NULL COMMENT '关联类型 inner 内部仪表板,outer 外部链接', - `jump_type` varchar(255) DEFAULT NULL COMMENT '跳转类型 _blank 新开页面 _self 当前窗口', - `target_dv_id` bigint DEFAULT NULL COMMENT '关联仪表板ID', - `source_field_id` bigint DEFAULT NULL COMMENT '字段ID', - `content` varchar(4000) DEFAULT NULL COMMENT '内容 linkType = outer时使用', - `checked` tinyint(1) DEFAULT NULL COMMENT '是否可用', - `attach_params` tinyint(1) DEFAULT NULL COMMENT '是否附加点击参数', - `copy_from` bigint DEFAULT NULL, - `copy_id` bigint DEFAULT NULL, - PRIMARY KEY (`id`) -); - --- ---------------------------- --- Table structure for visualization_link_jump_target_view_info --- ---------------------------- - -DROP TABLE IF EXISTS `visualization_link_jump_target_view_info`; -CREATE TABLE `visualization_link_jump_target_view_info` -( - `target_id` bigint NOT NULL, - `link_jump_info_id` bigint DEFAULT NULL, - `source_field_active_id` bigint DEFAULT NULL, - `target_view_id` bigint DEFAULT NULL, - `target_field_id` bigint DEFAULT NULL, - `copy_from` bigint DEFAULT NULL, - `copy_id` bigint DEFAULT NULL, - PRIMARY KEY (`target_id`) --- PRIMARY KEY (`target_id`) USING BTREE -); - --- ---------------------------- --- Table structure for visualization_linkage --- ---------------------------- -DROP TABLE IF EXISTS `visualization_linkage`; -CREATE TABLE `visualization_linkage` -( - `id` bigint NOT NULL, - `dv_id` bigint DEFAULT NULL, - `source_view_id` bigint DEFAULT NULL COMMENT '源图表id', - `target_view_id` bigint DEFAULT NULL COMMENT '联动图表id', - `update_time` bigint DEFAULT NULL COMMENT '更新时间', - `update_people` varchar(255) DEFAULT NULL COMMENT '更新人', - `linkage_active` tinyint(1) DEFAULT '0' COMMENT '是否启用关联', - `ext1` varchar(2000) DEFAULT NULL, - `ext2` varchar(2000) DEFAULT NULL, - `copy_from` bigint DEFAULT NULL, - `copy_id` bigint DEFAULT NULL, - PRIMARY KEY (`id`) -); - --- ---------------------------- --- Table structure for visualization_linkage_field --- ---------------------------- -DROP TABLE IF EXISTS `visualization_linkage_field`; -CREATE TABLE `visualization_linkage_field` -( - `id` bigint NOT NULL, - `linkage_id` bigint DEFAULT NULL COMMENT '联动ID', - `source_field` bigint DEFAULT NULL COMMENT '源图表字段', - `target_field` bigint DEFAULT NULL COMMENT '目标图表字段', - `update_time` bigint DEFAULT NULL COMMENT '更新时间', - `copy_from` bigint DEFAULT NULL, - `copy_id` bigint DEFAULT NULL, - PRIMARY KEY (`id`) -); - -SET FOREIGN_KEY_CHECKS = 1; - - -INSERT INTO `visualization_subject` (`id`, `name`, `type`, `details`, `delete_flag`, `cover_url`, `create_num`, - `create_time`, `create_by`, `update_time`, `update_by`, `delete_time`, `delete_by`) -VALUES ('10001', '浅色主题', 'system', - '{"width":1920,"height":1080,"refreshViewEnable":false,"refreshViewLoading":true,"refreshUnit":"minute","refreshTime":5,"scale":60,"scaleWidth":100,"scaleHeight":100,"backgroundColorSelect":true,"backgroundImageEnable":false,"backgroundType":"backgroundColor","background":"","openCommonStyle":true,"opacity":1,"fontSize":14,"themeId":"10001","color":"#000000","backgroundColor":"rgba(245, 246, 247, 1)","dashboard":{"gap":"yes","gapSize":5,"resultMode":"all","resultCount":1000,"themeColor":"light","mobileSetting":{"customSetting":false,"imageUrl":null,"backgroundType":"image","color":"#000"}},"component":{"chartTitle":{"show":true,"fontSize":"18","hPosition":"left","vPosition":"top","isItalic":false,"isBolder":true,"remarkShow":false,"remark":"","fontFamily":"Microsoft YaHei","letterSpace":"0","fontShadow":false,"color":"#000000","remarkBackgroundColor":"#ffffff"},"chartColor":{"basicStyle":{"colorScheme":"default","colors":["#1E90FF","#90EE90","#00CED1","#E2BD84","#7A90E0","#3BA272","#2BE7FF","#0A8ADA","#FFD700"],"alpha":100,"gradient":false,"mapStyle":"normal","areaBaseColor":"#FFFFFF","areaBorderColor":"#303133","gaugeStyle":"default","tableBorderColor":"#E6E7E4","tableScrollBarColor":"#00000024"},"misc":{"mapLineGradient":false,"mapLineSourceColor":"#146C94","mapLineTargetColor":"#576CBC","nameFontColor":"#000000","valueFontColor":"#5470c6"},"tableHeader":{"tableHeaderBgColor":"#1E90FF","tableHeaderFontColor":"#000000"},"tableCell":{"tableItemBgColor":"#FFFFFF","tableFontColor":"#000000"}},"chartCommonStyle":{"backgroundColorSelect":true,"backgroundImageEnable":false,"backgroundType":"innerImage","innerImage":"board/board_1.svg","outerImage":null,"innerPadding":12,"borderRadius":0,"backgroundColor":"rgba(255,255,255,1)","innerImageColor":"rgba(16, 148, 229,1)"},"filterStyle":{"layout":"horizontal","titleLayout":"left","labelColor":"#000000","titleColor":"#000000","color":"#000000","borderColor":"#F3E7E7","text":"#484747","bgColor":"#FFFFFF"},"tabStyle":{"headPosition":"left","headFontColor":"#OOOOOO","headFontActiveColor":"#OOOOOO","headBorderColor":"#OOOOOO","headBorderActiveColor":"#OOOOOO"}}}', - 0, - 'data:image/png;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/4gHYSUNDX1BST0ZJTEUAAQEAAAHIAAAAAAQwAABtbnRyUkdCIFhZWiAH4AABAAEAAAAAAABhY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAA9tYAAQAAAADTLQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlkZXNjAAAA8AAAACRyWFlaAAABFAAAABRnWFlaAAABKAAAABRiWFlaAAABPAAAABR3dHB0AAABUAAAABRyVFJDAAABZAAAAChnVFJDAAABZAAAAChiVFJDAAABZAAAAChjcHJ0AAABjAAAADxtbHVjAAAAAAAAAAEAAAAMZW5VUwAAAAgAAAAcAHMAUgBHAEJYWVogAAAAAAAAb6IAADj1AAADkFhZWiAAAAAAAABimQAAt4UAABjaWFlaIAAAAAAAACSgAAAPhAAAts9YWVogAAAAAAAA9tYAAQAAAADTLXBhcmEAAAAAAAQAAAACZmYAAPKnAAANWQAAE9AAAApbAAAAAAAAAABtbHVjAAAAAAAAAAEAAAAMZW5VUwAAACAAAAAcAEcAbwBvAGcAbABlACAASQBuAGMALgAgADIAMAAxADb/2wBDAAwICQoJBwwKCQoNDAwOER0TERAQESMZGxUdKiUsKyklKCguNEI4LjE/MigoOk46P0RHSktKLTdRV1FIVkJJSkf/2wBDAQwNDREPESITEyJHMCgwR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0f/wAARCABSAK4DASIAAhEBAxEB/8QAGgAAAgMBAQAAAAAAAAAAAAAAAAECAwQFB//EADgQAAIBAgQEAwUGBQUAAAAAAAECAAMRBBIhMQVBUWETUpEiMnGBoQYzQnKxwSNDYpLRFBWC8PH/xAAZAQEBAQEBAQAAAAAAAAAAAAAAAgEDBAX/xAApEQACAgEDAwMDBQAAAAAAAAAAAQIRMQMSIQQTYTIzQSJRcYGhweHw/9oADAMBAAIRAxEAPwD1WErq1PDCnKWB3tKquKNv4KXPVhoJSi2Y2kVVeJLSxVajUS3hlcpuTmuL7W5TYhZkBZcpPK95zWNdyxYIcwsfYGslTqYimLIEA3tlsPpLemyN50oTPQxBchai5W6jYy/nObTWS07HM+LxS4VabOBldwhJNrd/pLyQBc6ATPVqh1y+CGX+r/EhtIuKbHhcSuKDNTAKA2zA7maJgBqhyyhQT0EmK2IHJT8pm9FdtmyEqouzqxYWIa36S2WnZDVBMeHx3j+ylP8AiC+Zb7WNt7TQ9VUNrFj0EzuwawWglh1E2jm5JPJshMvj1re6voY6dWq1VQwUKd7DtG0xaiZphFEzKouxsJh0MuJx64bFeFVUBSmZWudTe1tppoualJXK5cwuBflKqlSg2pQufyyNOtTpJkp0GRRsFAA/WVtb+AaoTI+KqEfw6YHdjNKXyLfU21hxayCqriKCNkqsAR1BliqjKGUAgi4MeufdrW6aR85IFkXyiGRfKJKItY2Gp6CLFEci+USVtLREMwIIAB7ytqaBAjAZb82IixRZkHT5XMMo6CR8QWvmT+6BqaG1iR0N7TKNsllHQQyjoJiPEqILA1Pd39ky5cQzqGVXsbWOQ84M3GgADYWlNTEUFLB6gBXQ6kWk6bFtTm2G4sJKxDE5iQeXSaMkaRp1EzU7FesllHQSUIMpEco6CGUXBsNJKQqKjIRUtl53MG0SIuLH9ZHw16X+JJkWp0hTVrHKg0sx2H6ynh3EKHEqDVsM2ZFfLexGtgeY7ykpVawZaujTkXyiGRfKJnHEMKcQ9E1ArIbHMbCKrxHDUqqIagOc2zDYfPaKeBaNORfKI5z+J8TXA4fxh7YLhdNf+7TbRfxEDdQDJMUk3Q/5g0bbe+kkRfseoisM2bna28VyxOUkEdV0godm8w+Nor6lU5bkxFmzZCdTzCn/AMjLKllsddrKTGBY8pO7n5aQCqDcDXrzg7BFuQfkCf0jvpfX0iwOQqKGQ5gD8Y1bMLgH5giLMHDAAj4giAYK1JS9wLG3LSOgBmuC21rEzQaOZyLm47G3rEKGSpe5udNASIIpl1MaX1266RgJ4pIX2uZy/vEi5WPs8t77yetxBY4Tn8Mw+KoVsS2JxHio7A01sRkGvb4ek0lq/wDrAoyijbXe5+lvrNdfA5Odx/idfh1XBrRAIrVCrX6af5k/tQ7U/s9iWRirDJYg2PviS4zgGxr4ZlKjwmLG6k9Og7TRxXDtiuHVaCEKWtYkE8weUpayjTUOY8/n5/odrdw5cS/b/ZKeEsz/AGfw7OxZjQ1JNydJz/sSrJweqGBB8c7/AJVnYwdFqPDqdAkEqmW9iJn4Hg3wWDek7Biaha4BHIdRMfUTdx28S5fjwOzBLdu5jwvJzeHB632o4hQrAmiASoI0vcc4+LCon2j4fSp/csAHHXUzfg8E9LjOJxRYFagsBlI5jna3KGNwNSvxbC4lWAWla4sTfUnpJfU6j+tQV4rxi/yWtDSva5Os/rmjL9qhm4eov/NH6GdbCfcJ+UfpMnG8E+MwoRGCnODsTyPQTdQQpSVTyAnKO7uO8cBw01BSXq5v+Ct8TkZh4VZiOlMm8uFyLyk0qhrEjEVlU7KAmUfS8vAsACb9zOpAa9oa9o4QBa9oa9o5AF85DKoTkQ1yflaAS17Q17RwgC17Q17RxGwFzYCAGvaGvaOY3NSnilXxarhyTlsLKP7dtesA169oa9pV4lQMyincL+Im1/hpInEPlzpRJW+xuD8haAX69oa9pU1Vlrin4RKke8L6fT94Co+YqaWvI3NvW0Am7FFvYt2UXkPGOZV8OpqL+4bCLxqpFlojNzzEqPW0mzPplVDprdrftADOfKfSIVSb+w+n9O8kzN+FUPxa37fGBLXNgtrae1z9IAg5P4W9JJSSNrfESKtUN8y0x0s9/wBpJCxQFwobmFNx6wCsrUOIDCvZANaYUa977y23cyP8z3Ra3vSVxci4uOU0BbuYW7mBIAJJsBuZysVxB3YrQOVB+LmZUIOb4JlJRydW3cyqriaNLSpVAPQamcRqlRveqO3xYmRnoXT/AHZyer9kdf8A3DD+Z/7YHiGH87n/AIzkQldiJndka8VjKj1QcM1ha1nJA+kppNiKjItesNNt21+neVrvLaX3qfmE8mutkqR7unipw3M69Ck1IWaoz9zJNZ2yh2Ug65fWWSqooF2Fxffpy/xJOJMKQx5D47wZQ4s4+sogSANTaAXhQG0HKMi40NpmDA7EGOAWVjsL6yuWUtzLIBmIB3EYAG00EqNyB8YCx2sYBnl1L3JKA22tADmJyOJ6Y0kb2EITvoeo56vpMYrVX9lqrsuuhYkRwhPVDBwlkIQhLJCEIQBrvLaX3qfmEIT53U+4fV6T2md2VkA19Rf2f3hCQecnlXyj0hlXyj0hCAGVfKPSGVfKPSEIAAAbACOEIAo4QgBCEIB//9k=', - 0, 1696427707737, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `visualization_subject` (`id`, `name`, `type`, `details`, `delete_flag`, `cover_url`, `create_num`, - `create_time`, `create_by`, `update_time`, `update_by`, `delete_time`, `delete_by`) -VALUES ('10002', '深色主题', 'system', - '{"width":1920,"height":1080,"refreshViewEnable":false,"refreshViewLoading":true,"refreshUnit":"minute","refreshTime":5,"scale":60,"scaleWidth":100,"scaleHeight":100,"backgroundColorSelect":true,"backgroundImageEnable":false,"backgroundType":"backgroundColor","background":"","openCommonStyle":true,"opacity":1,"fontSize":14,"themeId":"10002","color":"#000000","backgroundColor":"rgba(3, 11, 46, 1)","dashboard":{"gap":"yes","gapSize":5,"resultMode":"all","resultCount":1000,"themeColor":"dark","mobileSetting":{"customSetting":false,"imageUrl":null,"backgroundType":"image","color":"#000"}},"component":{"chartTitle":{"show":true,"fontSize":"18","hPosition":"left","vPosition":"top","isItalic":false,"isBolder":true,"remarkShow":false,"remark":"","fontFamily":"Microsoft YaHei","letterSpace":"0","fontShadow":false,"color":"#FFFFFF","remarkBackgroundColor":"#5A5C62"},"chartColor":{"basicStyle":{"colorScheme":"default","colors":["#1E90FF","#90EE90","#00CED1","#E2BD84","#7A90E0","#3BA272","#2BE7FF","#0A8ADA","#FFD700"],"alpha":100,"gradient":false,"mapStyle":"darkblue","areaBaseColor":"5470C6","areaBorderColor":"#EBEEF5","gaugeStyle":"default","tableBorderColor":"#CCCCCC","tableScrollBarColor":"#FFFFFF80"},"misc":{"mapLineGradient":false,"mapLineSourceColor":"#2F58CD","mapLineTargetColor":"#3795BD","nameFontColor":"#ffffff","valueFontColor":"#5470c6"},"tableHeader":{"tableHeaderBgColor":"#1E90FF","tableHeaderFontColor":"#FFFFFF"},"tableCell":{"tableItemBgColor":"#131E42","tableFontColor":"#FFFFFF"}},"chartCommonStyle":{"backgroundColorSelect":true,"backgroundImageEnable":false,"backgroundType":"innerImage","innerImage":"board/board_1.svg","outerImage":null,"innerPadding":12,"borderRadius":0,"backgroundColor":"rgba(19,28,66,1)","innerImageColor":"#1094E5"},"filterStyle":{"layout":"horizontal","titleLayout":"left","labelColor":"#FFFFFF","titleColor":"#FFFFFF","color":"#FFFFFF","borderColor":"#484747","text":"#AFAFAF","bgColor":"#131C42"},"tabStyle":{"headPosition":"left","headFontColor":"#FFFFFF","headFontActiveColor":"#FFFFFF","headBorderColor":"#131E42","headBorderActiveColor":"#131E42"}}}', - 0, - 'data:image/png;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/4gHYSUNDX1BST0ZJTEUAAQEAAAHIAAAAAAQwAABtbnRyUkdCIFhZWiAH4AABAAEAAAAAAABhY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAA9tYAAQAAAADTLQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlkZXNjAAAA8AAAACRyWFlaAAABFAAAABRnWFlaAAABKAAAABRiWFlaAAABPAAAABR3dHB0AAABUAAAABRyVFJDAAABZAAAAChnVFJDAAABZAAAAChiVFJDAAABZAAAAChjcHJ0AAABjAAAADxtbHVjAAAAAAAAAAEAAAAMZW5VUwAAAAgAAAAcAHMAUgBHAEJYWVogAAAAAAAAb6IAADj1AAADkFhZWiAAAAAAAABimQAAt4UAABjaWFlaIAAAAAAAACSgAAAPhAAAts9YWVogAAAAAAAA9tYAAQAAAADTLXBhcmEAAAAAAAQAAAACZmYAAPKnAAANWQAAE9AAAApbAAAAAAAAAABtbHVjAAAAAAAAAAEAAAAMZW5VUwAAACAAAAAcAEcAbwBvAGcAbABlACAASQBuAGMALgAgADIAMAAxADb/2wBDAAsICAoIBwsKCQoNDAsNERwSEQ8PESIZGhQcKSQrKigkJyctMkA3LTA9MCcnOEw5PUNFSElIKzZPVU5GVEBHSEX/2wBDAQwNDREPESESEiFFLicuRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUX/wAARCABSAK4DASIAAhEBAxEB/8QAGwAAAgMBAQEAAAAAAAAAAAAAAAMBAgQFBgf/xAA/EAABAwICBwMIBwkBAQAAAAABAAIDBBESIQUTMUFRYZEUItEjQlNUcYGSoSQzk6Ox4fAGFRYyUmOiwfFDYv/EABgBAQEBAQEAAAAAAAAAAAAAAAEAAgME/8QAKhEAAgIBAwEHBAMAAAAAAAAAAAECESEDEjFRBBMUIjJB8GGBscFxofH/2gAMAwEAAhEDEQA/APmbq6R8jpJO/I4klzjck8U5zaqRpmOqsRiNnt4X2X+SwWuVpNFIBfHDtt9a3xXrepLqc9qLMM0kb5G6vCzbctB6HbsXU0Z+z9ZpWnbLBLC0OubPIbsNt64bm4HFpIJHA3Cs2WRos17gOAK3CaT8+TM4tryujbX0U1BUMhe9jnPbiBGQ28/Ysj3PY9zHEXBsbWKo57nm73Fx5m6lrLi5IA4lEpW7jhDFNLzchrHcfkpxu4joryU5jYJA5skZNsbL2vwzzCpGGGRokcWsJGJwFyB7EPcsMcMMbuXRGN36C3mDReE/TJy6+R1OW/n7Pmphp9FF411dO1uw4YLm/wAWxFsaMGM/oIDjy6LdJBottO90dbO6W3cZqbAnLIm+W/PksCrZFsR/QRiKqpTYE4ipxFVUqEm5RcqFKSJuUXUKVESE6nq6ijeX008kLiLExuLSR7kkIUyM8RAmZcEjELgC9/cvRVtXoyemqBFo+VkrgwCbszWgEEeaD3b5g2JvcLzjWlzw1u0mwXTboPSD88IN95eiGlPUzBNmXOMeWdn96aGE88p0W8ukthJpWYGWcCQI72GV95J5BIptLaFg1xdSOeXz6xpfSxus247tr5DI5DbeyxN/ZzSbjkxv2gWWPRNVK6RrGAmN5Y7vbxtSuzat1tZPUhymbtMaR0XVUEcVDTOjmbJic4wRsxDvXzab722GwW3rBSw4oxNJG59OwFrywBxacyMr5bs/an/w/X3+raPa4J8GgNKxyB1OMD9gLJLH5La7NqrmLDvI9TNUNYyCWSNr2wyta2PGzCXOBBJtc5DMX5rnrqaT0RpKkaZ9IAk4g0l77uuuYszTTSaoY5yizwA/INtyJIUZcleUHGbh3vZh+SrY8D0WDRGXJT0RhPPomak9n1t8sWG1uV1JWTYvLkpBsb2CLHgeinCbXsbexRF3zOkaGuwWHBoH4KmXJRY8+icyIOp5ZDfE0tAy438FpK+C4FZclOXJFjwPRPhYDT1BLblrRY22d4JSsG6EdE6GNsjJifMZiFuNwP8AaVb29Foph5Op2/VcP/pqYK2T4M/RCm1v+IWREQkNnjJNgHC59693T6foWRtY6Y5NDT9IIBy4LwTWlzg1oJJNgBvVzDICQY3gt2jCcl10O0vRTildnKelvdn0H986LLWiOeKMjaTLe64ujNKUtNPWl8uUkzy3DLhyJyPNeWLS21wRcXF1C7+PluUq/JnuFVWfQv4h0dI0tfIS027pqSR+CKXS2jQ/ytZEBbjfPnmF8/axz3YWNLjwAurPhkjF3xvaDvcCFrx06xH8me4jeWew/avSlFW6NZHS1DJCxzRkcyM93vt7l41CACSABcncvHqaj1Jbmd4R2qiXWJ7oAHC6cQ3scdgMeN1zbdYWz6pb4ZIyWvjc0g2ILSLKCHDJwI5FYTwaYJ9x2DDv1t/ks6m5ta+Sk6BqybexPa4dge3eZWn5HxWdTns3JToXkOi0RuApJmnaXNI+azoubWvklOgasnotEJAp6gHaWi3ULMFa5AyO1SdC1ZPRPpyAye++Ow6jwS44JZReOJ7xxa0lVc18bi1wc128EWKVayDp4BChSsiIje+KRskbi17SC0jaCug3S+lY3F3aJcRc513C+ZILto5Bc5mT23sc967cs1Y2R2Oqgc7E8kiuJucr54s75e23Jc0k8k3WDjSySSvxSkl3Eqq11Mo1x1scUrzmXCRzr++6Vro/V2fE7xWqXULCmqpqOYTU0hjkGxwT63S9fpFjWVlS+ZrTcB25I1sfq7OrvFGtj9Azq7xW02lW7H3ClzQSzTyNAmfI5oOWIlLBLXAg2IzBC01T3vZGXva7gBIXEdTksqwaOoNM6Wa57hUTYpHYnOw5uJ525DosVTUT1UgkqXFz7WBItlf/AKuprKrBGO0wYThsO2O7owm1+9lYXHK9liqZrvBmZHK4jbrXO/2pRSSBuzEpTtdF6tH8TvFGuj9Wj+J3itUuoWKQna6P1dnxO8Ua2P1dnxO8U0uo2JQE7Wx+rs6u8Ua2P1dnV3iqvqVikJutj9Azq7xRrY/QM6u8U0uo2PpNKVtCwspamSJpNyGnely1lRNUOqJJnmZ2198yq61noGdXeKNYz0LOp8VpttU2FLmiJHSSOL5S5zic3ONyVVaZ3udTsxOYW5BrRIXEe6+Sz7lhiZmXxtwmxuLG9re9dcsh9dqhmf8A0jOWVvP9vyXIbbGL7L55XXVkLHPLuwYRd2XZnDhl/Pu/2uaWLshE4lEnkKl7mcXzNB+Tkv6V6f74eKtLC2WQFsMsd7ANZCbHq4qhpLebUfY/mt/OTJQyTg2MzvtPzVe+fO/yV+yy3I1UtwLnyZ2INNI0EmOUAC5JYs3ZpIJhGGM1bpHO87FawPKxSU+c3azyIjAFrhpGLqUlRHXayPCMVZUg5XtKw+bn5/G3uSZmygjUVMjhbPHM0Z+5xTLswsd2IlrcOfZzn3d/e37fckSwsfY6qWO2RwwHPq7kVvh1f9mXn/Ctqv0/348UWqvT/fjxUdkAP8tR9j+aOyi4GGoudg1O35pv5YUTaq9P98PFH0n033w8UCkvazag3/s/mlujia4hzpARtBjHim/liX+k+m++HioL5wbGV3uk/NUwxf1v+AeKrZvE9FNikM1k3pXfGoJkcbl9zzcq2bxPRTZvE9Fm2xJs7+r/ACR3/wCr/JRZvE9EWbxPRRDXhmqbZzy/eCRb8UrcnP8AqG+Swi+T8JF8uN0lRGUGxuNq1S11WXm9VN/MT9Yd9r/gOiELm/T9/wBMVy/4/aIGkKwZirnBH9wo7fV+tT5C31h2IQsgS3SNa0WFXUAZZCV27ZvVXVdQ9pa6olcDtBeT+tpQhKEo6R7wMb3OtkLm9lVCEoDU6tqmhoFTMAA2wDzuFh8slDa+rYbtqpwb3ykKEKl62PsiTX1bjc1U5zvnIdu1Ar6tosKqcDgJChCiA11Wb3qpjfb5Q5pTnukcXPcXOO0k3KEJQEIQhaIshCFECAhCSGOke5oa57i0bATkFVCFexH/2Q==', - 0, 1696427762072, NULL, NULL, NULL, NULL, NULL); - -ALTER TABLE `core_datasource` - ADD COLUMN `update_by` bigint NULL COMMENT '变更人' AFTER `update_time`; - -DROP TABLE IF EXISTS `core_ds_finish_page`; -CREATE TABLE `core_ds_finish_page` -( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - PRIMARY KEY (`id`) -); - - -DROP TABLE IF EXISTS `core_opt_recent`; -CREATE TABLE `core_opt_recent` -( - `id` bigint NOT NULL COMMENT 'ID', - `resource_id` bigint DEFAULT NULL COMMENT '资源ID', - `uid` bigint NOT NULL COMMENT '用户ID', - `resource_type` int NOT NULL COMMENT '资源类型', - `opt_type` int DEFAULT NULL COMMENT '1 新建 2 修改', - `time` bigint NOT NULL COMMENT '收藏时间', - PRIMARY KEY (`id`) -); - --- ---------------------------- --- Table structure for core_store --- ---------------------------- -DROP TABLE IF EXISTS `core_store`; -CREATE TABLE `core_store` -( - `id` bigint NOT NULL COMMENT 'ID', - `resource_id` bigint NOT NULL COMMENT '资源ID', - `uid` bigint NOT NULL COMMENT '用户ID', - `resource_type` int NOT NULL COMMENT '资源类型', - `time` bigint NOT NULL COMMENT '收藏时间', - PRIMARY KEY (`id`) -); - --- ---------------------------- --- Table structure for core_sys_setting --- ---------------------------- -DROP TABLE IF EXISTS `core_sys_setting`; -CREATE TABLE `core_sys_setting` -( - `id` bigint NOT NULL COMMENT 'ID', - `pkey` varchar(255) NOT NULL COMMENT '键', - `pval` varchar(255) NOT NULL COMMENT '值', - `type` varchar(255) NOT NULL COMMENT '类型', - `sort` int NOT NULL DEFAULT '0' COMMENT '顺序', - PRIMARY KEY (`id`) -); diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10.1__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10.1__ddl.sql deleted file mode 100644 index 394f282..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.10.1__ddl.sql +++ /dev/null @@ -1,9 +0,0 @@ -ALTER TABLE `visualization_outer_params_info` - ADD COLUMN `required` tinyint(1) DEFAULT 0 COMMENT '是否必填'; -ALTER TABLE `visualization_outer_params_info` - ADD COLUMN `default_value` varchar(255) DEFAULT NULL COMMENT '默认值 JSON格式'; -ALTER TABLE `visualization_outer_params_info` - ADD COLUMN `enabled_default` tinyint(1) NULL DEFAULT 0 COMMENT '是否启用默认值'; - -ALTER TABLE `visualization_link_jump_info` - ADD COLUMN `window_size` varchar(255) NULL DEFAULT 'middle' COMMENT '窗口大小large middle small'; diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10.2__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10.2__ddl.sql deleted file mode 100644 index 1e7c901..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.10.2__ddl.sql +++ /dev/null @@ -1,11 +0,0 @@ -INSERT INTO area (id, level, name, pid) -VALUES ('156440315', 'district', '大鹏新区', '156440300'); - -delete -from data_visualization_info dvi -where dvi.delete_flag = 1; - -ALTER TABLE `core_chart_view` - ADD COLUMN `custom_attr_mobile` longtext NULL COMMENT '图形属性_移动端'; -ALTER TABLE `core_chart_view` - ADD COLUMN `custom_style_mobile` longtext NULL COMMENT '组件样式_移动端'; diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10.3__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10.3__ddl.sql deleted file mode 100644 index 17d7f58..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.10.3__ddl.sql +++ /dev/null @@ -1,50 +0,0 @@ -INSERT INTO `core_sys_setting`(`id`, `pkey`, `pval`, `type`, `sort`) -VALUES (1048232869488627719, 'basic.defaultSort', '1', 'text', 13); - -INSERT INTO `core_sys_setting`(`id`, `pkey`, `pval`, `type`, `sort`) -VALUES (1048232869488627720, 'basic.defaultOpen', '1', 'text', 14); - -ALTER TABLE `data_visualization_info` - ADD COLUMN `content_id` varchar(50) NULL DEFAULT '0' COMMENT '内容标识'; - -ALTER TABLE `visualization_link_jump_target_view_info` - ADD COLUMN `target_type` varchar(50) NULL COMMENT '联动目标类型 view 图表 filter 过滤组件 outParams 外部参数'; - -ALTER TABLE `visualization_link_jump_target_view_info` - MODIFY COLUMN `target_view_id` varchar(50) NULL DEFAULT NULL COMMENT '目标图表ID'; -ALTER TABLE `visualization_link_jump_target_view_info` - MODIFY COLUMN `target_field_id` varchar(50) NULL DEFAULT NULL COMMENT '目标字段ID'; - -update visualization_link_jump_target_view_info set target_type = 'view'; -ALTER TABLE `data_visualization_info` - ADD COLUMN `check_version` varchar(50) NULL DEFAULT '1' COMMENT '内容检查标识'; -update data_visualization_info set check_version = '1'; - -UPDATE `visualization_background` SET `name` = 'Board1' WHERE `id` = 'board_1'; -UPDATE `visualization_background` SET `name` = 'Board2' WHERE `id` = 'board_2'; -UPDATE `visualization_background` SET `name` = 'Board3' WHERE `id` = 'board_3'; -UPDATE `visualization_background` SET `name` = 'Board4' WHERE `id` = 'board_4'; -UPDATE `visualization_background` SET `name` = 'Board5' WHERE `id` = 'board_5'; -UPDATE `visualization_background` SET `name` = 'Board6' WHERE `id` = 'board_6'; -UPDATE `visualization_background` SET `name` = 'Board7' WHERE `id` = 'board_7'; -UPDATE `visualization_background` SET `name` = 'Board8' WHERE `id` = 'board_8'; -UPDATE `visualization_background` SET `name` = 'Board9' WHERE `id` = 'board_9'; - -DROP TABLE IF EXISTS `core_custom_geo_area`; -CREATE TABLE core_custom_geo_area -( - id varchar(50) not null comment 'id' - primary key, - name varchar(50) null comment '区域名称' -) - comment '自定义地理区域'; -DROP TABLE IF EXISTS `core_custom_geo_sub_area`; -create table core_custom_geo_sub_area -( - id bigint not null comment 'id' - primary key, - name varchar(50) not null comment '名称', - scope varchar(1024) null comment '区域范围', - geo_area_id varchar(50) not null comment '自定义地理区域id' -) - comment '自定义地理区域分区详情'; \ No newline at end of file diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10.4__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10.4__ddl.sql deleted file mode 100644 index 90d64cc..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.10.4__ddl.sql +++ /dev/null @@ -1,21 +0,0 @@ -UPDATE `visualization_background` SET `name` = 'Board10' WHERE `id` = 'dark_1'; -UPDATE `visualization_subject` SET `name` = 'chart.light_theme' WHERE `id` = '10001'; -UPDATE `visualization_subject` SET `name` = 'chart.dark_theme' WHERE `id` = '10002'; -ALTER TABLE core_chart_view ADD COLUMN sort_priority longtext null comment '字段排序优先级'; -DELETE FROM area where id = '156320571'; -CREATE INDEX idx_dataset_table_task_log_A ON core_datasource_task_log(ds_id, table_name, start_time); - -delete from visualization_background; -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, `base_url`, `url`) VALUES ('board_1', '1', 'default', '', NULL, NULL, NULL, 'img/board', 'board/board_1.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, `base_url`, `url`) VALUES ('board_2', '2', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_2.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, `base_url`, `url`) VALUES ('board_3', '3', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_3.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, `base_url`, `url`) VALUES ('board_4', '4', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_4.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, `base_url`, `url`) VALUES ('board_5', '5', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_5.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, `base_url`, `url`) VALUES ('board_6', '6', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_6.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, `base_url`, `url`) VALUES ('board_7', '7', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_7.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, `base_url`, `url`) VALUES ('board_8', '8', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_8.svg'); -INSERT INTO `visualization_background` (`id`, `name`, `classification`, `content`, `remark`, `sort`, `upload_time`, `base_url`, `url`) VALUES ('board_9', '9', 'default', NULL, NULL, NULL, NULL, 'img/board', 'board/board_9.svg'); - -DELETE FROM area WHERE id='156500200'; -UPDATE area SET pid='156500100' WHERE pid='156500200'; -UPDATE area SET name='万州区' WHERE id='156500101'; \ No newline at end of file diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10.5__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10.5__ddl.sql deleted file mode 100644 index a369ead..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.10.5__ddl.sql +++ /dev/null @@ -1,4 +0,0 @@ -UPDATE core_sys_setting -SET pval = 'https://cdn0-templates-dataease-cn.fit2cloud.com' -WHERE - pkey = 'template.url'; diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql deleted file mode 100644 index 883af71..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql +++ /dev/null @@ -1,11 +0,0 @@ -ALTER TABLE `core_dataset_table_field` - ADD COLUMN `group_list` longtext NULL; - -ALTER TABLE `core_dataset_table_field` - ADD COLUMN `other_group` longtext NULL; - - -alter table `per_data_filling_task_sub_instance` - modify `data_id` varchar(255) null comment '数据ID'; -alter table per_data_filling_commit_log - modify `data_id` varchar(255) not null comment '操作的数据ID'; diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10__ddl.sql deleted file mode 100644 index 73b01f2..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.10__ddl.sql +++ /dev/null @@ -1,41 +0,0 @@ - -INSERT INTO `core_sys_startup_job` VALUES ('chartFilterDynamic', 'chartFilterDynamic', 'ready'); - - -alter table `core_dataset_table_field` add params text null comment '计算字段参数'; - -alter table `core_datasource` - add `enable_data_fill` tinyint default 0 null comment '启用数据填报功能'; - - -ALTER TABLE `visualization_outer_params_target_view_info` - MODIFY COLUMN `target_view_id` varchar(50) NULL DEFAULT NULL COMMENT '联动视图ID/联动过滤项ID'; -ALTER TABLE `visualization_outer_params_target_view_info` - ADD COLUMN `target_ds_id` varchar(50) NULL COMMENT '联动数据集id/联动过滤组件id' ; - - -alter table `core_chart_view` - add flow_map_start_name longtext comment '流向地图起点名称field'; -alter table `core_chart_view` - add flow_map_end_name longtext comment '流向地图终点名称field'; -alter table `core_chart_view` - add ext_color longtext comment '颜色维度field'; - -update visualization_outer_params_target_view_info set target_ds_id = (select ccv.table_id from visualization_outer_params_target_view_info tvi INNER JOIN core_chart_view ccv on tvi.target_view_id = ccv.id) -where target_view_id = (select ccv.id from visualization_outer_params_target_view_info tvi INNER JOIN core_chart_view ccv on tvi.target_view_id = ccv.id); - -DROP TABLE IF EXISTS `core_font`; -CREATE TABLE `core_font` -( - `id` bigint NOT NULL COMMENT 'ID', - `name` varchar(255) NOT NULL COMMENT '字体名称', - `file_name` varchar(255) default NULL COMMENT '文件名称', - `file_trans_name` varchar(255) default NULL COMMENT '文件转换名称', - `is_default` tinyint(1) default 0 COMMENT '是否默认', - `update_time` bigint NOT NULL COMMENT '更新时间', - `is_BuiltIn` tinyint(1) default 0 COMMENT '是否内置', - PRIMARY KEY (`id`) -); -ALTER TABLE `core_font` ADD COLUMN `size` DOUBLE NULL AFTER `is_BuiltIn`; -ALTER TABLE `core_font` ADD COLUMN `size_type` varchar(255) NULL AFTER `size`; -INSERT INTO `core_font` (`id`, `name`, `is_default`, `update_time`, `is_BuiltIn`) VALUES ('1', 'PingFang', '1', '0', '1'); diff --git a/core/core-backend/src/main/resources/db/desktop/V2.1__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.1__ddl.sql deleted file mode 100644 index 1486e59..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.1__ddl.sql +++ /dev/null @@ -1,96 +0,0 @@ -DROP TABLE IF EXISTS `visualization_template`; -CREATE TABLE `visualization_template` -( - `id` varchar(50) NOT NULL COMMENT '主键', - `name` varchar(255) DEFAULT NULL COMMENT '名称', - `pid` varchar(255) DEFAULT NULL COMMENT '父级id', - `level` int DEFAULT NULL COMMENT '层级', - `dv_type` varchar(255) DEFAULT NULL COMMENT '模板种类 dataV or dashboard 目录或者文件夹', - `node_type` varchar(255) DEFAULT NULL COMMENT '节点类型 folder or panel 目录或者文件夹', - `create_by` varchar(255) DEFAULT NULL COMMENT '创建人', - `create_time` bigint DEFAULT NULL COMMENT '创建时间', - `snapshot` longtext COMMENT '缩略图', - `template_type` varchar(255) DEFAULT NULL COMMENT '模版类型 system 系统内置 self 用户自建 ', - `template_style` longtext COMMENT 'template 样式', - `template_data` longtext COMMENT 'template 数据', - `dynamic_data` longtext COMMENT '预存数据', - PRIMARY KEY (`id`) -); - --- ---------------------------- --- Table structure for visualization_template_category --- ---------------------------- -DROP TABLE IF EXISTS `visualization_template_category`; -CREATE TABLE `visualization_template_category` -( - `id` varchar(50) NOT NULL COMMENT '主键', - `name` varchar(255) DEFAULT NULL COMMENT '名称', - `pid` varchar(255) DEFAULT NULL COMMENT '父级id', - `level` int DEFAULT NULL COMMENT '层级', - `dv_type` varchar(255) DEFAULT NULL COMMENT '模板种类 dataV or dashboard 目录或者文件夹', - `node_type` varchar(255) DEFAULT NULL COMMENT '节点类型 folder or panel 目录或者文件夹', - `create_by` varchar(255) DEFAULT NULL COMMENT '创建人', - `create_time` bigint DEFAULT NULL COMMENT '创建时间', - `snapshot` longtext COMMENT '缩略图', - `template_type` varchar(255) DEFAULT NULL, - PRIMARY KEY (`id`) -); - --- ---------------------------- --- Table structure for visualization_template_category_map --- ---------------------------- -DROP TABLE IF EXISTS `visualization_template_category_map`; -CREATE TABLE `visualization_template_category_map` -( - `id` varchar(50) NOT NULL COMMENT '主键', - `category_id` varchar(255) DEFAULT NULL COMMENT '名称', - `template_id` varchar(255) DEFAULT NULL COMMENT '父级id', - PRIMARY KEY (`id`) -); - --- ---------------------------- --- Table structure for visualization_template_extend_data --- ---------------------------- -DROP TABLE IF EXISTS `visualization_template_extend_data`; -CREATE TABLE `visualization_template_extend_data` -( - `id` bigint NOT NULL, - `dv_id` bigint DEFAULT NULL, - `view_id` bigint DEFAULT NULL, - `view_details` longtext, - `copy_from` varchar(255) DEFAULT NULL, - `copy_id` varchar(255) DEFAULT NULL, - PRIMARY KEY (`id`) -); - -INSERT INTO `core_menu` -VALUES (19, 0, 2, 'template-market', 'template-market', 4, NULL, '/template-market', 1, 1, 0); -INSERT INTO `core_menu` -VALUES (30, 0, 1, 'toolbox', null, 7, 'icon_template', '/toolbox', 1, 1, 0); -INSERT INTO `core_menu` -VALUES (31, 30, 2, 'template-setting', 'toolbox/template-setting', 1, 'icon_template', '/template-setting', 0, 1, 1); - - -ALTER TABLE `core_opt_recent` - MODIFY COLUMN `resource_id` bigint NULL COMMENT '资源ID'; - -ALTER TABLE core_opt_recent - ADD `resource_name` varchar(255) NULL COMMENT '资源名称'; - -DROP TABLE IF EXISTS `core_area_custom`; -CREATE TABLE `core_area_custom` -( - `id` varchar(255) NOT NULL, - `name` varchar(255) NOT NULL, - `pid` varchar(255) NOT NULL, - PRIMARY KEY (`id`) -); - -INSERT INTO `core_sys_setting` -VALUES (1, 'basic.dsIntervalTime', '6', 'text', 2); -INSERT INTO `core_sys_setting` -VALUES (2, 'basic.dsExecuteTime', 'minute', 'text', 3); -INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) -VALUES (7, 'template.url', 'https://templates.dataease.cn', 'text', 0); -INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) -VALUES (8, 'template.accessKey', 'dataease', 'text', 1); diff --git a/core/core-backend/src/main/resources/db/desktop/V2.2__update_table_desc_ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.2__update_table_desc_ddl.sql deleted file mode 100644 index 7d22e5f..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.2__update_table_desc_ddl.sql +++ /dev/null @@ -1,211 +0,0 @@ -COMMENT ON TABLE `QRTZ_BLOB_TRIGGERS` - IS '自定义触发器存储(开源作业调度框架Quartz)'; -COMMENT ON TABLE `QRTZ_CALENDARS` - IS 'Quartz日历(开源作业调度框架Quartz)'; -COMMENT ON TABLE `QRTZ_CRON_TRIGGERS` - IS 'CronTrigger存储(开源作业调度框架Quartz)'; -COMMENT ON TABLE `QRTZ_FIRED_TRIGGERS` - IS '存储已经触发的trigger相关信息(开源作业调度框架Quartz)'; -COMMENT ON TABLE `QRTZ_JOB_DETAILS` - IS '存储jobDetails信息(开源作业调度框架Quartz)'; -COMMENT ON TABLE `QRTZ_LOCKS` - IS 'Quartz锁表,为多个节点调度提供分布式锁(开源作业调度框架Quartz)'; -COMMENT ON TABLE `QRTZ_PAUSED_TRIGGER_GRPS` - IS '存放暂停掉的触发器(开源作业调度框架Quartz)'; -COMMENT ON TABLE `QRTZ_SCHEDULER_STATE` - IS '存储所有节点的scheduler(开源作业调度框架Quartz)'; -COMMENT ON TABLE `QRTZ_SIMPLE_TRIGGERS` - IS 'SimpleTrigger存储(开源作业调度框架Quartz)'; -COMMENT ON TABLE `QRTZ_SIMPROP_TRIGGERS` - IS '存储CalendarIntervalTrigger和DailyTimeIntervalTrigger两种类型的触发器(开源作业调度框架Quartz)'; -COMMENT ON TABLE `QRTZ_TRIGGERS` - IS '存储定义的trigger(开源作业调度框架Quartz)'; -COMMENT ON TABLE `area` - IS '地图区域表'; -COMMENT ON TABLE `core_area_custom` - IS '自定义地图区域信息表'; -COMMENT ON TABLE `core_chart_view` - IS '组件图表表'; -COMMENT ON TABLE `core_dataset_group` - IS '数据集分组表'; -COMMENT ON TABLE `core_dataset_table` - IS 'table数据集'; -COMMENT ON TABLE `core_dataset_table_field` - IS 'table数据集表字段'; -COMMENT ON TABLE `core_dataset_table_sql_log` - IS 'table数据集查询sql日志'; -COMMENT ON TABLE `core_datasource` - IS '数据源表'; -COMMENT ON TABLE `core_datasource_task` - IS '数据源定时同步任务'; -COMMENT ON TABLE `core_datasource_task_log` - IS '数据源定时同步任务执行日志'; -COMMENT ON TABLE `core_de_engine` - IS '数据引擎'; -COMMENT ON TABLE `core_driver` - IS '驱动'; -COMMENT ON TABLE `core_driver_jar` - IS '驱动详情'; -COMMENT ON TABLE `core_menu` - IS '路由菜单'; -COMMENT ON TABLE `core_opt_recent` - IS '可视化资源表'; -COMMENT ON TABLE `core_rsa` - IS 'rsa 密钥表'; -COMMENT ON TABLE `core_store` - IS '用户收藏表'; -COMMENT ON TABLE `core_sys_setting` - IS '系统设置表'; -COMMENT ON TABLE `data_visualization_info` - IS '可视化大屏信息表'; - -COMMENT ON TABLE `visualization_background` - IS '边框背景表'; -COMMENT ON TABLE `visualization_background_image` - IS '背景图'; -COMMENT ON TABLE `visualization_link_jump` - IS '跳转记录表'; -COMMENT ON TABLE `visualization_link_jump_info` - IS '跳转配置表'; -COMMENT ON TABLE `visualization_link_jump_target_view_info` - IS '跳转目标仪表板图表字段配置表'; -COMMENT ON TABLE `visualization_linkage` - IS '联动记录表'; -COMMENT ON TABLE `visualization_linkage_field` - IS '联动字段'; -COMMENT ON TABLE `visualization_subject` - IS '主题表'; -COMMENT ON TABLE `visualization_template_extend_data` - IS '模板图表明细信息表'; - -ALTER TABLE `core_dataset_group` - MODIFY COLUMN `qrtz_instance` varchar(1024) NULL DEFAULT NULL COMMENT 'Quartz 实例 ID'; - -ALTER TABLE `core_dataset_table_field` - MODIFY COLUMN `size` int(0) NULL DEFAULT NULL COMMENT '字段长度(允许为空,默认0)'; -ALTER TABLE `core_dataset_table_field` - MODIFY COLUMN `date_format` varchar(255) NULL DEFAULT NULL COMMENT '时间字段类型'; - -ALTER TABLE `core_datasource_task` - MODIFY COLUMN `extra_data` longtext NULL COMMENT '额外数据'; - -ALTER TABLE `core_datasource_task_log` - MODIFY COLUMN `trigger_type` varchar(45) NULL DEFAULT NULL COMMENT '更新频率类型'; - -ALTER TABLE `core_driver_jar` - MODIFY COLUMN `trans_name` varchar(255) NULL DEFAULT NULL COMMENT '替换后的 jar 包名称'; -ALTER TABLE `core_driver_jar` - MODIFY COLUMN `is_trans_name` tinyint(1) NULL DEFAULT NULL COMMENT '是否将上传 jar 包替换了名称(1-是,0-否)'; - -ALTER TABLE `core_rsa` - MODIFY COLUMN `aes_key` text NOT NULL COMMENT 'AES 加密算法的 key'; - -ALTER TABLE `data_visualization_info` - MODIFY COLUMN `id` varchar(50) NOT NULL COMMENT '主键'; - -ALTER TABLE `visualization_background` - MODIFY COLUMN `id` varchar(64) NOT NULL COMMENT '主键'; -ALTER TABLE `visualization_background` - MODIFY COLUMN `name` varchar(255) NULL DEFAULT NULL COMMENT '名称'; -ALTER TABLE `visualization_background` - MODIFY COLUMN `classification` varchar(255) NOT NULL COMMENT '分类名'; -ALTER TABLE `visualization_background` - MODIFY COLUMN `content` longtext NULL COMMENT '内容'; -ALTER TABLE `visualization_background` - MODIFY COLUMN `remark` varchar(255) NULL DEFAULT NULL COMMENT '备注'; -ALTER TABLE `visualization_background` - MODIFY COLUMN `sort` int(0) NULL DEFAULT NULL COMMENT '排序'; -ALTER TABLE `visualization_background` - MODIFY COLUMN `upload_time` bigint(0) NULL DEFAULT NULL COMMENT '上传时间'; -ALTER TABLE `visualization_background` - MODIFY COLUMN `base_url` varchar(255) NULL DEFAULT NULL COMMENT '所在目录地址'; -ALTER TABLE `visualization_background` - MODIFY COLUMN `url` varchar(255) NULL DEFAULT NULL COMMENT '图片url'; - -ALTER TABLE `visualization_background_image` - MODIFY COLUMN `id` varchar(64) NOT NULL COMMENT '主键'; -ALTER TABLE `visualization_background_image` - MODIFY COLUMN `name` varchar(255) NULL DEFAULT NULL COMMENT '名称'; -ALTER TABLE `visualization_background_image` - MODIFY COLUMN `classification` varchar(255) NOT NULL COMMENT '分类名'; -ALTER TABLE `visualization_background_image` - MODIFY COLUMN `content` longtext NULL COMMENT '内容'; -ALTER TABLE `visualization_background_image` - MODIFY COLUMN `remark` varchar(255) NULL DEFAULT NULL COMMENT '备注'; -ALTER TABLE `visualization_background_image` - MODIFY COLUMN `sort` int(0) NULL DEFAULT NULL COMMENT '排序'; -ALTER TABLE `visualization_background_image` - MODIFY COLUMN `upload_time` bigint(0) NULL DEFAULT NULL COMMENT '上传时间'; -ALTER TABLE `visualization_background_image` - MODIFY COLUMN `base_url` varchar(255) NULL DEFAULT NULL COMMENT '所在目录地址'; -ALTER TABLE `visualization_background_image` - MODIFY COLUMN `url` varchar(255) NULL DEFAULT NULL COMMENT '图片url'; - -ALTER TABLE `visualization_link_jump` - MODIFY COLUMN `id` bigint(0) NOT NULL COMMENT '主键'; -ALTER TABLE `visualization_link_jump` - MODIFY COLUMN `copy_from` bigint(0) NULL DEFAULT NULL COMMENT '复制来源'; -ALTER TABLE `visualization_link_jump` - MODIFY COLUMN `copy_id` bigint(0) NULL DEFAULT NULL COMMENT '复制来源ID'; - -ALTER TABLE `visualization_link_jump_info` - MODIFY COLUMN `id` bigint(0) NOT NULL COMMENT '主键'; -ALTER TABLE `visualization_link_jump_info` - MODIFY COLUMN `copy_from` bigint(0) NULL DEFAULT NULL COMMENT '复制来源'; -ALTER TABLE `visualization_link_jump_info` - MODIFY COLUMN `copy_id` bigint(0) NULL DEFAULT NULL COMMENT '复制来源ID'; - -ALTER TABLE `visualization_link_jump_target_view_info` - MODIFY COLUMN `target_id` bigint(0) NOT NULL COMMENT '主键'; -ALTER TABLE `visualization_link_jump_target_view_info` - MODIFY COLUMN `link_jump_info_id` bigint(0) NULL DEFAULT NULL COMMENT 'visualization_link_jump_info 表的 ID'; -ALTER TABLE `visualization_link_jump_target_view_info` - MODIFY COLUMN `target_view_id` bigint(0) NULL DEFAULT NULL COMMENT '目标图表ID'; -ALTER TABLE `visualization_link_jump_target_view_info` - MODIFY COLUMN `target_field_id` bigint(0) NULL DEFAULT NULL COMMENT '目标字段ID'; -ALTER TABLE `visualization_link_jump_target_view_info` - MODIFY COLUMN `copy_from` bigint(0) NULL DEFAULT NULL COMMENT '复制来源'; -ALTER TABLE `visualization_link_jump_target_view_info` - MODIFY COLUMN `copy_id` bigint(0) NULL DEFAULT NULL COMMENT '复制来源ID'; - -ALTER TABLE `visualization_linkage` - MODIFY COLUMN `id` bigint(0) NOT NULL COMMENT '主键'; -ALTER TABLE `visualization_linkage` - MODIFY COLUMN `dv_id` bigint(0) NULL DEFAULT NULL COMMENT '联动大屏/仪表板ID'; -ALTER TABLE `visualization_linkage` - MODIFY COLUMN `ext1` varchar(2000) NULL DEFAULT NULL COMMENT '扩展字段1'; -ALTER TABLE `visualization_linkage` - MODIFY COLUMN `ext2` varchar(2000) NULL DEFAULT NULL COMMENT '扩展字段2'; -ALTER TABLE `visualization_linkage` - MODIFY COLUMN `copy_from` bigint(0) NULL DEFAULT NULL COMMENT '复制来源'; -ALTER TABLE `visualization_linkage` - MODIFY COLUMN `copy_id` bigint(0) NULL DEFAULT NULL COMMENT '复制来源ID'; - -ALTER TABLE `visualization_linkage_field` - MODIFY COLUMN `id` bigint(0) NOT NULL COMMENT '主键'; -ALTER TABLE `visualization_linkage_field` - MODIFY COLUMN `copy_from` bigint(0) NULL DEFAULT NULL COMMENT '复制来源'; -ALTER TABLE `visualization_linkage_field` - MODIFY COLUMN `copy_id` bigint(0) NULL DEFAULT NULL COMMENT '复制来源ID'; - -ALTER TABLE `visualization_subject` - MODIFY COLUMN `create_num` int(0) NOT NULL DEFAULT 0 COMMENT '创建序号'; - -ALTER TABLE `visualization_template_category` - MODIFY COLUMN `template_type` varchar(255) NULL DEFAULT NULL COMMENT '模版类型 system 系统内置 self 用户自建'; - -ALTER TABLE `visualization_template_extend_data` - MODIFY COLUMN `id` bigint(0) NOT NULL COMMENT '主键'; -ALTER TABLE `visualization_template_extend_data` - MODIFY COLUMN `dv_id` bigint(0) NULL DEFAULT NULL COMMENT '模板ID'; -ALTER TABLE `visualization_template_extend_data` - MODIFY COLUMN `view_id` bigint(0) NULL DEFAULT NULL COMMENT '图表ID'; -ALTER TABLE `visualization_template_extend_data` - MODIFY COLUMN `view_details` longtext NULL COMMENT '图表详情'; -ALTER TABLE `visualization_template_extend_data` - MODIFY COLUMN `copy_from` varchar(255) NULL DEFAULT NULL COMMENT '复制来源'; -ALTER TABLE `visualization_template_extend_data` - MODIFY COLUMN `copy_id` varchar(255) NULL DEFAULT NULL COMMENT '复制来源ID'; - -ALTER TABLE `core_opt_recent` - MODIFY COLUMN `resource_type` int(0) NOT NULL COMMENT '资源类型 1-可视化资源 2-仪表板 3-数据大屏 4-数据集 5-数据源 6-模板'; diff --git a/core/core-backend/src/main/resources/db/desktop/V2.3__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.3__ddl.sql deleted file mode 100644 index e9085cb..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.3__ddl.sql +++ /dev/null @@ -1,25 +0,0 @@ -DROP TABLE IF EXISTS `visualization_watermark`; -CREATE TABLE `visualization_watermark` -( - `id` varchar(50) NOT NULL COMMENT '主键', - `version` varchar(255) DEFAULT NULL COMMENT '版本号', - `setting_content` longtext COMMENT '设置内容', - `create_by` varchar(255) DEFAULT NULL COMMENT '创建人', - `create_time` bigint(13) DEFAULT NULL COMMENT '创建时间', - PRIMARY KEY (`id`) -) COMMENT ='仪表板水印设置表'; - -INSERT INTO `visualization_watermark` (`id`, `version`, `setting_content`, `create_by`, `create_time`) -VALUES ('system_default', '1.0', - '{"enable":false,"enablePanelCustom":true,"type":"custom","content":"水印","watermark_color":"#DD1010","watermark_x_space":12,"watermark_y_space":36,"watermark_fontsize":15}', - 'admin', NULL); - - -INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) -VALUES (9, 'basic.frontTimeOut', '60', 'text', 1); - -ALTER TABLE `visualization_template` - ADD COLUMN `use_count` int NULL DEFAULT 0 COMMENT '使用次数'; - -update visualization_template set use_count = 0; - diff --git a/core/core-backend/src/main/resources/db/desktop/V2.4__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.4__ddl.sql deleted file mode 100644 index e69de29..0000000 diff --git a/core/core-backend/src/main/resources/db/desktop/V2.5__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.5__ddl.sql deleted file mode 100644 index ee524d1..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.5__ddl.sql +++ /dev/null @@ -1,40 +0,0 @@ - -DROP TABLE IF EXISTS `visualization_outer_params`; -CREATE TABLE `visualization_outer_params` ( - `params_id` varchar(50) NOT NULL COMMENT '主键', - `visualization_id` varchar(50) DEFAULT NULL COMMENT '可视化资源ID', - `checked` tinyint(1) DEFAULT NULL COMMENT '是否启用外部参数标识(1-是,0-否)', - `remark` varchar(255) DEFAULT NULL COMMENT '备注', - `copy_from` varchar(50) DEFAULT NULL COMMENT '复制来源', - `copy_id` varchar(50) DEFAULT NULL COMMENT '复制来源ID', - PRIMARY KEY (`params_id`) -) COMMENT='外部参数关联关系表'; - - -DROP TABLE IF EXISTS `visualization_outer_params_info`; -CREATE TABLE `visualization_outer_params_info` ( - `params_info_id` varchar(50) NOT NULL COMMENT '主键', - `params_id` varchar(50) DEFAULT NULL COMMENT 'visualization_outer_params 表的 ID', - `param_name` varchar(255) DEFAULT NULL COMMENT '参数名', - `checked` tinyint(1) DEFAULT NULL COMMENT '是否启用', - `copy_from` varchar(255) DEFAULT NULL COMMENT '复制来源', - `copy_id` varchar(50) DEFAULT NULL COMMENT '复制来源ID', - PRIMARY KEY (`params_info_id`) -) COMMENT='外部参数配置表'; - - -DROP TABLE IF EXISTS `visualization_outer_params_target_view_info`; -CREATE TABLE `visualization_outer_params_target_view_info` ( - `target_id` varchar(50) NOT NULL COMMENT '主键', - `params_info_id` varchar(50) DEFAULT NULL COMMENT 'visualization_outer_params_info 表的 ID', - `target_view_id` varchar(50) DEFAULT NULL COMMENT '联动视图ID', - `target_field_id` varchar(50) DEFAULT NULL COMMENT '联动字段ID', - `copy_from` varchar(255) DEFAULT NULL COMMENT '复制来源', - `copy_id` varchar(50) DEFAULT NULL COMMENT '复制来源ID', - PRIMARY KEY (`target_id`) -) COMMENT='外部参数联动视图字段信息表'; - -ALTER TABLE `data_visualization_info` - MODIFY COLUMN `mobile_layout` tinyint NULL DEFAULT 0 COMMENT '移动端布局0-关闭 1-开启'; -update data_visualization_info set mobile_layout = 0; -INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) VALUES (3, 'ai.baseUrl', 'https://maxkb.fit2cloud.com/ui/chat/2ddd8b594ce09dbb', 'text', 0); diff --git a/core/core-backend/src/main/resources/db/desktop/V2.6__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.6__ddl.sql deleted file mode 100644 index d6d913e..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.6__ddl.sql +++ /dev/null @@ -1,7 +0,0 @@ -ALTER TABLE `data_visualization_info` - ADD COLUMN `version` int NULL DEFAULT 3 COMMENT '可视化资源版本'; -update data_visualization_info set version = 2; - -ALTER TABLE `visualization_template` - ADD COLUMN `version` int NULL DEFAULT 3 COMMENT '使用资源的版本'; -update visualization_template set version = 2; diff --git a/core/core-backend/src/main/resources/db/desktop/V2.7__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.7__ddl.sql deleted file mode 100644 index 6de7b51..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.7__ddl.sql +++ /dev/null @@ -1,36 +0,0 @@ -alter table `core_chart_view` - add aggregate bit null comment '区间条形图开启时间纬度开启聚合'; - -DROP TABLE IF EXISTS `core_sys_startup_job`; -CREATE TABLE `core_sys_startup_job` -( - `id` varchar(64) NOT NULL COMMENT 'ID', - `name` varchar(255) DEFAULT NULL COMMENT '任务名称', - `status` varchar(255) DEFAULT NULL COMMENT '任务状态', - PRIMARY KEY (`id`) -) COMMENT ='项目启动任务'; - -BEGIN; -INSERT INTO `core_sys_startup_job` VALUES ('chartFilterMerge', 'chartFilterMerge', 'ready'); -COMMIT; - - -DROP TABLE IF EXISTS `core_export_task`; -CREATE TABLE `core_export_task` -( - `id` VARCHAR(255) NOT NULL, - `user_id` BIGINT(20) NOT NULL, - `file_name` VARCHAR(2048) DEFAULT NULL, - `file_size` DOUBLE DEFAULT NULL, - `file_size_unit` VARCHAR(255) DEFAULT NULL, - `export_from` VARCHAR(255) DEFAULT NULL, - `export_status` VARCHAR(255) DEFAULT NULL, - `export_from_type` VARCHAR(255) DEFAULT NULL, - `export_time` BIGINT(20) DEFAULT NULL, - `export_progress` VARCHAR(255) DEFAULT NULL, - `export_machine_name` VARCHAR(512) DEFAULT NULL, - `params` longtext NOT NULL COMMENT '过滤参数', - PRIMARY KEY (`id`) -) COMMENT='导出任务表'; - -UPDATE `QRTZ_JOB_DETAILS` SET `JOB_CLASS_NAME` = 'io.dataease.job.schedule.CheckDsStatusJob' WHERE (`SCHED_NAME` = 'deSyncJob') and (`JOB_NAME` = 'Datasource') and (`JOB_GROUP` = 'check_status'); diff --git a/core/core-backend/src/main/resources/db/desktop/V2.8__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.8__ddl.sql deleted file mode 100644 index bd28ac2..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.8__ddl.sql +++ /dev/null @@ -1,48 +0,0 @@ -ALTER TABLE `core_export_task` - ADD COLUMN `msg` LONGTEXT NULL COMMENT '错误信息' AFTER `params`; - - -DROP TABLE IF EXISTS `xpack_plugin`; -CREATE TABLE `xpack_plugin` -( - `id` bigint NOT NULL COMMENT 'ID', - `name` varchar(255) NOT NULL COMMENT '插件名称', - `icon` longtext NOT NULL COMMENT '图标', - `version` varchar(255) NOT NULL COMMENT '版本', - `install_time` bigint NOT NULL COMMENT '安装时间', - `flag` varchar(255) NOT NULL COMMENT '类型', - `developer` varchar(255) NOT NULL COMMENT '开发者', - `config` longtext NOT NULL COMMENT '插件配置', - `require_version` varchar(255) NOT NULL COMMENT 'DE最低版本', - `module_name` varchar(255) NOT NULL COMMENT '模块名称', - `jar_name` varchar(255) NOT NULL COMMENT 'Jar包名称', - PRIMARY KEY (`id`) -) COMMENT ='插件表'; - - -DROP TABLE IF EXISTS `core_share_ticket`; -CREATE TABLE `core_share_ticket` -( - `id` bigint NOT NULL COMMENT 'ID', - `uuid` varchar(255) NOT NULL COMMENT '分享uuid', - `ticket` varchar(255) NOT NULL COMMENT 'ticket', - `exp` bigint DEFAULT NULL COMMENT 'ticket有效期', - `args` longtext COMMENT 'ticket参数', - `access_time` bigint DEFAULT NULL COMMENT '首次访问时间', - PRIMARY KEY (`id`) -) COMMENT ='分享Ticket表'; -DROP TABLE IF EXISTS `visualization_report_filter`; -CREATE TABLE `visualization_report_filter` ( - `id` bigint NOT NULL COMMENT 'id', - `report_id` bigint DEFAULT NULL COMMENT '定时报告id', - `task_id` bigint DEFAULT NULL COMMENT '任务id', - `resource_id` bigint DEFAULT NULL COMMENT '资源id', - `dv_type` varchar(255) DEFAULT NULL COMMENT '资源类型', - `component_id` bigint DEFAULT NULL COMMENT '组件id', - `filter_id` bigint DEFAULT NULL COMMENT '过滤项id', - `filter_info` longtext COMMENT '过滤组件内容', - `filter_version` int DEFAULT NULL COMMENT '过滤组件版本', - `create_time` bigint DEFAULT NULL COMMENT '创建时间', - `create_user` varchar(255) DEFAULT NULL COMMENT '创建人', - PRIMARY KEY (`id`) -); diff --git a/core/core-backend/src/main/resources/db/desktop/V2.9__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.9__ddl.sql deleted file mode 100644 index a321a19..0000000 --- a/core/core-backend/src/main/resources/db/desktop/V2.9__ddl.sql +++ /dev/null @@ -1,68 +0,0 @@ -DROP TABLE IF EXISTS `core_copilot_msg`; -CREATE TABLE `core_copilot_msg` ( - `id` bigint NOT NULL COMMENT 'ID', - `user_id` bigint DEFAULT NULL COMMENT '用户ID', - `dataset_group_id` bigint DEFAULT NULL COMMENT '数据集ID', - `msg_type` varchar(255) DEFAULT NULL COMMENT 'user or api', - `engine_type` varchar(255) DEFAULT NULL COMMENT 'mysql oracle ...', - `schema_sql` longtext COMMENT 'create sql', - `question` longtext COMMENT '用户提问', - `history` longtext COMMENT '历史信息', - `copilot_sql` longtext COMMENT 'copilot 返回 sql', - `api_msg` longtext COMMENT 'copilot 返回信息', - `sql_ok` int DEFAULT NULL COMMENT 'sql 状态', - `chart_ok` int DEFAULT NULL COMMENT 'chart 状态', - `chart` longtext COMMENT 'chart 内容', - `chart_data` longtext COMMENT '视图数据', - `exec_sql` longtext COMMENT '执行请求的SQL', - `msg_status` int DEFAULT NULL COMMENT 'msg状态,0失败 1成功', - `err_msg` longtext COMMENT 'de错误信息', - `create_time` bigint DEFAULT NULL COMMENT '创建时间', - PRIMARY KEY (`id`) -); - - -DROP TABLE IF EXISTS `core_copilot_token`; -CREATE TABLE `core_copilot_token` ( - `id` bigint NOT NULL COMMENT 'ID', - `type` varchar(255) DEFAULT NULL COMMENT 'free or license', - `token` longtext, - `update_time` bigint DEFAULT NULL, - PRIMARY KEY (`id`) -); - -INSERT INTO `core_copilot_token` VALUES (1, 'free', null, null); -INSERT INTO `core_copilot_token` VALUES (2, 'license', null, null); - - -DROP TABLE IF EXISTS `core_copilot_config`; -CREATE TABLE `core_copilot_config` ( - `id` bigint NOT NULL COMMENT 'ID', - `copilot_url` varchar(255) DEFAULT NULL, - `username` varchar(255) DEFAULT NULL, - `pwd` varchar(255) DEFAULT NULL, - PRIMARY KEY (`id`) -); - -INSERT INTO `core_copilot_config` VALUES (1, 'https://copilot.dataease.cn', 'xlab', 'Q2Fsb25nQDIwMTU='); - -UPDATE `core_sys_setting` SET `pkey` = 'ai.baseUrl', `pval` = 'https://maxkb.fit2cloud.com/ui/chat/2ddd8b594ce09dbb?mode=embed', `type` = 'text', `sort` = 0 WHERE `id` = 3; - -DROP TABLE IF EXISTS `core_api_traffic`; -CREATE TABLE `core_api_traffic` -( - `id` bigint NOT NULL COMMENT 'ID', - `api` varchar(255) NOT NULL COMMENT 'api', - `threshold` int NOT NULL DEFAULT '2' COMMENT '阈值', - `alive` int NOT NULL DEFAULT '0' COMMENT '活动并发', - PRIMARY KEY (`id`) -); - -ALTER TABLE `visualization_template` - MODIFY COLUMN `node_type` varchar(255) NULL DEFAULT NULL COMMENT '节点类型 app or template 应用 或者 模板'; -ALTER TABLE `visualization_template` - ADD COLUMN `app_data` longtext NULL COMMENT 'app数据' AFTER `dynamic_data`; - -INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) VALUES (10, 'basic.exportFileLiveTime', '30', 'text', 2); -delete from visualization_background where id ='dark_1'; - diff --git a/core/core-backend/src/main/resources/ehcache/ehcache.xml b/core/core-backend/src/main/resources/ehcache/ehcache.xml index e4226dd..c8d9714 100644 --- a/core/core-backend/src/main/resources/ehcache/ehcache.xml +++ b/core/core-backend/src/main/resources/ehcache/ehcache.xml @@ -8,7 +8,7 @@ - + @@ -23,7 +23,7 @@ java.lang.String - io.dataease.rsa.dao.entity.CoreRsa + io.gisbi.rsa.dao.entity.CoreRsa @@ -80,11 +80,11 @@ java.lang.String - io.dataease.license.bo.F2CLicResult + io.gisbi.license.bo.F2CLicResult java.lang.String - io.dataease.api.map.vo.AreaNode + io.gisbi.api.map.vo.AreaNode java.lang.String @@ -107,11 +107,11 @@ java.lang.String java.lang.Integer - ${dataease.login_timeout} + ${gisbi.login_timeout} - io.dataease.listener.MyCacheListener + io.gisbi.listener.MyCacheListener ASYNCHRONOUS ORDERED CREATED diff --git a/core/core-backend/src/main/resources/logback-spring.xml b/core/core-backend/src/main/resources/logback-spring.xml index 128e7f8..9a5af79 100644 --- a/core/core-backend/src/main/resources/logback-spring.xml +++ b/core/core-backend/src/main/resources/logback-spring.xml @@ -1,6 +1,6 @@ - + true diff --git a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml index 908a835..df88593 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml @@ -1,6 +1,6 @@ - + INSERT INTO `core_chart_view` (`id`, `title`, @@ -137,12 +137,12 @@ from data_visualization_info dvInfo where dvInfo.id = #{sourceDvId} - select id, copy_from from core_chart_view where copy_id = #{copyId} - SELECT `id`, `name`, `pid`, @@ -177,7 +177,7 @@ - SELECT dvResource.id, dvResource.resource_id, dvResource.name, @@ -390,14 +390,14 @@ ON visualization_linkage_field.linkage_id = pvlf_copy.s_id - + - + @@ -422,7 +422,7 @@ AND core_chart_view.id IS NOT NULL and core_chart_view.`type` != 'VQuery' - SELECT `id`, `report_id`, `resource_id`, `dv_type`, `component_id`, `filter_id`, `filter_info`, `filter_version`, `create_time`, `create_user` FROM @@ -451,7 +451,7 @@ - select id,account,name from per_user where id = #{id} diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml index e1be07a..734afff 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -11,7 +11,7 @@ - + @@ -27,22 +27,22 @@ - - - + ofType="io.gisbi.api.visualization.vo.VisualizationLinkJumpTargetViewInfoVO"> @@ -51,13 +51,13 @@ - + + ofType="io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO"> @@ -66,7 +66,7 @@ - + @@ -174,7 +174,7 @@ WHERE core_chart_view.id = #{viewId} - SELECT vopi.params_info_id as id, vopi.param_name as name, @@ -336,13 +336,13 @@ ON visualization_link_jump_target_view_info.link_jump_info_id = plji_copy.s_id - SELECT * FROM visualization_link_jump WHERE source_dv_id = #{dvId} - SELECT * FROM visualization_link_jump_info WHERE link_type = 'outer' diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkageMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkageMapper.xml index 8639441..ba180d2 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkageMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkageMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -10,24 +10,24 @@ - + - - + - + @@ -201,11 +201,11 @@ - select * from visualization_linkage where dv_id =#{dvId}; - SELECT * FROM diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml index bdbe373..33cded2 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -11,7 +11,7 @@ - + @@ -23,34 +23,34 @@ - - - - + - - - + + - + @@ -148,7 +148,7 @@ and popi.checked=1 - SELECT vopi.param_name, vopi.params_info_id @@ -172,11 +172,11 @@ AND LOCATE(ccv.id, dvi.component_data) - select cdtf.*,cdtf.id as attachId from core_dataset_table_field cdtf where cdtf.dataset_group_id = #{dataset_group_id} order by cdtf.de_type, cdtf.origin_name - SELECT DISTINCT ccv.id as chartId,ccv.title as chartName,ccv.type as chartType FROM diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationTemplateMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationTemplateMapper.xml index 16536f9..e55edb2 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationTemplateMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationTemplateMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -18,14 +18,14 @@ - - @@ -172,7 +172,7 @@ GROUP BY vtcm.template_id - SELECT core_chart_view.* FROM @@ -183,7 +183,7 @@ #{viewId} - SELECT DISTINCT core_dataset_group.* FROM @@ -194,7 +194,7 @@ #{dsId} - SELECT DISTINCT core_dataset_table.* FROM @@ -205,7 +205,7 @@ #{dsId} - SELECT DISTINCT core_dataset_table_field.* FROM @@ -216,7 +216,7 @@ #{dsId} - SELECT DISTINCT core_datasource.* FROM core_datasource inner join @@ -227,7 +227,7 @@ #{dsId} - SELECT core_datasource_task.* FROM @@ -241,7 +241,7 @@ - SELECT visualization_linkage.* FROM @@ -249,7 +249,7 @@ WHERE visualization_linkage.dv_id = #{dvId} - SELECT visualization_linkage_field.* FROM @@ -259,7 +259,7 @@ visualization_linkage.dv_id = #{dvId} - SELECT visualization_link_jump.* FROM @@ -268,7 +268,7 @@ visualization_link_jump.source_dv_id = #{dvId} - SELECT visualization_link_jump_info.* FROM @@ -277,7 +277,7 @@ WHERE visualization_link_jump.source_dv_id = #{dvId} - SELECT visualization_link_jump_target_view_info.* FROM diff --git a/core/core-frontend/flushbonading/index.js b/core/core-frontend/flushbonading/index.js index 7588bad..81259a4 100644 --- a/core/core-frontend/flushbonading/index.js +++ b/core/core-frontend/flushbonading/index.js @@ -1,6 +1,8 @@ import { WritableStream } from 'htmlparser2/lib/WritableStream' import fs from 'node:fs' -import pkg from '../package.json' assert { type: "json" }; +import { createRequire } from 'module'; +const require = createRequire(import.meta.url); +const pkg = require('../package.json'); const suffix = `${pkg.version}-${pkg.name}` const eleArr = [] @@ -57,7 +59,7 @@ htmlStream.pipe(parserStream).on('finish', () => { const eleArrStr = ${JSON.stringify(eleArr)} const eleArr = eleArrStr const preUrl = getPrefix() - + function produceTag(obj, name) { let element = document.createElement(name) Object.entries(obj).forEach(([key, value]) => { @@ -71,7 +73,7 @@ htmlStream.pipe(parserStream).on('finish', () => { element.setAttribute('crossorigin', '') head.appendChild(element) } - + eleArr.forEach((ele) => { produceTag(ele.attributes, ele.name) }) diff --git a/core/core-frontend/package.json b/core/core-frontend/package.json index 3ed8de0..c0a2b57 100644 --- a/core/core-frontend/package.json +++ b/core/core-frontend/package.json @@ -1,12 +1,12 @@ { - "name": "dataease", + "name": "gisbi", "private": true, "version": "0.0.0", "scripts": { "dev": "cross-env NODE_OPTIONS=--max_old_space_size=4096 vite --mode dev --host 0.0.0.0", "build:flush": "cd ./flushbonading && rimraf ./demo.html && npm i && node ./index.js", "ts:check": "vue-tsc --noEmit", - "build:base": "NODE_OPTIONS=--max_old_space_size=4096 vite build --mode base && npm run build:flush", + "build:base": "cross-env NODE_OPTIONS=--max_old_space_size=4096 vite build --mode base && npm run build:flush", "build:distributed": "NODE_OPTIONS=--max_old_space_size=5020 vite build --mode distributed && npm run build:flush", "build:lib": "vite build --mode lib", "lint": "eslint . --ext .vue,.js,.ts,.jsx,.tsx --fix", diff --git a/core/core-frontend/pom.xml b/core/core-frontend/pom.xml index d56196d..ea69c91 100644 --- a/core/core-frontend/pom.xml +++ b/core/core-frontend/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> core - io.dataease - ${dataease.version} + io.gisbi + 1.0.0 4.0.0 diff --git a/core/pom.xml b/core/pom.xml index 304f829..2248e4f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - dataease - io.dataease - ${dataease.version} + gisbi + io.gisbi + 1.0.0 4.0.0 diff --git a/pom.xml b/pom.xml index d20f11a..50ad3f3 100644 --- a/pom.xml +++ b/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.dataease - dataease - ${dataease.version} + io.gisbi + gisbi + 1.0.0 pom @@ -19,7 +19,6 @@ - 2.10.5 21 UTF-8 2023.0.1.0 diff --git a/sdk/api/api-base/pom.xml b/sdk/api/api-base/pom.xml index 5dbb3a0..5a1de63 100644 --- a/sdk/api/api-base/pom.xml +++ b/sdk/api/api-base/pom.xml @@ -4,9 +4,27 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> api - io.dataease - ${dataease.version} + io.gisbi + 1.0.0 + + + org.springframework + spring-web + + + io.gisbi + extensions-view + 1.0.0 + compile + + + io.gisbi + extensions-datafilling + 1.0.0 + compile + + 4.0.0 api-base diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumObj.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumObj.java deleted file mode 100644 index 7435366..0000000 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumObj.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.dataease.api.dataset.dto; - -import io.dataease.api.dataset.union.DatasetGroupInfoDTO; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import lombok.Data; - -/** - * @Author Junjun - */ -@Data -public class EnumObj { - private DatasetTableFieldDTO field; - private DatasetGroupInfoDTO dataset; -} diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/license/LicenseApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/license/LicenseApi.java deleted file mode 100644 index cd6402b..0000000 --- a/sdk/api/api-base/src/main/java/io/dataease/api/license/LicenseApi.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.dataease.api.license; - -import io.dataease.api.license.dto.LicenseRequest; -import io.dataease.license.bo.F2CLicResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -public interface LicenseApi { - - - @PostMapping("/update") - F2CLicResult update(@RequestBody LicenseRequest request); - - @PostMapping("/validate") - F2CLicResult validate(@RequestBody LicenseRequest request); - - @GetMapping("/version") - String version(); -} diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/request/TemplateMarketSearchRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/template/request/TemplateMarketSearchRequest.java deleted file mode 100644 index 73b8b35..0000000 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/request/TemplateMarketSearchRequest.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.dataease.api.template.request; - -import io.dataease.api.template.dto.TemplateMarketDTO; - -public class TemplateMarketSearchRequest extends TemplateMarketDTO { - -} diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsTargetViewInfoDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsTargetViewInfoDTO.java deleted file mode 100644 index a6c226f..0000000 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsTargetViewInfoDTO.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.dataease.api.visualization.dto; - -import io.dataease.api.visualization.vo.VisualizationOuterParamsTargetViewInfoVO; - - -public class VisualizationOuterParamsTargetViewInfoDTO extends VisualizationOuterParamsTargetViewInfoVO { - - -} diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ai/AiComponentApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/ai/AiComponentApi.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/ai/AiComponentApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/ai/AiComponentApi.java index 2bdd24f..b7d5de4 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ai/AiComponentApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/ai/AiComponentApi.java @@ -1,4 +1,4 @@ -package io.dataease.api.ai; +package io.gisbi.api.ai; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartDataApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/ChartDataApi.java similarity index 86% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartDataApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/chart/ChartDataApi.java index 6647985..46251e5 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartDataApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/ChartDataApi.java @@ -1,10 +1,10 @@ -package io.dataease.api.chart; +package io.gisbi.api.chart; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.chart.request.ChartExcelRequest; -import io.dataease.auth.DeApiPath; -import io.dataease.auth.DePermit; -import io.dataease.extensions.view.dto.ChartViewDTO; +import io.gisbi.api.chart.request.ChartExcelRequest; +import io.gisbi.auth.DeApiPath; +import io.gisbi.auth.DePermit; +import io.gisbi.extensions.view.dto.ChartViewDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; -import static io.dataease.constant.AuthResourceEnum.PANEL; +import static io.gisbi.constant.AuthResourceEnum.PANEL; /** * @Author Junjun diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartViewApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/ChartViewApi.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartViewApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/chart/ChartViewApi.java index df4d616..436402d 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartViewApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/ChartViewApi.java @@ -1,10 +1,10 @@ -package io.dataease.api.chart; +package io.gisbi.api.chart; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.chart.vo.ChartBaseVO; -import io.dataease.api.chart.vo.ViewSelectorVO; -import io.dataease.extensions.view.dto.ChartViewDTO; -import io.dataease.extensions.view.dto.ChartViewFieldDTO; +import io.gisbi.api.chart.vo.ChartBaseVO; +import io.gisbi.api.chart.vo.ViewSelectorVO; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import io.gisbi.extensions.view.dto.ChartViewFieldDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/DeSortField.java b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/DeSortField.java similarity index 54% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/DeSortField.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/DeSortField.java index 096556a..0d93f39 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/DeSortField.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/DeSortField.java @@ -1,6 +1,6 @@ -package io.dataease.api.chart.dto; +package io.gisbi.api.chart.dto; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; import lombok.Data; @Data diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/PageInfo.java b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/PageInfo.java similarity index 79% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/PageInfo.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/PageInfo.java index 42dd296..f904da1 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/PageInfo.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/PageInfo.java @@ -1,4 +1,4 @@ -package io.dataease.api.chart.dto; +package io.gisbi.api.chart.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/PermissionProxy.java b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/PermissionProxy.java similarity index 80% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/PermissionProxy.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/PermissionProxy.java index e42365a..e88a867 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/PermissionProxy.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/PermissionProxy.java @@ -1,4 +1,4 @@ -package io.dataease.api.chart.dto; +package io.gisbi.api.chart.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ScatterChartDataDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/ScatterChartDataDTO.java similarity index 61% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ScatterChartDataDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/ScatterChartDataDTO.java index d5fb514..6403f88 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ScatterChartDataDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/ScatterChartDataDTO.java @@ -1,7 +1,7 @@ -package io.dataease.api.chart.dto; +package io.gisbi.api.chart.dto; -import io.dataease.extensions.view.dto.ChartDimensionDTO; -import io.dataease.extensions.view.dto.ChartQuotaDTO; +import io.gisbi.extensions.view.dto.ChartDimensionDTO; +import io.gisbi.extensions.view.dto.ChartQuotaDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/Series.java b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/Series.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/Series.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/Series.java index 9091e66..1f84845 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/Series.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/Series.java @@ -1,4 +1,4 @@ -package io.dataease.api.chart.dto; +package io.gisbi.api.chart.dto; import lombok.Getter; import lombok.Setter; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ViewDetailField.java b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/ViewDetailField.java similarity index 85% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ViewDetailField.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/ViewDetailField.java index bcd22e9..cbcfa79 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ViewDetailField.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/dto/ViewDetailField.java @@ -1,4 +1,4 @@ -package io.dataease.api.chart.dto; +package io.gisbi.api.chart.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartExcelRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/request/ChartExcelRequest.java similarity index 86% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartExcelRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/chart/request/ChartExcelRequest.java index f09c759..37600d0 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartExcelRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/request/ChartExcelRequest.java @@ -1,6 +1,6 @@ -package io.dataease.api.chart.request; +package io.gisbi.api.chart.request; -import io.dataease.extensions.view.dto.ChartViewDTO; +import io.gisbi.extensions.view.dto.ChartViewDTO; import lombok.Data; import java.io.Serial; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartExcelRequestInner.java b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/request/ChartExcelRequestInner.java similarity index 83% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartExcelRequestInner.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/chart/request/ChartExcelRequestInner.java index 374f4e9..dc1ccec 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartExcelRequestInner.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/request/ChartExcelRequestInner.java @@ -1,6 +1,6 @@ -package io.dataease.api.chart.request; +package io.gisbi.api.chart.request; -import io.dataease.api.chart.dto.ViewDetailField; +import io.gisbi.api.chart.dto.ViewDetailField; import lombok.Data; import java.io.Serial; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ThresholdCheckRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/request/ThresholdCheckRequest.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ThresholdCheckRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/chart/request/ThresholdCheckRequest.java index cbc9a4f..83aeff8 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ThresholdCheckRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/request/ThresholdCheckRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.chart.request; +package io.gisbi.api.chart.request; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/vo/ChartBaseVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/vo/ChartBaseVO.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/vo/ChartBaseVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/chart/vo/ChartBaseVO.java index ac881be..232c73e 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/vo/ChartBaseVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/vo/ChartBaseVO.java @@ -1,9 +1,9 @@ -package io.dataease.api.chart.vo; +package io.gisbi.api.chart.vo; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.extensions.view.dto.ChartViewFieldDTO; +import io.gisbi.extensions.view.dto.ChartViewFieldDTO; import lombok.Data; import java.io.Serial; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/vo/ThresholdCheckVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/vo/ThresholdCheckVO.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/vo/ThresholdCheckVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/chart/vo/ThresholdCheckVO.java index 4ebe994..c598626 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/vo/ThresholdCheckVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/vo/ThresholdCheckVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.chart.vo; +package io.gisbi.api.chart.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/vo/ViewSelectorVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/vo/ViewSelectorVO.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/vo/ViewSelectorVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/chart/vo/ViewSelectorVO.java index 8bd6800..0e4c686 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/vo/ViewSelectorVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/chart/vo/ViewSelectorVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.chart.vo; +package io.gisbi.api.chart.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/commons/BaseRspModel.java b/sdk/api/api-base/src/main/java/io/gisbi/api/commons/BaseRspModel.java similarity index 86% rename from sdk/api/api-base/src/main/java/io/dataease/api/commons/BaseRspModel.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/commons/BaseRspModel.java index b0126b8..6c41f5a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/commons/BaseRspModel.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/commons/BaseRspModel.java @@ -1,4 +1,4 @@ -package io.dataease.api.commons; +package io.gisbi.api.commons; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/communicate/api/CommunicateApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/communicate/api/CommunicateApi.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/communicate/api/CommunicateApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/communicate/api/CommunicateApi.java index fb180b4..5330707 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/communicate/api/CommunicateApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/communicate/api/CommunicateApi.java @@ -1,6 +1,6 @@ -package io.dataease.api.communicate.api; +package io.gisbi.api.communicate.api; -import io.dataease.api.communicate.dto.MessageDTO; +import io.gisbi.api.communicate.dto.MessageDTO; import io.swagger.v3.oas.annotations.Hidden; import org.springframework.core.io.ByteArrayResource; import org.springframework.http.MediaType; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/communicate/dto/MessageDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/communicate/dto/MessageDTO.java similarity index 86% rename from sdk/api/api-base/src/main/java/io/dataease/api/communicate/dto/MessageDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/communicate/dto/MessageDTO.java index 346bec0..4ae066a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/communicate/dto/MessageDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/communicate/dto/MessageDTO.java @@ -1,6 +1,6 @@ -package io.dataease.api.communicate.dto; +package io.gisbi.api.communicate.dto; -import io.dataease.constant.MessageEnum; +import io.gisbi.constant.MessageEnum; import lombok.Data; import java.io.File; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/communicate/dto/MessageFile.java b/sdk/api/api-base/src/main/java/io/gisbi/api/communicate/dto/MessageFile.java similarity index 86% rename from sdk/api/api-base/src/main/java/io/dataease/api/communicate/dto/MessageFile.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/communicate/dto/MessageFile.java index 1e93515..119289d 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/communicate/dto/MessageFile.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/communicate/dto/MessageFile.java @@ -1,4 +1,4 @@ -package io.dataease.api.communicate.dto; +package io.gisbi.api.communicate.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/CopilotApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/CopilotApi.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/copilot/CopilotApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/copilot/CopilotApi.java index 7343708..3d5e699 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/CopilotApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/CopilotApi.java @@ -1,7 +1,7 @@ -package io.dataease.api.copilot; +package io.gisbi.api.copilot; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.copilot.dto.MsgDTO; +import io.gisbi.api.copilot.dto.MsgDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.PathVariable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/AxisDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/AxisDTO.java similarity index 78% rename from sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/AxisDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/AxisDTO.java index 5c1ae4e..de80bab 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/AxisDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/AxisDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.copilot.dto; +package io.gisbi.api.copilot.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/AxisFieldDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/AxisFieldDTO.java similarity index 78% rename from sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/AxisFieldDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/AxisFieldDTO.java index efbef98..3a5451c 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/AxisFieldDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/AxisFieldDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.copilot.dto; +package io.gisbi.api.copilot.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/ChartDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/ChartDTO.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/ChartDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/ChartDTO.java index 18e950e..9d89ac6 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/ChartDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/ChartDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.copilot.dto; +package io.gisbi.api.copilot.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/DEReceiveDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/DEReceiveDTO.java similarity index 82% rename from sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/DEReceiveDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/DEReceiveDTO.java index e19d8e2..b6e7aa0 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/DEReceiveDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/DEReceiveDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.copilot.dto; +package io.gisbi.api.copilot.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/DESendDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/DESendDTO.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/DESendDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/DESendDTO.java index aceb17a..d9ed2ba 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/DESendDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/DESendDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.copilot.dto; +package io.gisbi.api.copilot.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/HistoryDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/HistoryDTO.java similarity index 78% rename from sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/HistoryDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/HistoryDTO.java index ca8d00a..7973ab4 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/HistoryDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/HistoryDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.copilot.dto; +package io.gisbi.api.copilot.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/MsgDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/MsgDTO.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/MsgDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/MsgDTO.java index 58ae549..d2fff66 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/MsgDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/MsgDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.copilot.dto; +package io.gisbi.api.copilot.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/ReceiveDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/ReceiveDTO.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/ReceiveDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/ReceiveDTO.java index d234450..4c16b9a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/ReceiveDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/ReceiveDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.copilot.dto; +package io.gisbi.api.copilot.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/SendDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/SendDTO.java similarity index 85% rename from sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/SendDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/SendDTO.java index 2bb7c36..ad789f3 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/SendDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/SendDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.copilot.dto; +package io.gisbi.api.copilot.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/TokenDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/TokenDTO.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/TokenDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/TokenDTO.java index 93b52c6..ef1779f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/TokenDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/copilot/dto/TokenDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.copilot.dto; +package io.gisbi.api.copilot.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/DatasetDataApi.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/DatasetDataApi.java index 46a0a0e..24fbff2 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/DatasetDataApi.java @@ -1,10 +1,10 @@ -package io.dataease.api.dataset; +package io.gisbi.api.dataset; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.dataset.dto.*; -import io.dataease.api.dataset.union.DatasetGroupInfoDTO; -import io.dataease.extensions.datasource.dto.DatasetTableDTO; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.api.dataset.dto.*; +import io.gisbi.api.dataset.union.DatasetGroupInfoDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.PostMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/DatasetTableApi.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/DatasetTableApi.java index ff3e808..85fda2a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/DatasetTableApi.java @@ -1,9 +1,9 @@ -package io.dataease.api.dataset; +package io.gisbi.api.dataset; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.dataset.dto.MultFieldValuesRequest; -import io.dataease.api.dataset.engine.SQLFunctionDTO; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.api.dataset.dto.MultFieldValuesRequest; +import io.gisbi.api.dataset.engine.SQLFunctionDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableSqlLogApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/DatasetTableSqlLogApi.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableSqlLogApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/DatasetTableSqlLogApi.java index 34fca87..cde9691 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableSqlLogApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/DatasetTableSqlLogApi.java @@ -1,7 +1,7 @@ -package io.dataease.api.dataset; +package io.gisbi.api.dataset; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.dataset.dto.SqlLogDTO; +import io.gisbi.api.dataset.dto.SqlLogDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.PathVariable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTreeApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/DatasetTreeApi.java similarity index 84% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTreeApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/DatasetTreeApi.java index dd86474..0b58879 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTreeApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/DatasetTreeApi.java @@ -1,16 +1,16 @@ -package io.dataease.api.dataset; +package io.gisbi.api.dataset; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.dataset.dto.DataSetExportRequest; -import io.dataease.api.dataset.dto.DatasetNodeDTO; -import io.dataease.api.dataset.union.DatasetGroupInfoDTO; -import io.dataease.api.dataset.vo.DataSetBarVO; -import io.dataease.auth.DeApiPath; -import io.dataease.auth.DePermit; -import io.dataease.extensions.datasource.dto.DatasetTableDTO; -import io.dataease.extensions.view.dto.SqlVariableDetails; -import io.dataease.model.BusiNodeRequest; -import io.dataease.model.BusiNodeVO; +import io.gisbi.api.dataset.dto.DataSetExportRequest; +import io.gisbi.api.dataset.dto.DatasetNodeDTO; +import io.gisbi.api.dataset.union.DatasetGroupInfoDTO; +import io.gisbi.api.dataset.vo.DataSetBarVO; +import io.gisbi.auth.DeApiPath; +import io.gisbi.auth.DePermit; +import io.gisbi.extensions.datasource.dto.DatasetTableDTO; +import io.gisbi.extensions.view.dto.SqlVariableDetails; +import io.gisbi.model.BusiNodeRequest; +import io.gisbi.model.BusiNodeVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; -import static io.dataease.constant.AuthResourceEnum.DATASET; +import static io.gisbi.constant.AuthResourceEnum.DATASET; @Tag(name = "数据集管理:树") @ApiSupport(order = 979) diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/BaseTreeNodeDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/BaseTreeNodeDTO.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/BaseTreeNodeDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/BaseTreeNodeDTO.java index c6768e0..6bc3274 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/BaseTreeNodeDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/BaseTreeNodeDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.dataset.dto; +package io.gisbi.api.dataset.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/DataSetExportRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/DataSetExportRequest.java similarity index 82% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/DataSetExportRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/DataSetExportRequest.java index 96d5e17..ee124b3 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/DataSetExportRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/DataSetExportRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.dataset.dto; +package io.gisbi.api.dataset.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/DatasetNodeDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/DatasetNodeDTO.java similarity index 98% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/DatasetNodeDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/DatasetNodeDTO.java index b82c3db..db01abf 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/DatasetNodeDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/DatasetNodeDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.dataset.dto; +package io.gisbi.api.dataset.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/DeSortDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/DeSortDTO.java similarity index 86% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/DeSortDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/DeSortDTO.java index a8533aa..3fc1052 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/DeSortDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/DeSortDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.dataset.dto; +package io.gisbi.api.dataset.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/EnumObj.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/EnumObj.java new file mode 100644 index 0000000..b028d27 --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/EnumObj.java @@ -0,0 +1,14 @@ +package io.gisbi.api.dataset.dto; + +import io.gisbi.api.dataset.union.DatasetGroupInfoDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import lombok.Data; + +/** + * @Author Junjun + */ +@Data +public class EnumObj { + private DatasetTableFieldDTO field; + private DatasetGroupInfoDTO dataset; +} diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumValueRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/EnumValueRequest.java similarity index 85% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumValueRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/EnumValueRequest.java index bcb0984..ff3303f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumValueRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/EnumValueRequest.java @@ -1,6 +1,6 @@ -package io.dataease.api.dataset.dto; +package io.gisbi.api.dataset.dto; -import io.dataease.extensions.view.dto.ChartExtFilterDTO; +import io.gisbi.extensions.view.dto.ChartExtFilterDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/MultFieldValuesRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/MultFieldValuesRequest.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/MultFieldValuesRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/MultFieldValuesRequest.java index a7be04d..a704503 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/MultFieldValuesRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/MultFieldValuesRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.dataset.dto; +package io.gisbi.api.dataset.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/PreviewSqlDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/PreviewSqlDTO.java similarity index 84% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/PreviewSqlDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/PreviewSqlDTO.java index de2a5f7..cb80102 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/PreviewSqlDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/PreviewSqlDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.dataset.dto; +package io.gisbi.api.dataset.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/Sorted.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/Sorted.java similarity index 72% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/Sorted.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/Sorted.java index 95535cb..f24c1c4 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/Sorted.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/Sorted.java @@ -1,4 +1,4 @@ -package io.dataease.api.dataset.dto; +package io.gisbi.api.dataset.dto; /** * @Author Junjun diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/SqlLogDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/SqlLogDTO.java similarity index 93% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/SqlLogDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/SqlLogDTO.java index d62941c..6651949 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/SqlLogDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/dto/SqlLogDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.dataset.dto; +package io.gisbi.api.dataset.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/engine/SQLFunctionDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/engine/SQLFunctionDTO.java similarity index 84% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/engine/SQLFunctionDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/engine/SQLFunctionDTO.java index d99c4ff..dc6c432 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/engine/SQLFunctionDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/engine/SQLFunctionDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.dataset.engine; +package io.gisbi.api.dataset.engine; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/engine/SQLFunctionsEnum.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/engine/SQLFunctionsEnum.java similarity index 98% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/engine/SQLFunctionsEnum.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/engine/SQLFunctionsEnum.java index 02b369d..0613f9f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/engine/SQLFunctionsEnum.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/engine/SQLFunctionsEnum.java @@ -1,4 +1,4 @@ -package io.dataease.api.dataset.engine; +package io.gisbi.api.dataset.engine; /** * @Author Junjun diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/DatasetGroupInfoDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/union/DatasetGroupInfoDTO.java similarity index 71% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/DatasetGroupInfoDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/union/DatasetGroupInfoDTO.java index 81ea45d..3ff2d56 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/DatasetGroupInfoDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/union/DatasetGroupInfoDTO.java @@ -1,8 +1,8 @@ -package io.dataease.api.dataset.union; +package io.gisbi.api.dataset.union; -import io.dataease.api.chart.dto.DeSortField; -import io.dataease.api.dataset.dto.DatasetNodeDTO; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.api.chart.dto.DeSortField; +import io.gisbi.api.dataset.dto.DatasetNodeDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/DatasetTableInfoDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/union/DatasetTableInfoDTO.java similarity index 83% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/DatasetTableInfoDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/union/DatasetTableInfoDTO.java index 67388f7..4530326 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/DatasetTableInfoDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/union/DatasetTableInfoDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.dataset.union; +package io.gisbi.api.dataset.union; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/union/UnionDTO.java similarity index 70% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/union/UnionDTO.java index a13c027..57e641a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/union/UnionDTO.java @@ -1,7 +1,7 @@ -package io.dataease.api.dataset.union; +package io.gisbi.api.dataset.union; -import io.dataease.extensions.datasource.dto.DatasetTableDTO; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; import lombok.Data; import java.io.Serializable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionItemDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/union/UnionItemDTO.java similarity index 68% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionItemDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/union/UnionItemDTO.java index 856f324..c588a36 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionItemDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/union/UnionItemDTO.java @@ -1,6 +1,6 @@ -package io.dataease.api.dataset.union; +package io.gisbi.api.dataset.union; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; import lombok.Data; import java.io.Serializable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionParamDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/union/UnionParamDTO.java similarity index 70% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionParamDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/union/UnionParamDTO.java index 3f9266c..564bbc4 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionParamDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/union/UnionParamDTO.java @@ -1,7 +1,7 @@ -package io.dataease.api.dataset.union; +package io.gisbi.api.dataset.union; -import io.dataease.extensions.datasource.dto.DatasetTableDTO; -import io.dataease.extensions.datasource.model.SQLObj; +import io.gisbi.extensions.datasource.dto.DatasetTableDTO; +import io.gisbi.extensions.datasource.model.SQLObj; import lombok.Data; import java.io.Serializable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/vo/CoreDatasetGroupVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/vo/CoreDatasetGroupVO.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/vo/CoreDatasetGroupVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/vo/CoreDatasetGroupVO.java index f45f24f..0b889f2 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/vo/CoreDatasetGroupVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/vo/CoreDatasetGroupVO.java @@ -1,8 +1,8 @@ -package io.dataease.api.dataset.vo; +package io.gisbi.api.dataset.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.api.chart.vo.ChartBaseVO; +import io.gisbi.api.chart.vo.ChartBaseVO; import lombok.Data; import java.io.Serializable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/vo/CoreDatasetTableFieldVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/vo/CoreDatasetTableFieldVO.java similarity index 98% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/vo/CoreDatasetTableFieldVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/vo/CoreDatasetTableFieldVO.java index 3810db5..13266da 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/vo/CoreDatasetTableFieldVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/vo/CoreDatasetTableFieldVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.dataset.vo; +package io.gisbi.api.dataset.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/vo/DataSetBarVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/vo/DataSetBarVO.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/vo/DataSetBarVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/vo/DataSetBarVO.java index 458d61a..c2d4de9 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/vo/DataSetBarVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/vo/DataSetBarVO.java @@ -1,8 +1,8 @@ -package io.dataease.api.dataset.vo; +package io.gisbi.api.dataset.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.extensions.datasource.dto.DatasourceDTO; +import io.gisbi.extensions.datasource.dto.DatasourceDTO; import lombok.Data; import java.io.Serial; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/vo/DatasetTreeNodeVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/vo/DatasetTreeNodeVO.java similarity index 68% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/vo/DatasetTreeNodeVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dataset/vo/DatasetTreeNodeVO.java index 75d8a19..e99dcdd 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/vo/DatasetTreeNodeVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dataset/vo/DatasetTreeNodeVO.java @@ -1,7 +1,7 @@ -package io.dataease.api.dataset.vo; +package io.gisbi.api.dataset.vo; -import io.dataease.api.dataset.dto.DatasetNodeDTO; -import io.dataease.model.ITreeBase; +import io.gisbi.api.dataset.dto.DatasetNodeDTO; +import io.gisbi.model.ITreeBase; import lombok.Data; import java.io.Serializable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/api/DingtalkApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dingtalk/api/DingtalkApi.java similarity index 83% rename from sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/api/DingtalkApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dingtalk/api/DingtalkApi.java index f74058b..bcc1270 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/api/DingtalkApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dingtalk/api/DingtalkApi.java @@ -1,10 +1,10 @@ -package io.dataease.api.dingtalk.api; +package io.gisbi.api.dingtalk.api; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.dingtalk.dto.DingtalkEnableEditor; -import io.dataease.api.dingtalk.dto.DingtalkSettingCreator; -import io.dataease.api.dingtalk.dto.DingtalkTokenRequest; -import io.dataease.api.dingtalk.vo.DingtalkInfoVO; +import io.gisbi.api.dingtalk.dto.DingtalkEnableEditor; +import io.gisbi.api.dingtalk.dto.DingtalkSettingCreator; +import io.gisbi.api.dingtalk.dto.DingtalkTokenRequest; +import io.gisbi.api.dingtalk.vo.DingtalkInfoVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/dto/DingtalkEnableEditor.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dingtalk/dto/DingtalkEnableEditor.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/dto/DingtalkEnableEditor.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dingtalk/dto/DingtalkEnableEditor.java index efcc625..36af321 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/dto/DingtalkEnableEditor.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dingtalk/dto/DingtalkEnableEditor.java @@ -1,4 +1,4 @@ -package io.dataease.api.dingtalk.dto; +package io.gisbi.api.dingtalk.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/dto/DingtalkSettingCreator.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dingtalk/dto/DingtalkSettingCreator.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/dto/DingtalkSettingCreator.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dingtalk/dto/DingtalkSettingCreator.java index 09ee809..813c5b4 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/dto/DingtalkSettingCreator.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dingtalk/dto/DingtalkSettingCreator.java @@ -1,4 +1,4 @@ -package io.dataease.api.dingtalk.dto; +package io.gisbi.api.dingtalk.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/dto/DingtalkTokenRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dingtalk/dto/DingtalkTokenRequest.java similarity index 81% rename from sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/dto/DingtalkTokenRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dingtalk/dto/DingtalkTokenRequest.java index 2bae320..9da7eaa 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/dto/DingtalkTokenRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dingtalk/dto/DingtalkTokenRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.dingtalk.dto; +package io.gisbi.api.dingtalk.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/vo/DingtalkInfoVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/dingtalk/vo/DingtalkInfoVO.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/vo/DingtalkInfoVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/dingtalk/vo/DingtalkInfoVO.java index 428d4f7..58cbb4b 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/vo/DingtalkInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/dingtalk/vo/DingtalkInfoVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.dingtalk.vo; +package io.gisbi.api.dingtalk.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/DatasourceApi.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/ds/DatasourceApi.java index 4dc33f6..26e885a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/DatasourceApi.java @@ -1,18 +1,18 @@ -package io.dataease.api.ds; +package io.gisbi.api.ds; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.ds.vo.*; -import io.dataease.auth.DeApiPath; -import io.dataease.auth.DePermit; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.ApiDefinition; -import io.dataease.extensions.datasource.dto.DatasetTableDTO; -import io.dataease.extensions.datasource.dto.DatasourceDTO; -import io.dataease.extensions.datasource.dto.TableField; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; -import io.dataease.model.BusiNodeRequest; -import io.dataease.model.BusiNodeVO; +import io.gisbi.api.ds.vo.*; +import io.gisbi.auth.DeApiPath; +import io.gisbi.auth.DePermit; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.ApiDefinition; +import io.gisbi.extensions.datasource.dto.DatasetTableDTO; +import io.gisbi.extensions.datasource.dto.DatasourceDTO; +import io.gisbi.extensions.datasource.dto.TableField; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.model.BusiNodeRequest; +import io.gisbi.model.BusiNodeVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; @@ -21,7 +21,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; import java.util.Map; -import static io.dataease.constant.AuthResourceEnum.DATASOURCE; +import static io.gisbi.constant.AuthResourceEnum.DATASOURCE; @Tag(name = "数据源管理:基础") @ApiSupport(order = 969) diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceDriverApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/DatasourceDriverApi.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceDriverApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/ds/DatasourceDriverApi.java index 11e5431..ba1e076 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceDriverApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/DatasourceDriverApi.java @@ -1,10 +1,10 @@ -package io.dataease.api.ds; +package io.gisbi.api.ds; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.ds.vo.DriveDTO; -import io.dataease.api.ds.vo.DriveJarDTO; -import io.dataease.extensions.datasource.dto.DatasourceDTO; +import io.gisbi.api.ds.vo.DriveDTO; +import io.gisbi.api.ds.vo.DriveJarDTO; +import io.gisbi.extensions.datasource.dto.DatasourceDTO; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/EngineApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/EngineApi.java similarity index 79% rename from sdk/api/api-base/src/main/java/io/dataease/api/ds/EngineApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/ds/EngineApi.java index 762fbbd..00aef8c 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/EngineApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/EngineApi.java @@ -1,12 +1,12 @@ -package io.dataease.api.ds; +package io.gisbi.api.ds; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.auth.DeApiPath; -import io.dataease.extensions.datasource.dto.DatasourceDTO; +import io.gisbi.auth.DeApiPath; +import io.gisbi.extensions.datasource.dto.DatasourceDTO; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; -import static io.dataease.constant.AuthResourceEnum.DATASOURCE; +import static io.gisbi.constant.AuthResourceEnum.DATASOURCE; @Tag(name = "引擎管理:基础") @ApiSupport(order = 970) diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/BusiCreateFolderRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/BusiCreateFolderRequest.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/BusiCreateFolderRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/BusiCreateFolderRequest.java index e841ba3..633744a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/BusiCreateFolderRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/BusiCreateFolderRequest.java @@ -1,8 +1,8 @@ -package io.dataease.api.ds.vo; +package io.gisbi.api.ds.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.extensions.datasource.dto.TaskDTO; +import io.gisbi.extensions.datasource.dto.TaskDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/BusiDsRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/BusiDsRequest.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/BusiDsRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/BusiDsRequest.java index 77b6cae..d366c60 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/BusiDsRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/BusiDsRequest.java @@ -1,8 +1,8 @@ -package io.dataease.api.ds.vo; +package io.gisbi.api.ds.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.extensions.datasource.dto.TaskDTO; +import io.gisbi.extensions.datasource.dto.TaskDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/BusiRenameRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/BusiRenameRequest.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/BusiRenameRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/BusiRenameRequest.java index 9af92f2..6a36f94 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/BusiRenameRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/BusiRenameRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.ds.vo; +package io.gisbi.api.ds.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/CoreDatasourceTaskLogDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/CoreDatasourceTaskLogDTO.java similarity index 97% rename from sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/CoreDatasourceTaskLogDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/CoreDatasourceTaskLogDTO.java index 8cd782f..737ae0c 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/CoreDatasourceTaskLogDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/CoreDatasourceTaskLogDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.ds.vo; +package io.gisbi.api.ds.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/DriveDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/DriveDTO.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/DriveDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/DriveDTO.java index 9c1faf2..7a07c73 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/DriveDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/DriveDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.ds.vo; +package io.gisbi.api.ds.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/DriveJarDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/DriveJarDTO.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/DriveJarDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/DriveJarDTO.java index fda5802..ea78e0d 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/DriveJarDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/DriveJarDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.ds.vo; +package io.gisbi.api.ds.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/DsSimpleVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/DsSimpleVO.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/DsSimpleVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/DsSimpleVO.java index 76c855f..25100e0 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/DsSimpleVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/DsSimpleVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.ds.vo; +package io.gisbi.api.ds.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ExcelFileData.java b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/ExcelFileData.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ExcelFileData.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/ExcelFileData.java index 9f85920..adec3c8 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ExcelFileData.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/ExcelFileData.java @@ -1,4 +1,4 @@ -package io.dataease.api.ds.vo; +package io.gisbi.api.ds.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ExcelSheetData.java b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/ExcelSheetData.java similarity index 86% rename from sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ExcelSheetData.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/ExcelSheetData.java index 370b0e7..d28c55a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ExcelSheetData.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/ExcelSheetData.java @@ -1,6 +1,6 @@ -package io.dataease.api.ds.vo; +package io.gisbi.api.ds.vo; -import io.dataease.extensions.datasource.dto.TableField; +import io.gisbi.extensions.datasource.dto.TableField; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/TreeNodeVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/TreeNodeVO.java similarity index 93% rename from sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/TreeNodeVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/TreeNodeVO.java index ee401ce..f5fdf75 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/TreeNodeVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/ds/vo/TreeNodeVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.ds.vo; +package io.gisbi.api.ds.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/email/EmailApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/email/EmailApi.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/email/EmailApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/email/EmailApi.java index 13823f5..7fedf30 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/email/EmailApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/email/EmailApi.java @@ -1,7 +1,7 @@ -package io.dataease.api.email; +package io.gisbi.api.email; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.system.vo.SettingItemVO; +import io.gisbi.api.system.vo.SettingItemVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/export/BaseExportApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/export/BaseExportApi.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/export/BaseExportApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/export/BaseExportApi.java index c7fac5a..31ce5ff 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/export/BaseExportApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/export/BaseExportApi.java @@ -1,4 +1,4 @@ -package io.dataease.api.export; +package io.gisbi.api.export; import io.swagger.v3.oas.annotations.Hidden; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/exportCenter/ExportCenterApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/exportCenter/ExportCenterApi.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/exportCenter/ExportCenterApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/exportCenter/ExportCenterApi.java index bdf2ef1..1e6f7f2 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/exportCenter/ExportCenterApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/exportCenter/ExportCenterApi.java @@ -1,8 +1,8 @@ -package io.dataease.api.exportCenter; +package io.gisbi.api.exportCenter; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.model.ExportTaskDTO; -import io.dataease.auth.DeApiPath; +import io.gisbi.model.ExportTaskDTO; +import io.gisbi.auth.DeApiPath; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.bind.annotation.GetMapping; @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; -import static io.dataease.constant.AuthResourceEnum.DATASOURCE; +import static io.gisbi.constant.AuthResourceEnum.DATASOURCE; @Tag(name = "数据导出中心") @ApiSupport(order = 971) diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/font/api/FontApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/font/api/FontApi.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/font/api/FontApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/font/api/FontApi.java index c39cb3a..9dda320 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/font/api/FontApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/font/api/FontApi.java @@ -1,10 +1,9 @@ -package io.dataease.api.font.api; +package io.gisbi.api.font.api; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.ds.vo.ExcelFileData; -import io.dataease.api.font.dto.FontDto; -import io.dataease.exception.DEException; +import io.gisbi.api.font.dto.FontDto; +import io.gisbi.exception.DEException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/font/dto/FontDto.java b/sdk/api/api-base/src/main/java/io/gisbi/api/font/dto/FontDto.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/font/dto/FontDto.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/font/dto/FontDto.java index aa80e59..c1634f0 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/font/dto/FontDto.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/font/dto/FontDto.java @@ -1,4 +1,4 @@ -package io.dataease.api.font.dto; +package io.gisbi.api.font.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/free/FreeApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/free/FreeApi.java similarity index 82% rename from sdk/api/api-base/src/main/java/io/dataease/api/free/FreeApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/free/FreeApi.java index aba18ae..83be0da 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/free/FreeApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/free/FreeApi.java @@ -1,8 +1,8 @@ -package io.dataease.api.free; +package io.gisbi.api.free; -import io.dataease.api.free.dto.*; -import io.dataease.api.free.vo.FreeRelationVO; -import io.dataease.api.free.vo.FreeVO; +import io.gisbi.api.free.dto.*; +import io.gisbi.api.free.vo.FreeRelationVO; +import io.gisbi.api.free.vo.FreeVO; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeBatchDelRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeBatchDelRequest.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeBatchDelRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeBatchDelRequest.java index 4c9bb1f..a575b15 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeBatchDelRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeBatchDelRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.free.dto; +package io.gisbi.api.free.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeBatchSyncRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeBatchSyncRequest.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeBatchSyncRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeBatchSyncRequest.java index be33ecd..21d3f5f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeBatchSyncRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeBatchSyncRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.free.dto; +package io.gisbi.api.free.dto; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeQueryRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeQueryRequest.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeQueryRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeQueryRequest.java index 0db5a01..5af052e 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeQueryRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeQueryRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.free.dto; +package io.gisbi.api.free.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeRelationCategory.java b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeRelationCategory.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeRelationCategory.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeRelationCategory.java index f40da1f..ad3960c 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeRelationCategory.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeRelationCategory.java @@ -1,4 +1,4 @@ -package io.dataease.api.free.dto; +package io.gisbi.api.free.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeRelationLink.java b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeRelationLink.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeRelationLink.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeRelationLink.java index 3f91dbe..5e39651 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeRelationLink.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeRelationLink.java @@ -1,4 +1,4 @@ -package io.dataease.api.free.dto; +package io.gisbi.api.free.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeRelationNode.java b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeRelationNode.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeRelationNode.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeRelationNode.java index 2fb1787..8752d24 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeRelationNode.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeRelationNode.java @@ -1,4 +1,4 @@ -package io.dataease.api.free.dto; +package io.gisbi.api.free.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeRelationRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeRelationRequest.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeRelationRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeRelationRequest.java index ca976a5..afd4ddb 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeRelationRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeRelationRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.free.dto; +package io.gisbi.api.free.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeSyncRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeSyncRequest.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeSyncRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeSyncRequest.java index d9be72d..cd3c23e 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/free/dto/FreeSyncRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/free/dto/FreeSyncRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.free.dto; +package io.gisbi.api.free.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/free/vo/FreeRelationVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/free/vo/FreeRelationVO.java similarity index 73% rename from sdk/api/api-base/src/main/java/io/dataease/api/free/vo/FreeRelationVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/free/vo/FreeRelationVO.java index 4abfc88..16c0068 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/free/vo/FreeRelationVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/free/vo/FreeRelationVO.java @@ -1,8 +1,8 @@ -package io.dataease.api.free.vo; +package io.gisbi.api.free.vo; -import io.dataease.api.free.dto.FreeRelationCategory; -import io.dataease.api.free.dto.FreeRelationLink; -import io.dataease.api.free.dto.FreeRelationNode; +import io.gisbi.api.free.dto.FreeRelationCategory; +import io.gisbi.api.free.dto.FreeRelationLink; +import io.gisbi.api.free.dto.FreeRelationNode; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/free/vo/FreeVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/free/vo/FreeVO.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/free/vo/FreeVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/free/vo/FreeVO.java index 4f3edf9..4744b90 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/free/vo/FreeVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/free/vo/FreeVO.java @@ -1,8 +1,8 @@ -package io.dataease.api.free.vo; +package io.gisbi.api.free.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.model.TreeResultModel; +import io.gisbi.model.TreeResultModel; import lombok.Data; import java.io.Serial; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarkApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/api/LarkApi.java similarity index 83% rename from sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarkApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/lark/api/LarkApi.java index 1f1145f..3e1ea6f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarkApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/api/LarkApi.java @@ -1,11 +1,11 @@ -package io.dataease.api.lark.api; +package io.gisbi.api.lark.api; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.lark.dto.LarkEnableEditor; -import io.dataease.api.lark.dto.LarkTokenRequest; -import io.dataease.api.lark.vo.LarkGroupVO; -import io.dataease.api.lark.vo.LarkInfoVO; -import io.dataease.api.lark.dto.LarkSettingCreator; +import io.gisbi.api.lark.dto.LarkEnableEditor; +import io.gisbi.api.lark.dto.LarkTokenRequest; +import io.gisbi.api.lark.vo.LarkGroupVO; +import io.gisbi.api.lark.vo.LarkInfoVO; +import io.gisbi.api.lark.dto.LarkSettingCreator; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarksuiteApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/api/LarksuiteApi.java similarity index 84% rename from sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarksuiteApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/lark/api/LarksuiteApi.java index 72b7644..8291e18 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarksuiteApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/api/LarksuiteApi.java @@ -1,11 +1,11 @@ -package io.dataease.api.lark.api; +package io.gisbi.api.lark.api; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.lark.dto.LarkEnableEditor; -import io.dataease.api.lark.dto.LarkSettingCreator; -import io.dataease.api.lark.dto.LarkTokenRequest; -import io.dataease.api.lark.vo.LarkGroupVO; -import io.dataease.api.lark.vo.LarkInfoVO; +import io.gisbi.api.lark.dto.LarkEnableEditor; +import io.gisbi.api.lark.dto.LarkSettingCreator; +import io.gisbi.api.lark.dto.LarkTokenRequest; +import io.gisbi.api.lark.vo.LarkGroupVO; +import io.gisbi.api.lark.vo.LarkInfoVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkEnableEditor.java b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/dto/LarkEnableEditor.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkEnableEditor.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/lark/dto/LarkEnableEditor.java index 0a7445f..075a818 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkEnableEditor.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/dto/LarkEnableEditor.java @@ -1,4 +1,4 @@ -package io.dataease.api.lark.dto; +package io.gisbi.api.lark.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkGroupItem.java b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/dto/LarkGroupItem.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkGroupItem.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/lark/dto/LarkGroupItem.java index 6917cdb..f237bd3 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkGroupItem.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/dto/LarkGroupItem.java @@ -1,4 +1,4 @@ -package io.dataease.api.lark.dto; +package io.gisbi.api.lark.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkSettingCreator.java b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/dto/LarkSettingCreator.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkSettingCreator.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/lark/dto/LarkSettingCreator.java index b5a16de..8672fd1 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkSettingCreator.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/dto/LarkSettingCreator.java @@ -1,4 +1,4 @@ -package io.dataease.api.lark.dto; +package io.gisbi.api.lark.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkTokenRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/dto/LarkTokenRequest.java similarity index 83% rename from sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkTokenRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/lark/dto/LarkTokenRequest.java index cb7ac21..5548e92 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkTokenRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/dto/LarkTokenRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.lark.dto; +package io.gisbi.api.lark.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/vo/LarkGroupVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/vo/LarkGroupVO.java similarity index 79% rename from sdk/api/api-base/src/main/java/io/dataease/api/lark/vo/LarkGroupVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/lark/vo/LarkGroupVO.java index ead6a30..a872f58 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/lark/vo/LarkGroupVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/vo/LarkGroupVO.java @@ -1,6 +1,6 @@ -package io.dataease.api.lark.vo; +package io.gisbi.api.lark.vo; -import io.dataease.api.lark.dto.LarkGroupItem; +import io.gisbi.api.lark.dto.LarkGroupItem; import lombok.Data; import java.io.Serial; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/vo/LarkInfoVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/vo/LarkInfoVO.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/lark/vo/LarkInfoVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/lark/vo/LarkInfoVO.java index 91412b8..783d5db 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/lark/vo/LarkInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/lark/vo/LarkInfoVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.lark.vo; +package io.gisbi.api.lark.vo; diff --git a/sdk/api/api-base/src/main/java/io/gisbi/api/license/LicenseApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/license/LicenseApi.java new file mode 100644 index 0000000..fcc5e84 --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/license/LicenseApi.java @@ -0,0 +1,20 @@ +package io.gisbi.api.license; + +import io.gisbi.api.license.dto.LicenseRequest; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +public interface LicenseApi { + + +// @PostMapping("/update") +// F2CLicResult update(@RequestBody LicenseRequest request); +// +// @PostMapping("/validate") +// F2CLicResult validate(@RequestBody LicenseRequest request); + + @GetMapping("/version") + String version(); +} diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/license/dto/LicenseRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/license/dto/LicenseRequest.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/license/dto/LicenseRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/license/dto/LicenseRequest.java index 868c2e8..5cdd296 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/license/dto/LicenseRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/license/dto/LicenseRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.license.dto; +package io.gisbi.api.license.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/log/LogApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/log/LogApi.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/log/LogApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/log/LogApi.java index ee6e929..9645a89 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/log/LogApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/log/LogApi.java @@ -1,10 +1,10 @@ -package io.dataease.api.log; +package io.gisbi.api.log; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.log.dto.LogGridRequest; -import io.dataease.api.log.vo.LogGridVO; -import io.dataease.api.log.vo.LogOpVO; +import io.gisbi.api.log.dto.LogGridRequest; +import io.gisbi.api.log.vo.LogGridVO; +import io.gisbi.api.log.vo.LogOpVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/log/dto/LogGridRequest.java similarity index 85% rename from sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/log/dto/LogGridRequest.java index 4da8b51..8736109 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/log/dto/LogGridRequest.java @@ -1,6 +1,6 @@ -package io.dataease.api.log.dto; +package io.gisbi.api.log.dto; -import io.dataease.model.KeywordRequest; +import io.gisbi.model.KeywordRequest; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/log/vo/LogGridVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/log/vo/LogGridVO.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/log/vo/LogGridVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/log/vo/LogGridVO.java index 6ee1e5f..8aa5d0d 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/log/vo/LogGridVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/log/vo/LogGridVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.log.vo; +package io.gisbi.api.log.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/log/vo/LogOpVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/log/vo/LogOpVO.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/log/vo/LogOpVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/log/vo/LogOpVO.java index c688d28..ba1da6a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/log/vo/LogOpVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/log/vo/LogOpVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.log.vo; +package io.gisbi.api.log.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/map/CustomGeoApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/map/CustomGeoApi.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/map/CustomGeoApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/map/CustomGeoApi.java index 35d466f..4fc1002 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/map/CustomGeoApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/map/CustomGeoApi.java @@ -1,9 +1,9 @@ -package io.dataease.api.map; +package io.gisbi.api.map; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.map.vo.AreaNode; -import io.dataease.api.map.vo.CustomGeoArea; -import io.dataease.api.map.vo.CustomGeoSubArea; +import io.gisbi.api.map.vo.AreaNode; +import io.gisbi.api.map.vo.CustomGeoArea; +import io.gisbi.api.map.vo.CustomGeoSubArea; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/map/GeoApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/map/GeoApi.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/map/GeoApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/map/GeoApi.java index 3a1549b..8a81c64 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/map/GeoApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/map/GeoApi.java @@ -1,7 +1,7 @@ -package io.dataease.api.map; +package io.gisbi.api.map; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.map.dto.GeometryNodeCreator; +import io.gisbi.api.map.dto.GeometryNodeCreator; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.PathVariable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/map/MapApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/map/MapApi.java similarity index 83% rename from sdk/api/api-base/src/main/java/io/dataease/api/map/MapApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/map/MapApi.java index 97eed6e..395e8db 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/map/MapApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/map/MapApi.java @@ -1,13 +1,11 @@ -package io.dataease.api.map; +package io.gisbi.api.map; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.map.vo.AreaNode; +import io.gisbi.api.map.vo.AreaNode; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; -import java.util.List; - @Tag(name = "系统设置:地图区域") @ApiSupport(order = 797) public interface MapApi { diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/map/dto/GeometryNodeCreator.java b/sdk/api/api-base/src/main/java/io/gisbi/api/map/dto/GeometryNodeCreator.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/map/dto/GeometryNodeCreator.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/map/dto/GeometryNodeCreator.java index b0db945..7914826 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/map/dto/GeometryNodeCreator.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/map/dto/GeometryNodeCreator.java @@ -1,4 +1,4 @@ -package io.dataease.api.map.dto; +package io.gisbi.api.map.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/map/vo/AreaNode.java b/sdk/api/api-base/src/main/java/io/gisbi/api/map/vo/AreaNode.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/map/vo/AreaNode.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/map/vo/AreaNode.java index 2bf35ae..53c026d 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/map/vo/AreaNode.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/map/vo/AreaNode.java @@ -1,4 +1,4 @@ -package io.dataease.api.map.vo; +package io.gisbi.api.map.vo; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/map/vo/CustomGeoArea.java b/sdk/api/api-base/src/main/java/io/gisbi/api/map/vo/CustomGeoArea.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/map/vo/CustomGeoArea.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/map/vo/CustomGeoArea.java index 5914c13..d5bc9a1 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/map/vo/CustomGeoArea.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/map/vo/CustomGeoArea.java @@ -1,4 +1,4 @@ -package io.dataease.api.map.vo; +package io.gisbi.api.map.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/map/vo/CustomGeoSubArea.java b/sdk/api/api-base/src/main/java/io/gisbi/api/map/vo/CustomGeoSubArea.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/map/vo/CustomGeoSubArea.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/map/vo/CustomGeoSubArea.java index 5a938a7..006db20 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/map/vo/CustomGeoSubArea.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/map/vo/CustomGeoSubArea.java @@ -1,4 +1,4 @@ -package io.dataease.api.map.vo; +package io.gisbi.api.map.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/menu/MenuApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/menu/MenuApi.java similarity index 82% rename from sdk/api/api-base/src/main/java/io/dataease/api/menu/MenuApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/menu/MenuApi.java index ef3735b..51309e6 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/menu/MenuApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/menu/MenuApi.java @@ -1,6 +1,6 @@ -package io.dataease.api.menu; +package io.gisbi.api.menu; -import io.dataease.api.menu.vo.MenuVO; +import io.gisbi.api.menu.vo.MenuVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/menu/vo/MenuMeta.java b/sdk/api/api-base/src/main/java/io/gisbi/api/menu/vo/MenuMeta.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/menu/vo/MenuMeta.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/menu/vo/MenuMeta.java index 41b2c7e..29ff716 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/menu/vo/MenuMeta.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/menu/vo/MenuMeta.java @@ -1,4 +1,4 @@ -package io.dataease.api.menu.vo; +package io.gisbi.api.menu.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/menu/vo/MenuVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/menu/vo/MenuVO.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/menu/vo/MenuVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/menu/vo/MenuVO.java index c211b59..46a0e70 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/menu/vo/MenuVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/menu/vo/MenuVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.menu.vo; +package io.gisbi.api.menu.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/msgCenter/MsgCenterApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/msgCenter/MsgCenterApi.java similarity index 86% rename from sdk/api/api-base/src/main/java/io/dataease/api/msgCenter/MsgCenterApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/msgCenter/MsgCenterApi.java index fcdb2f4..d99f4ef 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/msgCenter/MsgCenterApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/msgCenter/MsgCenterApi.java @@ -1,4 +1,4 @@ -package io.dataease.api.msgCenter; +package io.gisbi.api.msgCenter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.PostMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/panel/PanelTreeAPi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/panel/PanelTreeAPi.java similarity index 78% rename from sdk/api/api-base/src/main/java/io/dataease/api/panel/PanelTreeAPi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/panel/PanelTreeAPi.java index 3a406dc..737b2aa 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/panel/PanelTreeAPi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/panel/PanelTreeAPi.java @@ -1,6 +1,6 @@ -package io.dataease.api.panel; +package io.gisbi.api.panel; -import io.dataease.api.panel.vo.PanelTreeNodeVO; +import io.gisbi.api.panel.vo.PanelTreeNodeVO; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/panel/vo/PanelTreeNodeVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/panel/vo/PanelTreeNodeVO.java similarity index 84% rename from sdk/api/api-base/src/main/java/io/dataease/api/panel/vo/PanelTreeNodeVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/panel/vo/PanelTreeNodeVO.java index 1b49375..e693f04 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/panel/vo/PanelTreeNodeVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/panel/vo/PanelTreeNodeVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.panel.vo; +package io.gisbi.api.panel.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/ReportApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/report/ReportApi.java similarity index 93% rename from sdk/api/api-base/src/main/java/io/dataease/api/report/ReportApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/report/ReportApi.java index 34959ad..0a66fbc 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/report/ReportApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/report/ReportApi.java @@ -1,11 +1,11 @@ -package io.dataease.api.report; +package io.gisbi.api.report; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.report.dto.*; -import io.dataease.api.report.vo.ReportGridVO; -import io.dataease.api.report.vo.ReportInfoVO; -import io.dataease.api.report.vo.ReportInstanceVO; +import io.gisbi.api.report.dto.*; +import io.gisbi.api.report.vo.ReportGridVO; +import io.gisbi.api.report.vo.ReportInfoVO; +import io.gisbi.api.report.vo.ReportInstanceVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportCreator.java b/sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportCreator.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportCreator.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportCreator.java index 740b662..38bd689 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportCreator.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportCreator.java @@ -1,8 +1,8 @@ -package io.dataease.api.report.dto; +package io.gisbi.api.report.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.api.visualization.vo.VisualizationReportFilterVO; +import io.gisbi.api.visualization.vo.VisualizationReportFilterVO; import lombok.Data; import java.io.Serial; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportEditor.java b/sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportEditor.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportEditor.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportEditor.java index 830f954..e15abc7 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportEditor.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportEditor.java @@ -1,4 +1,4 @@ -package io.dataease.api.report.dto; +package io.gisbi.api.report.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportExportRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportExportRequest.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportExportRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportExportRequest.java index ef6a4b7..951fa30 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportExportRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportExportRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.report.dto; +package io.gisbi.api.report.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportGridRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportGridRequest.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportGridRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportGridRequest.java index 4b0c2fa..ac009a9 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportGridRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportGridRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.report.dto; +package io.gisbi.api.report.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceDelRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportInstanceDelRequest.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceDelRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportInstanceDelRequest.java index 08e0800..d777106 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceDelRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportInstanceDelRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.report.dto; +package io.gisbi.api.report.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceMsgRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportInstanceMsgRequest.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceMsgRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportInstanceMsgRequest.java index c541552..756786e 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceMsgRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportInstanceMsgRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.report.dto; +package io.gisbi.api.report.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportInstanceRequest.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportInstanceRequest.java index df87b3d..1a078ac 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/report/dto/ReportInstanceRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.report.dto; +package io.gisbi.api.report.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportGridVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/report/vo/ReportGridVO.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportGridVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/report/vo/ReportGridVO.java index 7dcb97e..16e70e1 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportGridVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/report/vo/ReportGridVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.report.vo; +package io.gisbi.api.report.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportInfoVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/report/vo/ReportInfoVO.java similarity index 97% rename from sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportInfoVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/report/vo/ReportInfoVO.java index 4c9f159..ea1f7f2 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/report/vo/ReportInfoVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.report.vo; +package io.gisbi.api.report.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportInstanceVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/report/vo/ReportInstanceVO.java similarity index 93% rename from sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportInstanceVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/report/vo/ReportInstanceVO.java index dd85ada..4ab4d4a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportInstanceVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/report/vo/ReportInstanceVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.report.vo; +package io.gisbi.api.report.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/system/SysParameterApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/system/SysParameterApi.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/system/SysParameterApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/system/SysParameterApi.java index 34a9e43..d99ba7b 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/system/SysParameterApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/system/SysParameterApi.java @@ -1,9 +1,9 @@ -package io.dataease.api.system; +package io.gisbi.api.system; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.system.request.OnlineMapEditor; -import io.dataease.api.system.vo.SettingItemVO; -import io.dataease.api.system.vo.ShareBaseVO; +import io.gisbi.api.system.request.OnlineMapEditor; +import io.gisbi.api.system.vo.SettingItemVO; +import io.gisbi.api.system.vo.ShareBaseVO; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/system/SystemInfoApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/system/SystemInfoApi.java similarity index 73% rename from sdk/api/api-base/src/main/java/io/dataease/api/system/SystemInfoApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/system/SystemInfoApi.java index 8997c0f..1ba8a18 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/system/SystemInfoApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/system/SystemInfoApi.java @@ -1,4 +1,4 @@ -package io.dataease.api.system; +package io.gisbi.api.system; /** * @author : WangJiaHao diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/system/request/OnlineMapEditor.java b/sdk/api/api-base/src/main/java/io/gisbi/api/system/request/OnlineMapEditor.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/system/request/OnlineMapEditor.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/system/request/OnlineMapEditor.java index 233794a..a6be549 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/system/request/OnlineMapEditor.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/system/request/OnlineMapEditor.java @@ -1,4 +1,4 @@ -package io.dataease.api.system.request; +package io.gisbi.api.system.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/system/vo/SettingItemVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/system/vo/SettingItemVO.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/system/vo/SettingItemVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/system/vo/SettingItemVO.java index c907001..5f1086c 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/system/vo/SettingItemVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/system/vo/SettingItemVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.system.vo; +package io.gisbi.api.system.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/system/vo/ShareBaseVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/system/vo/ShareBaseVO.java similarity index 93% rename from sdk/api/api-base/src/main/java/io/dataease/api/system/vo/ShareBaseVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/system/vo/ShareBaseVO.java index db1be18..7116f62 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/system/vo/ShareBaseVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/system/vo/ShareBaseVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.system.vo; +package io.gisbi.api.system.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/TemplateManageApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/TemplateManageApi.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/TemplateManageApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/TemplateManageApi.java index d5b45f7..f49e679 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/TemplateManageApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/TemplateManageApi.java @@ -1,9 +1,9 @@ -package io.dataease.api.template; +package io.gisbi.api.template; -import io.dataease.api.template.dto.TemplateManageDTO; -import io.dataease.api.template.request.TemplateManageBatchRequest; -import io.dataease.api.template.request.TemplateManageRequest; -import io.dataease.api.template.vo.VisualizationTemplateVO; +import io.gisbi.api.template.dto.TemplateManageDTO; +import io.gisbi.api.template.request.TemplateManageBatchRequest; +import io.gisbi.api.template.request.TemplateManageRequest; +import io.gisbi.api.template.vo.VisualizationTemplateVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/TemplateMarketApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/TemplateMarketApi.java similarity index 80% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/TemplateMarketApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/TemplateMarketApi.java index 0b83010..f469fcf 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/TemplateMarketApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/TemplateMarketApi.java @@ -1,8 +1,8 @@ -package io.dataease.api.template; +package io.gisbi.api.template; -import io.dataease.api.template.response.MarketBaseResponse; -import io.dataease.api.template.response.MarketPreviewBaseResponse; -import io.dataease.api.template.vo.MarketMetaDataVO; +import io.gisbi.api.template.response.MarketBaseResponse; +import io.gisbi.api.template.response.MarketPreviewBaseResponse; +import io.gisbi.api.template.vo.MarketMetaDataVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/dto/TemplateManageDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/dto/TemplateManageDTO.java similarity index 80% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/dto/TemplateManageDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/dto/TemplateManageDTO.java index 809a23f..be17576 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/dto/TemplateManageDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/dto/TemplateManageDTO.java @@ -1,7 +1,7 @@ -package io.dataease.api.template.dto; +package io.gisbi.api.template.dto; -import io.dataease.api.template.vo.VisualizationTemplateVO; +import io.gisbi.api.template.vo.VisualizationTemplateVO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/dto/TemplateManageFileDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/dto/TemplateManageFileDTO.java similarity index 69% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/dto/TemplateManageFileDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/dto/TemplateManageFileDTO.java index 1b9c692..88231ea 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/dto/TemplateManageFileDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/dto/TemplateManageFileDTO.java @@ -1,11 +1,9 @@ -package io.dataease.api.template.dto; +package io.gisbi.api.template.dto; -import io.dataease.api.template.vo.VisualizationTemplateVO; +import io.gisbi.api.template.vo.VisualizationTemplateVO; import lombok.Data; -import java.util.List; - @Data public class TemplateManageFileDTO extends VisualizationTemplateVO { diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/dto/TemplateMarketDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/dto/TemplateMarketDTO.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/dto/TemplateMarketDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/dto/TemplateMarketDTO.java index 290dc1b..b873ae7 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/dto/TemplateMarketDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/dto/TemplateMarketDTO.java @@ -1,8 +1,8 @@ -package io.dataease.api.template.dto; +package io.gisbi.api.template.dto; -import io.dataease.api.template.vo.MarketCategoryVO; -import io.dataease.api.template.vo.MarketMetasVO; -import io.dataease.i18n.Translator; +import io.gisbi.api.template.vo.MarketCategoryVO; +import io.gisbi.api.template.vo.MarketMetasVO; +import io.gisbi.i18n.Translator; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/dto/TemplateMarketPreviewInfoDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/dto/TemplateMarketPreviewInfoDTO.java similarity index 84% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/dto/TemplateMarketPreviewInfoDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/dto/TemplateMarketPreviewInfoDTO.java index 29846e6..689d86d 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/dto/TemplateMarketPreviewInfoDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/dto/TemplateMarketPreviewInfoDTO.java @@ -1,6 +1,6 @@ -package io.dataease.api.template.dto; +package io.gisbi.api.template.dto; -import io.dataease.api.template.vo.MarketMetaDataVO; +import io.gisbi.api.template.vo.MarketMetaDataVO; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/dto/VisualizationTemplateExtendDataDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/dto/VisualizationTemplateExtendDataDTO.java similarity index 81% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/dto/VisualizationTemplateExtendDataDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/dto/VisualizationTemplateExtendDataDTO.java index 3a2c397..99159c1 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/dto/VisualizationTemplateExtendDataDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/dto/VisualizationTemplateExtendDataDTO.java @@ -1,9 +1,9 @@ -package io.dataease.api.template.dto; +package io.gisbi.api.template.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.api.template.vo.VisualizationTemplateExtendDataVO; -import io.dataease.utils.IDUtils; +import io.gisbi.api.template.vo.VisualizationTemplateExtendDataVO; +import io.gisbi.utils.IDUtils; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/request/TemplateManageBatchRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/request/TemplateManageBatchRequest.java similarity index 70% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/request/TemplateManageBatchRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/request/TemplateManageBatchRequest.java index 3383271..fe28d80 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/request/TemplateManageBatchRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/request/TemplateManageBatchRequest.java @@ -1,6 +1,5 @@ -package io.dataease.api.template.request; +package io.gisbi.api.template.request; -import io.dataease.api.template.vo.VisualizationTemplateVO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/request/TemplateManageRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/request/TemplateManageRequest.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/request/TemplateManageRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/request/TemplateManageRequest.java index 9040090..69fbf13 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/request/TemplateManageRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/request/TemplateManageRequest.java @@ -1,6 +1,6 @@ -package io.dataease.api.template.request; +package io.gisbi.api.template.request; -import io.dataease.api.template.vo.VisualizationTemplateVO; +import io.gisbi.api.template.vo.VisualizationTemplateVO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/gisbi/api/template/request/TemplateMarketSearchRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/request/TemplateMarketSearchRequest.java new file mode 100644 index 0000000..24c1305 --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/request/TemplateMarketSearchRequest.java @@ -0,0 +1,7 @@ +package io.gisbi.api.template.request; + +import io.gisbi.api.template.dto.TemplateMarketDTO; + +public class TemplateMarketSearchRequest extends TemplateMarketDTO { + +} diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketBaseResponse.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketBaseResponse.java similarity index 77% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketBaseResponse.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketBaseResponse.java index b52b85b..1921d24 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketBaseResponse.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketBaseResponse.java @@ -1,7 +1,7 @@ -package io.dataease.api.template.response; +package io.gisbi.api.template.response; -import io.dataease.api.template.dto.TemplateMarketDTO; -import io.dataease.api.template.vo.MarketMetaDataVO; +import io.gisbi.api.template.dto.TemplateMarketDTO; +import io.gisbi.api.template.vo.MarketMetaDataVO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketCategoryBaseResponse.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketCategoryBaseResponse.java similarity index 67% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketCategoryBaseResponse.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketCategoryBaseResponse.java index a96bec7..2a5a159 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketCategoryBaseResponse.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketCategoryBaseResponse.java @@ -1,6 +1,6 @@ -package io.dataease.api.template.response; +package io.gisbi.api.template.response; -import io.dataease.api.template.vo.TemplateCategoryVO; +import io.gisbi.api.template.vo.TemplateCategoryVO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketLatestRelease.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketLatestRelease.java similarity index 60% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketLatestRelease.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketLatestRelease.java index 06cf155..440d7a8 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketLatestRelease.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketLatestRelease.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.response; +package io.gisbi.api.template.response; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketMetaDataBaseResponse.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketMetaDataBaseResponse.java similarity index 75% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketMetaDataBaseResponse.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketMetaDataBaseResponse.java index 1ac5814..8940343 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketMetaDataBaseResponse.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketMetaDataBaseResponse.java @@ -1,6 +1,6 @@ -package io.dataease.api.template.response; +package io.gisbi.api.template.response; -import io.dataease.api.template.vo.MarketMetaDataVO; +import io.gisbi.api.template.vo.MarketMetaDataVO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketPreviewBaseResponse.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketPreviewBaseResponse.java similarity index 72% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketPreviewBaseResponse.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketPreviewBaseResponse.java index f4ce520..d124f16 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketPreviewBaseResponse.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketPreviewBaseResponse.java @@ -1,8 +1,6 @@ -package io.dataease.api.template.response; +package io.gisbi.api.template.response; -import io.dataease.api.template.dto.TemplateMarketDTO; -import io.dataease.api.template.dto.TemplateMarketPreviewInfoDTO; -import io.dataease.api.template.vo.MarketMetaDataVO; +import io.gisbi.api.template.dto.TemplateMarketPreviewInfoDTO; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketTemplateBaseResponse.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketTemplateBaseResponse.java similarity index 59% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketTemplateBaseResponse.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketTemplateBaseResponse.java index 79ffc7f..a92a19d 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketTemplateBaseResponse.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketTemplateBaseResponse.java @@ -1,10 +1,7 @@ -package io.dataease.api.template.response; +package io.gisbi.api.template.response; -import io.dataease.api.template.dto.TemplateMarketDTO; import lombok.Data; -import java.util.List; - /** * @author : WangJiaHao * @date : 2023/11/17 13:41 diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketTemplateInnerResult.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketTemplateInnerResult.java similarity index 67% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketTemplateInnerResult.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketTemplateInnerResult.java index 6012a89..ad7cd03 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketTemplateInnerResult.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketTemplateInnerResult.java @@ -1,6 +1,6 @@ -package io.dataease.api.template.response; +package io.gisbi.api.template.response; -import io.dataease.api.template.dto.TemplateMarketDTO; +import io.gisbi.api.template.dto.TemplateMarketDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketTemplateV2BaseResponse.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketTemplateV2BaseResponse.java similarity index 83% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketTemplateV2BaseResponse.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketTemplateV2BaseResponse.java index 24cde5b..ebb5116 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketTemplateV2BaseResponse.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketTemplateV2BaseResponse.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.response; +package io.gisbi.api.template.response; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketTemplateV2ItemResult.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketTemplateV2ItemResult.java similarity index 59% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketTemplateV2ItemResult.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketTemplateV2ItemResult.java index a169da7..d0704fd 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/response/MarketTemplateV2ItemResult.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/response/MarketTemplateV2ItemResult.java @@ -1,7 +1,7 @@ -package io.dataease.api.template.response; +package io.gisbi.api.template.response; -import io.dataease.api.template.vo.MarketApplicationVO; -import io.dataease.api.template.vo.MarketLatestReleaseVO; +import io.gisbi.api.template.vo.MarketApplicationVO; +import io.gisbi.api.template.vo.MarketLatestReleaseVO; import lombok.Data; /** diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationMetaDataVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketApplicationMetaDataVO.java similarity index 72% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationMetaDataVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketApplicationMetaDataVO.java index fb97f2b..509583a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationMetaDataVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketApplicationMetaDataVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationSpecLinkVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketApplicationSpecLinkVO.java similarity index 83% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationSpecLinkVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketApplicationSpecLinkVO.java index fbaf7ff..cb7e054 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationSpecLinkVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketApplicationSpecLinkVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationSpecScreenshotBaseVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketApplicationSpecScreenshotBaseVO.java similarity index 82% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationSpecScreenshotBaseVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketApplicationSpecScreenshotBaseVO.java index 33c808c..a333bbb 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationSpecScreenshotBaseVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketApplicationSpecScreenshotBaseVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationSpecVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketApplicationSpecVO.java similarity index 93% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationSpecVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketApplicationSpecVO.java index ea40703..49d561a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationSpecVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketApplicationSpecVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketApplicationVO.java similarity index 85% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketApplicationVO.java index fbeddc1..00d5559 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketApplicationVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketCategoryVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketCategoryVO.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketCategoryVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketCategoryVO.java index 6552cec..924f369 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketCategoryVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketCategoryVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketLatestReleaseVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketLatestReleaseVO.java similarity index 82% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketLatestReleaseVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketLatestReleaseVO.java index 8c3fe5e..c471d56 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketLatestReleaseVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketLatestReleaseVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketMetaDataVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketMetaDataVO.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketMetaDataVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketMetaDataVO.java index 33aebc8..53d9983 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketMetaDataVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketMetaDataVO.java @@ -1,6 +1,6 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; -import io.dataease.constant.CommonConstants; +import io.gisbi.constant.CommonConstants; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketMetasVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketMetasVO.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketMetasVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketMetasVO.java index 1a9f86e..db9d94a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketMetasVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketMetasVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketReleaseAssetVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketReleaseAssetVO.java similarity index 75% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketReleaseAssetVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketReleaseAssetVO.java index 678f0c2..729e31a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketReleaseAssetVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketReleaseAssetVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketReleaseMetaDataVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketReleaseMetaDataVO.java similarity index 71% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketReleaseMetaDataVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketReleaseMetaDataVO.java index 07f4977..02b69bd 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketReleaseMetaDataVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketReleaseMetaDataVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketReleaseVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketReleaseVO.java similarity index 74% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketReleaseVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketReleaseVO.java index dde660f..45aca3c 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketReleaseVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/MarketReleaseVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/TemplateCategoryVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/TemplateCategoryVO.java similarity index 86% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/TemplateCategoryVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/TemplateCategoryVO.java index 989c6bd..5eb0c48 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/TemplateCategoryVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/TemplateCategoryVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/VisualizationTemplateCategoryVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/VisualizationTemplateCategoryVO.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/VisualizationTemplateCategoryVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/VisualizationTemplateCategoryVO.java index 8d191f6..ffaa2cf 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/VisualizationTemplateCategoryVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/VisualizationTemplateCategoryVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/VisualizationTemplateExtendDataVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/VisualizationTemplateExtendDataVO.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/VisualizationTemplateExtendDataVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/VisualizationTemplateExtendDataVO.java index fcf1cf5..9e18cd6 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/VisualizationTemplateExtendDataVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/VisualizationTemplateExtendDataVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/VisualizationTemplateVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/VisualizationTemplateVO.java similarity index 97% rename from sdk/api/api-base/src/main/java/io/dataease/api/template/vo/VisualizationTemplateVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/VisualizationTemplateVO.java index 21ec4d2..e838dda 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/VisualizationTemplateVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/template/vo/VisualizationTemplateVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.template.vo; +package io.gisbi.api.template.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/ThresholdApi.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/threshold/ThresholdApi.java index 5799934..2252ad6 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/ThresholdApi.java @@ -1,10 +1,10 @@ -package io.dataease.api.threshold; +package io.gisbi.api.threshold; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.threshold.dto.*; -import io.dataease.api.threshold.vo.ThresholdGridVO; -import io.dataease.api.threshold.vo.ThresholdInstanceVO; +import io.gisbi.api.threshold.dto.*; +import io.gisbi.api.threshold.vo.ThresholdGridVO; +import io.gisbi.api.threshold.vo.ThresholdInstanceVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/BaseReciDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/BaseReciDTO.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/BaseReciDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/BaseReciDTO.java index 0a0d423..e0f147f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/BaseReciDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/BaseReciDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.threshold.dto; +package io.gisbi.api.threshold.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdBatchReciRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdBatchReciRequest.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdBatchReciRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdBatchReciRequest.java index 6831351..55251cc 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdBatchReciRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdBatchReciRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.threshold.dto; +package io.gisbi.api.threshold.dto; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdCreator.java b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdCreator.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdCreator.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdCreator.java index b676cbb..7092858 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdCreator.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdCreator.java @@ -1,4 +1,4 @@ -package io.dataease.api.threshold.dto; +package io.gisbi.api.threshold.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdGridRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdGridRequest.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdGridRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdGridRequest.java index baaae96..5180101 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdGridRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdGridRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.threshold.dto; +package io.gisbi.api.threshold.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdInstanceRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdInstanceRequest.java similarity index 81% rename from sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdInstanceRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdInstanceRequest.java index 488ec77..7608cdf 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdInstanceRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdInstanceRequest.java @@ -1,6 +1,6 @@ -package io.dataease.api.threshold.dto; +package io.gisbi.api.threshold.dto; -import io.dataease.model.KeywordRequest; +import io.gisbi.model.KeywordRequest; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdPreviewRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdPreviewRequest.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdPreviewRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdPreviewRequest.java index 19a0c8d..cb4cdfe 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdPreviewRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdPreviewRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.threshold.dto; +package io.gisbi.api.threshold.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdSwitchRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdSwitchRequest.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdSwitchRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdSwitchRequest.java index b99e2a7..4c4e991 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdSwitchRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/dto/ThresholdSwitchRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.threshold.dto; +package io.gisbi.api.threshold.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/vo/ThresholdGridVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/vo/ThresholdGridVO.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/threshold/vo/ThresholdGridVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/threshold/vo/ThresholdGridVO.java index 9305977..19c2b44 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/vo/ThresholdGridVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/vo/ThresholdGridVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.threshold.vo; +package io.gisbi.api.threshold.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/vo/ThresholdInstanceVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/vo/ThresholdInstanceVO.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/threshold/vo/ThresholdInstanceVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/threshold/vo/ThresholdInstanceVO.java index 8c9b647..6d131c3 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/vo/ThresholdInstanceVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/threshold/vo/ThresholdInstanceVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.threshold.vo; +package io.gisbi.api.threshold.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/DataVisualizationApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/DataVisualizationApi.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/DataVisualizationApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/DataVisualizationApi.java index dcb425f..a03a290 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/DataVisualizationApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/DataVisualizationApi.java @@ -1,19 +1,19 @@ -package io.dataease.api.visualization; +package io.gisbi.api.visualization; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.visualization.dto.VisualizationViewTableDTO; -import io.dataease.api.visualization.request.DataVisualizationBaseRequest; -import io.dataease.api.visualization.request.VisualizationAppExportRequest; -import io.dataease.api.visualization.request.VisualizationWorkbranchQueryRequest; -import io.dataease.api.visualization.vo.DataVisualizationVO; -import io.dataease.api.visualization.vo.VisualizationExport2AppVO; -import io.dataease.api.visualization.vo.VisualizationResourceVO; -import io.dataease.auth.DeApiPath; -import io.dataease.auth.DePermit; -import io.dataease.model.BusiNodeRequest; -import io.dataease.model.BusiNodeVO; +import io.gisbi.api.visualization.dto.VisualizationViewTableDTO; +import io.gisbi.api.visualization.request.DataVisualizationBaseRequest; +import io.gisbi.api.visualization.request.VisualizationAppExportRequest; +import io.gisbi.api.visualization.request.VisualizationWorkbranchQueryRequest; +import io.gisbi.api.visualization.vo.DataVisualizationVO; +import io.gisbi.api.visualization.vo.VisualizationExport2AppVO; +import io.gisbi.api.visualization.vo.VisualizationResourceVO; +import io.gisbi.auth.DeApiPath; +import io.gisbi.auth.DePermit; +import io.gisbi.model.BusiNodeRequest; +import io.gisbi.model.BusiNodeVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; @@ -22,7 +22,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; import java.util.Map; -import static io.dataease.constant.AuthResourceEnum.PANEL; +import static io.gisbi.constant.AuthResourceEnum.PANEL; @Tag(name = "可视化管理:基础") @ApiSupport(order = 999) diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/StaticResourceApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/StaticResourceApi.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/StaticResourceApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/StaticResourceApi.java index 74941d1..e07e7eb 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/StaticResourceApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/StaticResourceApi.java @@ -1,7 +1,7 @@ -package io.dataease.api.visualization; +package io.gisbi.api.visualization; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.visualization.request.StaticResourceRequest; +import io.gisbi.api.visualization.request.StaticResourceRequest; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationBackgroundApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationBackgroundApi.java similarity index 73% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationBackgroundApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationBackgroundApi.java index aaa2599..ef446e4 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationBackgroundApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationBackgroundApi.java @@ -1,9 +1,8 @@ -package io.dataease.api.visualization; +package io.gisbi.api.visualization; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.visualization.request.VisualizationBackgroundRequest; -import io.dataease.api.visualization.vo.VisualizationBackgroundVO; -import io.dataease.i18n.I18n; +import io.gisbi.api.visualization.vo.VisualizationBackgroundVO; +import io.gisbi.i18n.I18n; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationLinkJumpApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationLinkJumpApi.java similarity index 84% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationLinkJumpApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationLinkJumpApi.java index 0cdb0d5..bab88b4 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationLinkJumpApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationLinkJumpApi.java @@ -1,11 +1,11 @@ -package io.dataease.api.visualization; +package io.gisbi.api.visualization; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.visualization.dto.VisualizationComponentDTO; -import io.dataease.api.visualization.dto.VisualizationLinkJumpDTO; -import io.dataease.api.visualization.request.VisualizationLinkJumpBaseRequest; -import io.dataease.api.visualization.response.VisualizationLinkJumpBaseResponse; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.api.visualization.dto.VisualizationComponentDTO; +import io.gisbi.api.visualization.dto.VisualizationLinkJumpDTO; +import io.gisbi.api.visualization.request.VisualizationLinkJumpBaseRequest; +import io.gisbi.api.visualization.response.VisualizationLinkJumpBaseResponse; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationLinkageApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationLinkageApi.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationLinkageApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationLinkageApi.java index e3c2319..7c9f0a9 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationLinkageApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationLinkageApi.java @@ -1,8 +1,8 @@ -package io.dataease.api.visualization; +package io.gisbi.api.visualization; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.commons.BaseRspModel; -import io.dataease.api.visualization.request.VisualizationLinkageRequest; +import io.gisbi.api.commons.BaseRspModel; +import io.gisbi.api.visualization.request.VisualizationLinkageRequest; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationOuterParamsApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationOuterParamsApi.java similarity index 77% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationOuterParamsApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationOuterParamsApi.java index f16ea4e..f308d62 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationOuterParamsApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationOuterParamsApi.java @@ -1,8 +1,8 @@ -package io.dataease.api.visualization; +package io.gisbi.api.visualization; -import io.dataease.api.dataset.vo.CoreDatasetGroupVO; -import io.dataease.api.visualization.dto.VisualizationOuterParamsDTO; -import io.dataease.api.visualization.response.VisualizationOuterParamsBaseResponse; +import io.gisbi.api.dataset.vo.CoreDatasetGroupVO; +import io.gisbi.api.visualization.dto.VisualizationOuterParamsDTO; +import io.gisbi.api.visualization.response.VisualizationOuterParamsBaseResponse; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationStoreApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationStoreApi.java similarity index 79% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationStoreApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationStoreApi.java index 62cea98..9bd4788 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationStoreApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationStoreApi.java @@ -1,9 +1,9 @@ -package io.dataease.api.visualization; +package io.gisbi.api.visualization; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.visualization.request.VisualizationStoreRequest; -import io.dataease.api.visualization.request.VisualizationWorkbranchQueryRequest; -import io.dataease.api.visualization.vo.VisualizationStoreVO; +import io.gisbi.api.visualization.request.VisualizationStoreRequest; +import io.gisbi.api.visualization.request.VisualizationWorkbranchQueryRequest; +import io.gisbi.api.visualization.vo.VisualizationStoreVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationSubjectApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationSubjectApi.java similarity index 85% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationSubjectApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationSubjectApi.java index a731177..11a9167 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationSubjectApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationSubjectApi.java @@ -1,8 +1,8 @@ -package io.dataease.api.visualization; +package io.gisbi.api.visualization; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.visualization.request.VisualizationSubjectRequest; -import io.dataease.api.visualization.vo.VisualizationSubjectVO; +import io.gisbi.api.visualization.request.VisualizationSubjectRequest; +import io.gisbi.api.visualization.vo.VisualizationSubjectVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.PathVariable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationWatermarkApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationWatermarkApi.java similarity index 61% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationWatermarkApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationWatermarkApi.java index 8714d40..c463275 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationWatermarkApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/VisualizationWatermarkApi.java @@ -1,16 +1,12 @@ -package io.dataease.api.visualization; +package io.gisbi.api.visualization; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.visualization.request.VisualizationSubjectRequest; -import io.dataease.api.visualization.request.VisualizationWatermarkRequest; -import io.dataease.api.visualization.vo.VisualizationSubjectVO; -import io.dataease.api.visualization.vo.VisualizationWatermarkVO; +import io.gisbi.api.visualization.request.VisualizationWatermarkRequest; +import io.gisbi.api.visualization.vo.VisualizationWatermarkVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; -import java.util.List; - @Tag(name = "可视化管理:水印") @ApiSupport(order = 994) public interface VisualizationWatermarkApi { diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/LinkageInfoDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/LinkageInfoDTO.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/LinkageInfoDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/LinkageInfoDTO.java index 5c75c1f..1536fb1 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/LinkageInfoDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/LinkageInfoDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.dto; +package io.gisbi.api.visualization.dto; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationComponentDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationComponentDTO.java similarity index 70% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationComponentDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationComponentDTO.java index 14fcfd3..4e935f3 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationComponentDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationComponentDTO.java @@ -1,7 +1,7 @@ -package io.dataease.api.visualization.dto; +package io.gisbi.api.visualization.dto; -import io.dataease.api.visualization.vo.VisualizationOutParamsJumpVO; -import io.dataease.api.visualization.vo.VisualizationViewTableVO; +import io.gisbi.api.visualization.vo.VisualizationOutParamsJumpVO; +import io.gisbi.api.visualization.vo.VisualizationViewTableVO; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkJumpDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationLinkJumpDTO.java similarity index 83% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkJumpDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationLinkJumpDTO.java index a1ec64a..0f63aac 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkJumpDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationLinkJumpDTO.java @@ -1,6 +1,6 @@ -package io.dataease.api.visualization.dto; +package io.gisbi.api.visualization.dto; -import io.dataease.api.visualization.vo.VisualizationLinkJumpVO; +import io.gisbi.api.visualization.vo.VisualizationLinkJumpVO; import lombok.Data; import java.util.ArrayList; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkJumpInfoDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationLinkJumpInfoDTO.java similarity index 73% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkJumpInfoDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationLinkJumpInfoDTO.java index ddc7334..0dece4b 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkJumpInfoDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationLinkJumpInfoDTO.java @@ -1,7 +1,7 @@ -package io.dataease.api.visualization.dto; +package io.gisbi.api.visualization.dto; -import io.dataease.api.visualization.vo.VisualizationLinkJumpInfoVO; -import io.dataease.api.visualization.vo.VisualizationLinkJumpTargetViewInfoVO; +import io.gisbi.api.visualization.vo.VisualizationLinkJumpInfoVO; +import io.gisbi.api.visualization.vo.VisualizationLinkJumpTargetViewInfoVO; import lombok.Data; import java.util.ArrayList; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkageDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationLinkageDTO.java similarity index 77% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkageDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationLinkageDTO.java index bb34901..d25e61d 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkageDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationLinkageDTO.java @@ -1,10 +1,10 @@ -package io.dataease.api.visualization.dto; +package io.gisbi.api.visualization.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.api.visualization.vo.VisualizationLinkageFieldVO; -import io.dataease.api.visualization.vo.VisualizationLinkageVO; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.api.visualization.vo.VisualizationLinkageFieldVO; +import io.gisbi.api.visualization.vo.VisualizationLinkageVO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; import lombok.Data; import java.util.ArrayList; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationOuterParamsDTO.java similarity index 80% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationOuterParamsDTO.java index cbc49f3..5c60a01 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationOuterParamsDTO.java @@ -1,6 +1,6 @@ -package io.dataease.api.visualization.dto; +package io.gisbi.api.visualization.dto; -import io.dataease.api.visualization.vo.VisualizationOuterParamsVO; +import io.gisbi.api.visualization.vo.VisualizationOuterParamsVO; import lombok.Data; import java.util.ArrayList; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsInfoDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationOuterParamsInfoDTO.java similarity index 64% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsInfoDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationOuterParamsInfoDTO.java index 9350edf..4bea5fb 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsInfoDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationOuterParamsInfoDTO.java @@ -1,9 +1,9 @@ -package io.dataease.api.visualization.dto; +package io.gisbi.api.visualization.dto; -import io.dataease.api.visualization.vo.VisualizationOuterParamsDsInfoVO; -import io.dataease.api.visualization.vo.VisualizationOuterParamsFilterInfoVO; -import io.dataease.api.visualization.vo.VisualizationOuterParamsInfoVO; -import io.dataease.api.visualization.vo.VisualizationOuterParamsTargetViewInfoVO; +import io.gisbi.api.visualization.vo.VisualizationOuterParamsDsInfoVO; +import io.gisbi.api.visualization.vo.VisualizationOuterParamsFilterInfoVO; +import io.gisbi.api.visualization.vo.VisualizationOuterParamsInfoVO; +import io.gisbi.api.visualization.vo.VisualizationOuterParamsTargetViewInfoVO; import lombok.Data; import java.util.ArrayList; diff --git a/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationOuterParamsTargetViewInfoDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationOuterParamsTargetViewInfoDTO.java new file mode 100644 index 0000000..ad160cb --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationOuterParamsTargetViewInfoDTO.java @@ -0,0 +1,9 @@ +package io.gisbi.api.visualization.dto; + +import io.gisbi.api.visualization.vo.VisualizationOuterParamsTargetViewInfoVO; + + +public class VisualizationOuterParamsTargetViewInfoDTO extends VisualizationOuterParamsTargetViewInfoVO { + + +} diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationViewTableDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationViewTableDTO.java similarity index 65% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationViewTableDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationViewTableDTO.java index 3711745..5ac0e20 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationViewTableDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/dto/VisualizationViewTableDTO.java @@ -1,8 +1,8 @@ -package io.dataease.api.visualization.dto; +package io.gisbi.api.visualization.dto; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.view.dto.ChartViewDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.view.dto.ChartViewDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/DataVisualizationBaseRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/DataVisualizationBaseRequest.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/DataVisualizationBaseRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/DataVisualizationBaseRequest.java index f521cc2..9408aa8 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/DataVisualizationBaseRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/DataVisualizationBaseRequest.java @@ -1,9 +1,8 @@ -package io.dataease.api.visualization.request; +package io.gisbi.api.visualization.request; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.api.visualization.vo.DataVisualizationVO; -import io.dataease.api.visualization.vo.VisualizationExport2AppVO; +import io.gisbi.api.visualization.vo.DataVisualizationVO; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/StaticResourceRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/StaticResourceRequest.java similarity index 74% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/StaticResourceRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/StaticResourceRequest.java index 464a583..8e7b8c3 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/StaticResourceRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/StaticResourceRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.request; +package io.gisbi.api.visualization.request; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationAppExportRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationAppExportRequest.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationAppExportRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationAppExportRequest.java index b058b84..587033a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationAppExportRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationAppExportRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.request; +package io.gisbi.api.visualization.request; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationBackgroundRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationBackgroundRequest.java similarity index 55% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationBackgroundRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationBackgroundRequest.java index b3a4788..9b155c9 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationBackgroundRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationBackgroundRequest.java @@ -1,6 +1,6 @@ -package io.dataease.api.visualization.request; +package io.gisbi.api.visualization.request; -import io.dataease.api.visualization.vo.VisualizationBackgroundVO; +import io.gisbi.api.visualization.vo.VisualizationBackgroundVO; /** * @author : WangJiaHao diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationLinkJumpBaseRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationLinkJumpBaseRequest.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationLinkJumpBaseRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationLinkJumpBaseRequest.java index ed9ffbd..8e167ca 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationLinkJumpBaseRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationLinkJumpBaseRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.request; +package io.gisbi.api.visualization.request; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationLinkageRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationLinkageRequest.java similarity index 75% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationLinkageRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationLinkageRequest.java index ed494d1..c5a2228 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationLinkageRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationLinkageRequest.java @@ -1,15 +1,13 @@ -package io.dataease.api.visualization.request; +package io.gisbi.api.visualization.request; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.api.visualization.dto.VisualizationLinkageDTO; -import io.dataease.api.visualization.vo.VisualizationLinkageVO; +import io.gisbi.api.visualization.dto.VisualizationLinkageDTO; +import io.gisbi.api.visualization.vo.VisualizationLinkageVO; import lombok.Data; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author : WangJiaHao diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationStoreRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationStoreRequest.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationStoreRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationStoreRequest.java index 18b7e49..a3d944b 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationStoreRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationStoreRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.request; +package io.gisbi.api.visualization.request; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationSubjectRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationSubjectRequest.java similarity index 55% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationSubjectRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationSubjectRequest.java index 0b76e0f..ff4a8b2 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationSubjectRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationSubjectRequest.java @@ -1,6 +1,6 @@ -package io.dataease.api.visualization.request; +package io.gisbi.api.visualization.request; -import io.dataease.api.visualization.vo.VisualizationSubjectVO; +import io.gisbi.api.visualization.vo.VisualizationSubjectVO; /** * @author : WangJiaHao diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationWatermarkRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationWatermarkRequest.java similarity index 55% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationWatermarkRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationWatermarkRequest.java index 608c61a..83611b0 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationWatermarkRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationWatermarkRequest.java @@ -1,6 +1,6 @@ -package io.dataease.api.visualization.request; +package io.gisbi.api.visualization.request; -import io.dataease.api.visualization.vo.VisualizationWatermarkVO; +import io.gisbi.api.visualization.vo.VisualizationWatermarkVO; /** * @author : WangJiaHao diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationWorkbranchQueryRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationWorkbranchQueryRequest.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationWorkbranchQueryRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationWorkbranchQueryRequest.java index 50172e1..13a3538 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/VisualizationWorkbranchQueryRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/request/VisualizationWorkbranchQueryRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.request; +package io.gisbi.api.visualization.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/response/VisualizationLinkJumpBaseResponse.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/response/VisualizationLinkJumpBaseResponse.java similarity index 86% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/response/VisualizationLinkJumpBaseResponse.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/response/VisualizationLinkJumpBaseResponse.java index 2e31529..f9610fc 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/response/VisualizationLinkJumpBaseResponse.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/response/VisualizationLinkJumpBaseResponse.java @@ -1,6 +1,6 @@ -package io.dataease.api.visualization.response; +package io.gisbi.api.visualization.response; -import io.dataease.api.visualization.dto.VisualizationLinkJumpInfoDTO; +import io.gisbi.api.visualization.dto.VisualizationLinkJumpInfoDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/response/VisualizationOuterParamsBaseResponse.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/response/VisualizationOuterParamsBaseResponse.java similarity index 85% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/response/VisualizationOuterParamsBaseResponse.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/response/VisualizationOuterParamsBaseResponse.java index 9652261..22fcec1 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/response/VisualizationOuterParamsBaseResponse.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/response/VisualizationOuterParamsBaseResponse.java @@ -1,6 +1,6 @@ -package io.dataease.api.visualization.response; +package io.gisbi.api.visualization.response; -import io.dataease.api.visualization.dto.VisualizationOuterParamsInfoDTO; +import io.gisbi.api.visualization.dto.VisualizationOuterParamsInfoDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreChartViewVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreChartViewVO.java similarity index 98% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreChartViewVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreChartViewVO.java index 1ea8315..8388bf9 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreChartViewVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreChartViewVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasetGroupVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreDatasetGroupVO.java similarity index 97% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasetGroupVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreDatasetGroupVO.java index 96412f8..cba1750 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasetGroupVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreDatasetGroupVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasetTableFieldVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreDatasetTableFieldVO.java similarity index 98% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasetTableFieldVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreDatasetTableFieldVO.java index 5b2027c..db65060 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasetTableFieldVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreDatasetTableFieldVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasetTableVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreDatasetTableVO.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasetTableVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreDatasetTableVO.java index 7dbebe4..9ca994b 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasetTableVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreDatasetTableVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasourceTaskVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreDatasourceTaskVO.java similarity index 97% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasourceTaskVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreDatasourceTaskVO.java index c395948..74aebcb 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasourceTaskVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreDatasourceTaskVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasourceVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreDatasourceVO.java similarity index 97% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasourceVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreDatasourceVO.java index a9f804a..43181f9 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasourceVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/AppCoreDatasourceVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationBaseVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/DataVisualizationBaseVO.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationBaseVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/DataVisualizationBaseVO.java index 28a61cb..0575b1d 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationBaseVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/DataVisualizationBaseVO.java @@ -1,8 +1,8 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.model.ITreeBase; +import io.gisbi.model.ITreeBase; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/DataVisualizationVO.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/DataVisualizationVO.java index e31cd24..764da6a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/DataVisualizationVO.java @@ -1,11 +1,11 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.google.gson.Gson; -import io.dataease.api.template.dto.VisualizationTemplateExtendDataDTO; -import io.dataease.extensions.view.dto.ChartViewDTO; -import io.dataease.utils.JsonUtil; +import io.gisbi.api.template.dto.VisualizationTemplateExtendDataDTO; +import io.gisbi.extensions.view.dto.ChartViewDTO; +import io.gisbi.utils.JsonUtil; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationBackgroundVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationBackgroundVO.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationBackgroundVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationBackgroundVO.java index 2b1e647..ddb822d 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationBackgroundVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationBackgroundVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationBaseInfoVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationBaseInfoVO.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationBaseInfoVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationBaseInfoVO.java index 997a24e..7c4bc60 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationBaseInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationBaseInfoVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationExport2AppVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationExport2AppVO.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationExport2AppVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationExport2AppVO.java index 9ea4737..7b30ce5 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationExport2AppVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationExport2AppVO.java @@ -1,7 +1,6 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.google.gson.Gson; -import io.dataease.api.visualization.request.DataVisualizationBaseRequest; import lombok.Data; import java.util.ArrayList; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpInfoVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationLinkJumpInfoVO.java similarity index 97% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpInfoVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationLinkJumpInfoVO.java index 6525a97..e2c46a1 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationLinkJumpInfoVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpTargetViewInfoVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationLinkJumpTargetViewInfoVO.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpTargetViewInfoVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationLinkJumpTargetViewInfoVO.java index d1ed15e..0e2977c 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpTargetViewInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationLinkJumpTargetViewInfoVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationLinkJumpVO.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationLinkJumpVO.java index 7d99200..4f0b2e8 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationLinkJumpVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkageFieldVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationLinkageFieldVO.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkageFieldVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationLinkageFieldVO.java index 6fe07c1..d20aa54 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkageFieldVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationLinkageFieldVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkageVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationLinkageVO.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkageVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationLinkageVO.java index b4a6dad..c565e09 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkageVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationLinkageVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOutParamsJumpVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOutParamsJumpVO.java similarity index 80% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOutParamsJumpVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOutParamsJumpVO.java index f323b81..56dc7f8 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOutParamsJumpVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOutParamsJumpVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsDsInfoVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOuterParamsDsInfoVO.java similarity index 86% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsDsInfoVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOuterParamsDsInfoVO.java index 7b23e76..399ecc1 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsDsInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOuterParamsDsInfoVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsFilterInfoVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOuterParamsFilterInfoVO.java similarity index 63% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsFilterInfoVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOuterParamsFilterInfoVO.java index 03aaa92..08d1b4f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsFilterInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOuterParamsFilterInfoVO.java @@ -1,10 +1,7 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import lombok.Data; -import java.util.List; -import java.util.Map; - @Data public class VisualizationOuterParamsFilterInfoVO { diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsInfoVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOuterParamsInfoVO.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsInfoVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOuterParamsInfoVO.java index 7e4f2a4..68a20ac 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOuterParamsInfoVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java index 314365a..5412714 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOuterParamsVO.java similarity index 98% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOuterParamsVO.java index f22348b..8885d2f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationOuterParamsVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationReportFilterVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationReportFilterVO.java similarity index 98% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationReportFilterVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationReportFilterVO.java index 5783ac4..e93e03e 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationReportFilterVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationReportFilterVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationResourceVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationResourceVO.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationResourceVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationResourceVO.java index f54eaf0..ac20ae4 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationResourceVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationResourceVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationStoreVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationStoreVO.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationStoreVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationStoreVO.java index 148717a..c0eac5e 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationStoreVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationStoreVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationSubjectVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationSubjectVO.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationSubjectVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationSubjectVO.java index d8d6544..95e8e6b 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationSubjectVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationSubjectVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationViewTableVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationViewTableVO.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationViewTableVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationViewTableVO.java index 3be6f72..19fcdec 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationViewTableVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationViewTableVO.java @@ -1,8 +1,8 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationWatermarkVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationWatermarkVO.java similarity index 97% rename from sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationWatermarkVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationWatermarkVO.java index 8f73962..542223c 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationWatermarkVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/visualization/vo/VisualizationWatermarkVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.visualization.vo; +package io.gisbi.api.visualization.vo; public class VisualizationWatermarkVO{ diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/webhook/WebhookApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/webhook/WebhookApi.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/webhook/WebhookApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/webhook/WebhookApi.java index 8eb3d88..92f3bc7 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/webhook/WebhookApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/webhook/WebhookApi.java @@ -1,11 +1,11 @@ -package io.dataease.api.webhook; +package io.gisbi.api.webhook; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.webhook.request.WebhookSwitchRequest; -import io.dataease.api.webhook.vo.WebhookGridVO; -import io.dataease.api.webhook.vo.WebhookOption; -import io.dataease.model.KeywordRequest; +import io.gisbi.api.webhook.request.WebhookSwitchRequest; +import io.gisbi.api.webhook.vo.WebhookGridVO; +import io.gisbi.api.webhook.vo.WebhookOption; +import io.gisbi.model.KeywordRequest; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/webhook/request/WebhookSwitchRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/webhook/request/WebhookSwitchRequest.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/webhook/request/WebhookSwitchRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/webhook/request/WebhookSwitchRequest.java index 0cbca0e..ff1dc2a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/webhook/request/WebhookSwitchRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/webhook/request/WebhookSwitchRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.webhook.request; +package io.gisbi.api.webhook.request; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/webhook/vo/WebhookGridVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/webhook/vo/WebhookGridVO.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/webhook/vo/WebhookGridVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/webhook/vo/WebhookGridVO.java index 186016a..9f5056f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/webhook/vo/WebhookGridVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/webhook/vo/WebhookGridVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.webhook.vo; +package io.gisbi.api.webhook.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/webhook/vo/WebhookOption.java b/sdk/api/api-base/src/main/java/io/gisbi/api/webhook/vo/WebhookOption.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/webhook/vo/WebhookOption.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/webhook/vo/WebhookOption.java index a169956..578a37a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/webhook/vo/WebhookOption.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/webhook/vo/WebhookOption.java @@ -1,4 +1,4 @@ -package io.dataease.api.webhook.vo; +package io.gisbi.api.webhook.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/wecom/api/WecomApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/wecom/api/WecomApi.java similarity index 84% rename from sdk/api/api-base/src/main/java/io/dataease/api/wecom/api/WecomApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/wecom/api/WecomApi.java index 4a41afc..5e428b9 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/wecom/api/WecomApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/wecom/api/WecomApi.java @@ -1,10 +1,10 @@ -package io.dataease.api.wecom.api; +package io.gisbi.api.wecom.api; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.wecom.dto.WecomCreator; -import io.dataease.api.wecom.dto.WecomEnableEditor; -import io.dataease.api.wecom.dto.WecomTokenRequest; -import io.dataease.api.wecom.vo.WecomInfoVO; +import io.gisbi.api.wecom.dto.WecomCreator; +import io.gisbi.api.wecom.dto.WecomEnableEditor; +import io.gisbi.api.wecom.dto.WecomTokenRequest; +import io.gisbi.api.wecom.vo.WecomInfoVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/wecom/dto/WecomCreator.java b/sdk/api/api-base/src/main/java/io/gisbi/api/wecom/dto/WecomCreator.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/wecom/dto/WecomCreator.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/wecom/dto/WecomCreator.java index 581dcd1..f4f7c69 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/wecom/dto/WecomCreator.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/wecom/dto/WecomCreator.java @@ -1,4 +1,4 @@ -package io.dataease.api.wecom.dto; +package io.gisbi.api.wecom.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/wecom/dto/WecomEnableEditor.java b/sdk/api/api-base/src/main/java/io/gisbi/api/wecom/dto/WecomEnableEditor.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/wecom/dto/WecomEnableEditor.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/wecom/dto/WecomEnableEditor.java index bf53b7f..e4e7ea5 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/wecom/dto/WecomEnableEditor.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/wecom/dto/WecomEnableEditor.java @@ -1,4 +1,4 @@ -package io.dataease.api.wecom.dto; +package io.gisbi.api.wecom.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/wecom/dto/WecomTokenRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/wecom/dto/WecomTokenRequest.java similarity index 82% rename from sdk/api/api-base/src/main/java/io/dataease/api/wecom/dto/WecomTokenRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/wecom/dto/WecomTokenRequest.java index 93697a6..dc3404c 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/wecom/dto/WecomTokenRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/wecom/dto/WecomTokenRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.wecom.dto; +package io.gisbi.api.wecom.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/wecom/vo/WecomInfoVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/wecom/vo/WecomInfoVO.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/wecom/vo/WecomInfoVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/wecom/vo/WecomInfoVO.java index 7f6415e..9fd55bc 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/wecom/vo/WecomInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/wecom/vo/WecomInfoVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.wecom.vo; +package io.gisbi.api.wecom.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/appearance/api/XpackAppearanceApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/appearance/api/XpackAppearanceApi.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/appearance/api/XpackAppearanceApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/appearance/api/XpackAppearanceApi.java index 9afc4f8..535d118 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/appearance/api/XpackAppearanceApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/appearance/api/XpackAppearanceApi.java @@ -1,6 +1,6 @@ -package io.dataease.api.xpack.appearance.api; +package io.gisbi.api.xpack.appearance.api; -import io.dataease.api.xpack.appearance.vo.AppearanceItemVO; +import io.gisbi.api.xpack.appearance.vo.AppearanceItemVO; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/appearance/vo/AppearanceItemVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/appearance/vo/AppearanceItemVO.java similarity index 93% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/appearance/vo/AppearanceItemVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/appearance/vo/AppearanceItemVO.java index e6fa60d..cab6584 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/appearance/vo/AppearanceItemVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/appearance/vo/AppearanceItemVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.appearance.vo; +package io.gisbi.api.xpack.appearance.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/component/XpackComponentApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/component/XpackComponentApi.java similarity index 73% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/component/XpackComponentApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/component/XpackComponentApi.java index 5b05c0b..a682913 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/component/XpackComponentApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/component/XpackComponentApi.java @@ -1,9 +1,9 @@ -package io.dataease.api.xpack.component; +package io.gisbi.api.xpack.component; -import io.dataease.api.xpack.component.vo.XpackMenuVO; -import io.dataease.extensions.datafilling.vo.XpackPluginsDfVO; -import io.dataease.extensions.datasource.vo.XpackPluginsDatasourceVO; -import io.dataease.extensions.view.vo.XpackPluginsViewVO; +import io.gisbi.api.xpack.component.vo.XpackMenuVO; +import io.gisbi.extensions.datafilling.vo.XpackPluginsDfVO; +import io.gisbi.extensions.datasource.vo.XpackPluginsDatasourceVO; +import io.gisbi.extensions.view.vo.XpackPluginsViewVO; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/component/vo/XpackMenuVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/component/vo/XpackMenuVO.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/component/vo/XpackMenuVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/component/vo/XpackMenuVO.java index 3133218..94ef5bd 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/component/vo/XpackMenuVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/component/vo/XpackMenuVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.component.vo; +package io.gisbi.api.xpack.component.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/DataFillingApi.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/DataFillingApi.java index e52b5c4..dc0f871 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/DataFillingApi.java @@ -1,16 +1,16 @@ -package io.dataease.api.xpack.dataFilling; +package io.gisbi.api.xpack.dataFilling; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.report.dto.ReportInstanceMsgRequest; -import io.dataease.api.report.vo.ReportGridVO; -import io.dataease.api.xpack.dataFilling.dto.*; -import io.dataease.auth.DeApiPath; -import io.dataease.auth.DePermit; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.SimpleDatasourceDTO; -import io.dataease.model.BusiNodeRequest; -import io.dataease.model.BusiNodeVO; +import io.gisbi.api.report.dto.ReportInstanceMsgRequest; +import io.gisbi.api.report.vo.ReportGridVO; +import io.gisbi.api.xpack.dataFilling.dto.*; +import io.gisbi.auth.DeApiPath; +import io.gisbi.auth.DePermit; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.SimpleDatasourceDTO; +import io.gisbi.model.BusiNodeRequest; +import io.gisbi.model.BusiNodeVO; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.bind.annotation.*; @@ -19,7 +19,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; import java.util.Map; -import static io.dataease.constant.AuthResourceEnum.DATA_FILLING; +import static io.gisbi.constant.AuthResourceEnum.DATA_FILLING; @Tag(name = "数据填报") @ApiSupport(order = 1000, author = "fit2cloud-someone") diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ColumnOption.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/ColumnOption.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ColumnOption.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/ColumnOption.java index 676eccf..efd7ed9 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ColumnOption.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/ColumnOption.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillFormTableDataRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DataFillFormTableDataRequest.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillFormTableDataRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DataFillFormTableDataRequest.java index 41d0296..9771f80 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillFormTableDataRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DataFillFormTableDataRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillFormTableDataResponse.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DataFillFormTableDataResponse.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillFormTableDataResponse.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DataFillFormTableDataResponse.java index 4918a5b..7df20e8 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillFormTableDataResponse.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DataFillFormTableDataResponse.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillFormTableDataSearchParam.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DataFillFormTableDataSearchParam.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillFormTableDataSearchParam.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DataFillFormTableDataSearchParam.java index d91cf76..ebb5803 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillFormTableDataSearchParam.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DataFillFormTableDataSearchParam.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillingDTO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DataFillingDTO.java similarity index 97% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillingDTO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DataFillingDTO.java index 6b76ad5..7b0beb4 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillingDTO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DataFillingDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DatasourceOptionsRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DatasourceOptionsRequest.java similarity index 83% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DatasourceOptionsRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DatasourceOptionsRequest.java index 1df7309..12641c1 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DatasourceOptionsRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DatasourceOptionsRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfCommitLog.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfCommitLog.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfCommitLog.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfCommitLog.java index 60962f8..551998f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfCommitLog.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfCommitLog.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfCommitLogRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfCommitLogRequest.java similarity index 85% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfCommitLogRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfCommitLogRequest.java index f5de44a..d884d68 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfCommitLogRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfCommitLogRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfExcelData.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfExcelData.java similarity index 82% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfExcelData.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfExcelData.java index bdb9d30..4ac61d0 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfExcelData.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfExcelData.java @@ -1,6 +1,6 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; -import io.dataease.extensions.datafilling.dto.ExtTableField; +import io.gisbi.extensions.datafilling.dto.ExtTableField; import lombok.Data; import lombok.experimental.Accessors; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfSubTaskInfoRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfSubTaskInfoRequest.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfSubTaskInfoRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfSubTaskInfoRequest.java index 600a2a1..e3927d6 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfSubTaskInfoRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfSubTaskInfoRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfSubTaskVo.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfSubTaskVo.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfSubTaskVo.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfSubTaskVo.java index 17c17cc..b66af37 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfSubTaskVo.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfSubTaskVo.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfTaskInfoRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfTaskInfoRequest.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfTaskInfoRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfTaskInfoRequest.java index 955028e..101f1c2 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfTaskInfoRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfTaskInfoRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskData.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfUserTaskData.java similarity index 93% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskData.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfUserTaskData.java index f1f98b7..00a668f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskData.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfUserTaskData.java @@ -1,8 +1,8 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.utils.LongArray2StringSerialize; +import io.gisbi.utils.LongArray2StringSerialize; import lombok.Data; import lombok.experimental.Accessors; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfUserTaskRequest.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfUserTaskRequest.java index 42a8bcd..6d685fd 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfUserTaskRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskVo.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfUserTaskVo.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskVo.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfUserTaskVo.java index 4e60514..c38527e 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskVo.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/DfUserTaskVo.java @@ -1,14 +1,13 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.utils.LongArray2StringSerialize; +import io.gisbi.utils.LongArray2StringSerialize; import lombok.Data; import lombok.experimental.Accessors; import java.io.Serial; import java.io.Serializable; -import java.util.List; @Data @Accessors(chain = true) diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetails.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/ExtraDetails.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetails.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/ExtraDetails.java index 3eddbe9..534c7fd 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetails.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/ExtraDetails.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetailsRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/ExtraDetailsRequest.java similarity index 82% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetailsRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/ExtraDetailsRequest.java index 942b025..aa9abb2 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetailsRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/ExtraDetailsRequest.java @@ -1,8 +1,8 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.extensions.datafilling.dto.ExtraColumnItem; +import io.gisbi.extensions.datafilling.dto.ExtraColumnItem; import lombok.Data; import lombok.experimental.Accessors; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/FilterSetting.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/FilterSetting.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/FilterSetting.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/FilterSetting.java index e4a5e04..ab7732b 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/FilterSetting.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/FilterSetting.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/RowDataDatum.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/RowDataDatum.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/RowDataDatum.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/RowDataDatum.java index 8bcbdfd..ecfd842 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/RowDataDatum.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/RowDataDatum.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoGridVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/TaskInfoGridVO.java similarity index 85% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoGridVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/TaskInfoGridVO.java index d3c9ce1..725d44d 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoGridVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/TaskInfoGridVO.java @@ -1,14 +1,13 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.utils.LongArray2StringSerialize; +import io.gisbi.utils.LongArray2StringSerialize; import lombok.Data; import lombok.experimental.Accessors; import java.io.Serial; import java.io.Serializable; -import java.util.List; @Data @Accessors(chain = true) diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/TaskInfoVO.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/TaskInfoVO.java index fdd5611..acaf23c 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/dataFilling/dto/TaskInfoVO.java @@ -1,8 +1,8 @@ -package io.dataease.api.xpack.dataFilling.dto; +package io.gisbi.api.xpack.dataFilling.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.utils.LongArray2StringSerialize; +import io.gisbi.utils.LongArray2StringSerialize; import lombok.Data; import lombok.experimental.Accessors; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/PluginApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/plugin/PluginApi.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/PluginApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/plugin/PluginApi.java index 496316a..b10603f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/PluginApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/plugin/PluginApi.java @@ -1,8 +1,8 @@ -package io.dataease.api.xpack.plugin; +package io.gisbi.api.xpack.plugin; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.xpack.plugin.dto.PluginEditor; -import io.dataease.api.xpack.plugin.vo.PluginVO; +import io.gisbi.api.xpack.plugin.dto.PluginEditor; +import io.gisbi.api.xpack.plugin.vo.PluginVO; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/dto/PluginEditor.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/plugin/dto/PluginEditor.java similarity index 85% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/dto/PluginEditor.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/plugin/dto/PluginEditor.java index d04558e..8196555 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/dto/PluginEditor.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/plugin/dto/PluginEditor.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.plugin.dto; +package io.gisbi.api.xpack.plugin.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/vo/PluginVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/plugin/vo/PluginVO.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/vo/PluginVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/plugin/vo/PluginVO.java index 60f6f39..054fc7c 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/vo/PluginVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/plugin/vo/PluginVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.plugin.vo; +package io.gisbi.api.xpack.plugin.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/XpackAuthenticationApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/XpackAuthenticationApi.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/XpackAuthenticationApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/XpackAuthenticationApi.java index 3e7d3ec..8bc2c86 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/XpackAuthenticationApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/XpackAuthenticationApi.java @@ -1,8 +1,8 @@ -package io.dataease.api.xpack.settings; +package io.gisbi.api.xpack.settings; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.xpack.settings.request.XpackAuthenticationEditor; -import io.dataease.api.xpack.settings.vo.*; +import io.gisbi.api.xpack.settings.request.XpackAuthenticationEditor; +import io.gisbi.api.xpack.settings.vo.*; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/XpackOauth2Api.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/XpackOauth2Api.java similarity index 70% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/XpackOauth2Api.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/XpackOauth2Api.java index 353298f..746ce04 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/XpackOauth2Api.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/XpackOauth2Api.java @@ -1,9 +1,9 @@ -package io.dataease.api.xpack.settings; +package io.gisbi.api.xpack.settings; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.xpack.settings.request.XpackOauth2TokenRequest; -import io.dataease.api.xpack.settings.vo.XpackOauthAuthVO; -import io.dataease.api.xpack.settings.vo.XpackOauthTokenVO; +import io.gisbi.api.xpack.settings.request.XpackOauth2TokenRequest; +import io.gisbi.api.xpack.settings.vo.XpackOauthAuthVO; +import io.gisbi.api.xpack.settings.vo.XpackOauthTokenVO; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/request/XpackAuthenticationEditor.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/request/XpackAuthenticationEditor.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/request/XpackAuthenticationEditor.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/request/XpackAuthenticationEditor.java index 9c824c9..da514e0 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/request/XpackAuthenticationEditor.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/request/XpackAuthenticationEditor.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.settings.request; +package io.gisbi.api.xpack.settings.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/request/XpackOauth2TokenRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/request/XpackOauth2TokenRequest.java similarity index 85% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/request/XpackOauth2TokenRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/request/XpackOauth2TokenRequest.java index 905f962..62b7872 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/request/XpackOauth2TokenRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/request/XpackOauth2TokenRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.settings.request; +package io.gisbi.api.xpack.settings.request; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackAuthenticationStatusVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackAuthenticationStatusVO.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackAuthenticationStatusVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackAuthenticationStatusVO.java index 7534d25..11465b8 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackAuthenticationStatusVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackAuthenticationStatusVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.settings.vo; +package io.gisbi.api.xpack.settings.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackAuthenticationVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackAuthenticationVO.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackAuthenticationVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackAuthenticationVO.java index 218cb6a..b2abbe6 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackAuthenticationVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackAuthenticationVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.settings.vo; +package io.gisbi.api.xpack.settings.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackCasVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackCasVO.java similarity index 86% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackCasVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackCasVO.java index a7c65da..d5df35c 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackCasVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackCasVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.settings.vo; +package io.gisbi.api.xpack.settings.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackLdapVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackLdapVO.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackLdapVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackLdapVO.java index 743f9f8..a3353f2 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackLdapVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackLdapVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.settings.vo; +package io.gisbi.api.xpack.settings.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOauth2VO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackOauth2VO.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOauth2VO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackOauth2VO.java index 2546523..16a8016 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOauth2VO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackOauth2VO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.settings.vo; +package io.gisbi.api.xpack.settings.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOauthAuthVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackOauthAuthVO.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOauthAuthVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackOauthAuthVO.java index 3df9923..b936554 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOauthAuthVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackOauthAuthVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.settings.vo; +package io.gisbi.api.xpack.settings.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOauthTokenVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackOauthTokenVO.java similarity index 86% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOauthTokenVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackOauthTokenVO.java index a4a7923..0d7775d 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOauthTokenVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackOauthTokenVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.settings.vo; +package io.gisbi.api.xpack.settings.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOidcVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackOidcVO.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOidcVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackOidcVO.java index 4b2be00..32345be 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOidcVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/settings/vo/XpackOidcVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.settings.vo; +package io.gisbi.api.xpack.settings.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/ShareTicketApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/ShareTicketApi.java similarity index 85% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/ShareTicketApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/ShareTicketApi.java index 3ef01d9..a6121f8 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/ShareTicketApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/ShareTicketApi.java @@ -1,10 +1,10 @@ -package io.dataease.api.xpack.share; +package io.gisbi.api.xpack.share; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.dataease.api.xpack.share.request.TicketCreator; -import io.dataease.api.xpack.share.request.TicketDelRequest; -import io.dataease.api.xpack.share.request.TicketSwitchRequest; -import io.dataease.api.xpack.share.vo.TicketVO; +import io.gisbi.api.xpack.share.request.TicketCreator; +import io.gisbi.api.xpack.share.request.TicketDelRequest; +import io.gisbi.api.xpack.share.request.TicketSwitchRequest; +import io.gisbi.api.xpack.share.vo.TicketVO; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/XpackShareApi.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/XpackShareApi.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/XpackShareApi.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/XpackShareApi.java index a3ec2a2..9b67d3b 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/XpackShareApi.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/XpackShareApi.java @@ -1,10 +1,10 @@ -package io.dataease.api.xpack.share; +package io.gisbi.api.xpack.share; -import io.dataease.api.xpack.share.request.*; -import io.dataease.api.visualization.request.VisualizationWorkbranchQueryRequest; -import io.dataease.api.xpack.share.vo.XpackShareGridVO; -import io.dataease.api.xpack.share.vo.XpackShareProxyVO; -import io.dataease.api.xpack.share.vo.XpackShareVO; +import io.gisbi.api.xpack.share.request.*; +import io.gisbi.api.visualization.request.VisualizationWorkbranchQueryRequest; +import io.gisbi.api.xpack.share.vo.XpackShareGridVO; +import io.gisbi.api.xpack.share.vo.XpackShareProxyVO; +import io.gisbi.api.xpack.share.vo.XpackShareVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketCreator.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/TicketCreator.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketCreator.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/TicketCreator.java index 06d0739..ef43469 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketCreator.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/TicketCreator.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.share.request; +package io.gisbi.api.xpack.share.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketDelRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/TicketDelRequest.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketDelRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/TicketDelRequest.java index 159ac4a..8bf88b7 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketDelRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/TicketDelRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.share.request; +package io.gisbi.api.xpack.share.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketSwitchRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/TicketSwitchRequest.java similarity index 92% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketSwitchRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/TicketSwitchRequest.java index 25b2089..2162e60 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketSwitchRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/TicketSwitchRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.share.request; +package io.gisbi.api.xpack.share.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackShareExpRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/XpackShareExpRequest.java similarity index 93% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackShareExpRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/XpackShareExpRequest.java index f357fc7..09afa04 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackShareExpRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/XpackShareExpRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.share.request; +package io.gisbi.api.xpack.share.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackShareProxyRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/XpackShareProxyRequest.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackShareProxyRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/XpackShareProxyRequest.java index ef657a9..179dfc2 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackShareProxyRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/XpackShareProxyRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.share.request; +package io.gisbi.api.xpack.share.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackSharePwdRequest.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/XpackSharePwdRequest.java similarity index 93% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackSharePwdRequest.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/XpackSharePwdRequest.java index 436e207..6370217 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackSharePwdRequest.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/XpackSharePwdRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.share.request; +package io.gisbi.api.xpack.share.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackSharePwdValidator.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/XpackSharePwdValidator.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackSharePwdValidator.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/XpackSharePwdValidator.java index 595dab4..f60e1b7 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackSharePwdValidator.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/XpackSharePwdValidator.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.share.request; +package io.gisbi.api.xpack.share.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackShareUuidEditor.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/XpackShareUuidEditor.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackShareUuidEditor.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/XpackShareUuidEditor.java index 8920ab8..e4e3fd1 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackShareUuidEditor.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/request/XpackShareUuidEditor.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.share.request; +package io.gisbi.api.xpack.share.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/TicketVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/vo/TicketVO.java similarity index 93% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/TicketVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/vo/TicketVO.java index 2497ea2..4f94913 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/TicketVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/vo/TicketVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.share.vo; +package io.gisbi.api.xpack.share.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/TicketValidVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/vo/TicketValidVO.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/TicketValidVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/vo/TicketValidVO.java index cc5b16b..462e196 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/TicketValidVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/vo/TicketValidVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.share.vo; +package io.gisbi.api.xpack.share.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareGridVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/vo/XpackShareGridVO.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareGridVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/vo/XpackShareGridVO.java index 4bc9f9d..ba7896b 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareGridVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/vo/XpackShareGridVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.share.vo; +package io.gisbi.api.xpack.share.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareProxyVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/vo/XpackShareProxyVO.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareProxyVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/vo/XpackShareProxyVO.java index 72f211b..d817122 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareProxyVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/vo/XpackShareProxyVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.share.vo; +package io.gisbi.api.xpack.share.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareVO.java b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/vo/XpackShareVO.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareVO.java rename to sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/vo/XpackShareVO.java index 1c979a7..c14b1c1 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareVO.java +++ b/sdk/api/api-base/src/main/java/io/gisbi/api/xpack/share/vo/XpackShareVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.xpack.share.vo; +package io.gisbi.api.xpack.share.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/pom.xml b/sdk/api/api-permissions/pom.xml index 0173088..57e0c60 100644 --- a/sdk/api/api-permissions/pom.xml +++ b/sdk/api/api-permissions/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> api - io.dataease - ${dataease.version} + io.gisbi + 1.0.0 4.0.0 @@ -26,6 +26,17 @@ javase 3.4.1 + + com.github.xiaoymin + knife4j-core + + + + io.gisbi + extensions-view + 1.0.0 + + diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/apikey/api/ApiKeyApi.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/apikey/api/ApiKeyApi.java similarity index 88% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/apikey/api/ApiKeyApi.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/apikey/api/ApiKeyApi.java index 3fb2728..6e0ba36 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/apikey/api/ApiKeyApi.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/apikey/api/ApiKeyApi.java @@ -1,9 +1,9 @@ -package io.dataease.api.permissions.apikey.api; +package io.gisbi.api.permissions.apikey.api; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.permissions.apikey.dto.ApikeyEnableEditor; -import io.dataease.api.permissions.apikey.vo.ApiKeyVO; +import io.gisbi.api.permissions.apikey.dto.ApikeyEnableEditor; +import io.gisbi.api.permissions.apikey.vo.ApiKeyVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/apikey/dto/ApikeyEnableEditor.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/apikey/dto/ApikeyEnableEditor.java similarity index 88% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/apikey/dto/ApikeyEnableEditor.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/apikey/dto/ApikeyEnableEditor.java index 8338370..17b97d9 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/apikey/dto/ApikeyEnableEditor.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/apikey/dto/ApikeyEnableEditor.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.apikey.dto; +package io.gisbi.api.permissions.apikey.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/apikey/vo/ApiKeyVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/apikey/vo/ApiKeyVO.java similarity index 93% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/apikey/vo/ApiKeyVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/apikey/vo/ApiKeyVO.java index 3e33fe6..3260499 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/apikey/vo/ApiKeyVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/apikey/vo/ApiKeyVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.apikey.vo; +package io.gisbi.api.permissions.apikey.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/AuthApi.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/api/AuthApi.java similarity index 92% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/AuthApi.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/api/AuthApi.java index 45a65a0..d760511 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/AuthApi.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/api/AuthApi.java @@ -1,11 +1,11 @@ -package io.dataease.api.permissions.auth.api; +package io.gisbi.api.permissions.auth.api; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.permissions.auth.dto.*; -import io.dataease.api.permissions.auth.vo.PermissionVO; -import io.dataease.api.permissions.auth.vo.ResourceVO; +import io.gisbi.api.permissions.auth.dto.*; +import io.gisbi.api.permissions.auth.vo.PermissionVO; +import io.gisbi.api.permissions.auth.vo.ResourceVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/InteractiveAuthApi.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/api/InteractiveAuthApi.java similarity index 89% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/InteractiveAuthApi.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/api/InteractiveAuthApi.java index bfc9779..e400c20 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/InteractiveAuthApi.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/api/InteractiveAuthApi.java @@ -1,14 +1,14 @@ -package io.dataease.api.permissions.auth.api; +package io.gisbi.api.permissions.auth.api; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.permissions.auth.dto.*; -import io.dataease.api.permissions.auth.vo.PermissionValVO; -import io.dataease.api.permissions.auth.vo.ResourceNodeVO; -import io.dataease.model.BusiNodeRequest; -import io.dataease.model.BusiNodeVO; -import io.dataease.model.ExportTaskDTO; +import io.gisbi.api.permissions.auth.dto.*; +import io.gisbi.api.permissions.auth.vo.PermissionValVO; +import io.gisbi.api.permissions.auth.vo.ResourceNodeVO; +import io.gisbi.model.BusiNodeRequest; +import io.gisbi.model.BusiNodeVO; +import io.gisbi.model.ExportTaskDTO; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiBatchAuthorizeNode.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiBatchAuthorizeNode.java similarity index 86% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiBatchAuthorizeNode.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiBatchAuthorizeNode.java index 68afdbc..996bf39 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiBatchAuthorizeNode.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiBatchAuthorizeNode.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.auth.dto; +package io.gisbi.api.permissions.auth.dto; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiBatchAuthorizeRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiBatchAuthorizeRequest.java similarity index 87% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiBatchAuthorizeRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiBatchAuthorizeRequest.java index 070a0da..da40282 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiBatchAuthorizeRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiBatchAuthorizeRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.auth.dto; +package io.gisbi.api.permissions.auth.dto; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiPerCheckDTO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiPerCheckDTO.java similarity index 81% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiPerCheckDTO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiPerCheckDTO.java index 32c9886..4ca5365 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiPerCheckDTO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiPerCheckDTO.java @@ -1,6 +1,6 @@ -package io.dataease.api.permissions.auth.dto; +package io.gisbi.api.permissions.auth.dto; -import io.dataease.constant.AuthEnum; +import io.gisbi.constant.AuthEnum; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiPerEditor.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiPerEditor.java similarity index 83% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiPerEditor.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiPerEditor.java index b2fba32..a228e71 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiPerEditor.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiPerEditor.java @@ -1,6 +1,6 @@ -package io.dataease.api.permissions.auth.dto; +package io.gisbi.api.permissions.auth.dto; -import io.dataease.api.permissions.auth.vo.PermissionItem; +import io.gisbi.api.permissions.auth.vo.PermissionItem; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiPermissionRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiPermissionRequest.java similarity index 93% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiPermissionRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiPermissionRequest.java index ceddd8f..436bd31 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiPermissionRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiPermissionRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.auth.dto; +package io.gisbi.api.permissions.auth.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiResourceCreator.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiResourceCreator.java similarity index 93% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiResourceCreator.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiResourceCreator.java index 5cf3cf6..b79c4cf 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiResourceCreator.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiResourceCreator.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.auth.dto; +package io.gisbi.api.permissions.auth.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiResourceEditor.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiResourceEditor.java similarity index 87% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiResourceEditor.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiResourceEditor.java index dfb738b..8bc0191 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiResourceEditor.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiResourceEditor.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.auth.dto; +package io.gisbi.api.permissions.auth.dto; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiResourceMover.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiResourceMover.java similarity index 77% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiResourceMover.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiResourceMover.java index fa10756..49b2e86 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiResourceMover.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiResourceMover.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.auth.dto; +package io.gisbi.api.permissions.auth.dto; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiTargetPerCreator.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiTargetPerCreator.java similarity index 89% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiTargetPerCreator.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiTargetPerCreator.java index ffe61ec..3b3d1ea 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiTargetPerCreator.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/BusiTargetPerCreator.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.auth.dto; +package io.gisbi.api.permissions.auth.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/MenuPerEditor.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/MenuPerEditor.java similarity index 83% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/MenuPerEditor.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/MenuPerEditor.java index 2de268c..5422bd5 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/MenuPerEditor.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/MenuPerEditor.java @@ -1,6 +1,6 @@ -package io.dataease.api.permissions.auth.dto; +package io.gisbi.api.permissions.auth.dto; -import io.dataease.api.permissions.auth.vo.PermissionItem; +import io.gisbi.api.permissions.auth.vo.PermissionItem; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/MenuPermissionRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/MenuPermissionRequest.java similarity index 89% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/MenuPermissionRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/MenuPermissionRequest.java index ff112fa..095dc32 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/MenuPermissionRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/MenuPermissionRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.auth.dto; +package io.gisbi.api.permissions.auth.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/MenuTargetPerCreator.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/MenuTargetPerCreator.java similarity index 77% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/MenuTargetPerCreator.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/MenuTargetPerCreator.java index 9389ec1..e716faa 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/MenuTargetPerCreator.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/MenuTargetPerCreator.java @@ -1,6 +1,6 @@ -package io.dataease.api.permissions.auth.dto; +package io.gisbi.api.permissions.auth.dto; -import io.dataease.api.permissions.auth.vo.PermissionItem; +import io.gisbi.api.permissions.auth.vo.PermissionItem; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/PermissionBO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/PermissionBO.java similarity index 63% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/PermissionBO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/PermissionBO.java index 03f4968..1a76335 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/PermissionBO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/PermissionBO.java @@ -1,6 +1,6 @@ -package io.dataease.api.permissions.auth.dto; +package io.gisbi.api.permissions.auth.dto; -import io.dataease.api.permissions.auth.vo.PermissionItem; +import io.gisbi.api.permissions.auth.vo.PermissionItem; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/TargetPerCreator.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/TargetPerCreator.java similarity index 92% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/TargetPerCreator.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/TargetPerCreator.java index e1cb6f2..424021e 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/TargetPerCreator.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/dto/TargetPerCreator.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.auth.dto; +package io.gisbi.api.permissions.auth.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionItem.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/PermissionItem.java similarity index 81% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionItem.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/PermissionItem.java index ffe3846..e4a95bf 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionItem.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/PermissionItem.java @@ -1,9 +1,9 @@ -package io.dataease.api.permissions.auth.vo; +package io.gisbi.api.permissions.auth.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.api.permissions.dataset.dto.DataSetColumnPermissionsDTO; -import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO; +import io.gisbi.api.permissions.dataset.dto.DataSetColumnPermissionsDTO; +import io.gisbi.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionOrigin.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/PermissionOrigin.java similarity index 94% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionOrigin.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/PermissionOrigin.java index c043f5f..21180c0 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionOrigin.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/PermissionOrigin.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.auth.vo; +package io.gisbi.api.permissions.auth.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/PermissionVO.java similarity index 93% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/PermissionVO.java index 2d7f657..8c0342d 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/PermissionVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.auth.vo; +package io.gisbi.api.permissions.auth.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionValVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/PermissionValVO.java similarity index 89% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionValVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/PermissionValVO.java index ebd0c27..f6a0aa9 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionValVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/PermissionValVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.auth.vo; +package io.gisbi.api.permissions.auth.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/ResourceNodeVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/ResourceNodeVO.java similarity index 78% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/ResourceNodeVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/ResourceNodeVO.java index 7920b38..89e21d7 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/ResourceNodeVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/ResourceNodeVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.auth.vo; +package io.gisbi.api.permissions.auth.vo; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/ResourceVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/ResourceVO.java similarity index 91% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/ResourceVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/ResourceVO.java index b2dc92f..209f86f 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/ResourceVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/auth/vo/ResourceVO.java @@ -1,8 +1,8 @@ -package io.dataease.api.permissions.auth.vo; +package io.gisbi.api.permissions.auth.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.model.TreeResultModel; +import io.gisbi.model.TreeResultModel; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/ColumnPermissionsApi.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/api/ColumnPermissionsApi.java similarity index 83% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/ColumnPermissionsApi.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/api/ColumnPermissionsApi.java index 2c0b4e9..938fd13 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/ColumnPermissionsApi.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/api/ColumnPermissionsApi.java @@ -1,8 +1,8 @@ -package io.dataease.api.permissions.dataset.api; +package io.gisbi.api.permissions.dataset.api; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.dataease.api.permissions.dataset.dto.DataSetColumnPermissionsDTO; -import io.dataease.auth.DeApiPath; +import io.gisbi.api.permissions.dataset.dto.DataSetColumnPermissionsDTO; +import io.gisbi.auth.DeApiPath; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; -import static io.dataease.constant.AuthResourceEnum.DATASET; +import static io.gisbi.constant.AuthResourceEnum.DATASET; @DeApiPath(value = "/dataset/columnPermissions", rt = DATASET) diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/RowPermissionsApi.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/api/RowPermissionsApi.java similarity index 85% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/RowPermissionsApi.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/api/RowPermissionsApi.java index da2d1b0..96d2083 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/RowPermissionsApi.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/api/RowPermissionsApi.java @@ -1,9 +1,9 @@ -package io.dataease.api.permissions.dataset.api; +package io.gisbi.api.permissions.dataset.api; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.dataease.api.permissions.dataset.dto.*; -import io.dataease.api.permissions.user.vo.UserFormVO; -import io.dataease.auth.DeApiPath; +import io.gisbi.api.permissions.dataset.dto.*; +import io.gisbi.api.permissions.user.vo.UserFormVO; +import io.gisbi.auth.DeApiPath; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; -import static io.dataease.constant.AuthResourceEnum.DATASET; +import static io.gisbi.constant.AuthResourceEnum.DATASET; @DeApiPath(value = "/dataset/rowPermissions", rt = DATASET) diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/BaseTreeNode.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/BaseTreeNode.java similarity index 84% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/BaseTreeNode.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/BaseTreeNode.java index 68ca325..f9769d7 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/BaseTreeNode.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/BaseTreeNode.java @@ -1,7 +1,7 @@ -package io.dataease.api.permissions.dataset.dto; +package io.gisbi.api.permissions.dataset.dto; -import io.dataease.model.ITreeBase; +import io.gisbi.model.ITreeBase; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DataSetColumnPermissionsDTO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/DataSetColumnPermissionsDTO.java similarity index 90% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DataSetColumnPermissionsDTO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/DataSetColumnPermissionsDTO.java index a5ccdca..bc44e31 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DataSetColumnPermissionsDTO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/DataSetColumnPermissionsDTO.java @@ -1,8 +1,8 @@ -package io.dataease.api.permissions.dataset.dto; +package io.gisbi.api.permissions.dataset.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.api.permissions.user.vo.UserFormVO; +import io.gisbi.api.permissions.user.vo.UserFormVO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DataSetRowPermissionsTreeDTO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/DataSetRowPermissionsTreeDTO.java similarity index 85% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DataSetRowPermissionsTreeDTO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/DataSetRowPermissionsTreeDTO.java index a437563..0d4cfa2 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DataSetRowPermissionsTreeDTO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/DataSetRowPermissionsTreeDTO.java @@ -1,10 +1,10 @@ -package io.dataease.api.permissions.dataset.dto; +package io.gisbi.api.permissions.dataset.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.api.permissions.role.vo.RoleVO; -import io.dataease.api.permissions.user.vo.UserFormVO; -import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeObj; +import io.gisbi.api.permissions.role.vo.RoleVO; +import io.gisbi.api.permissions.user.vo.UserFormVO; +import io.gisbi.extensions.view.dto.DatasetRowPermissionsTreeObj; import lombok.Getter; import lombok.Setter; @@ -63,8 +63,8 @@ public class DataSetRowPermissionsTreeDTO { private String datasetName; private String authTargetName; - private DatasetRowPermissionsTreeObj tree; + private List whiteListUsers; private List whiteListRoles; private List authTargetIds; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DatasetRowPermissionsTreeRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/DatasetRowPermissionsTreeRequest.java similarity index 84% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DatasetRowPermissionsTreeRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/DatasetRowPermissionsTreeRequest.java index 942be9b..98b9d79 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DatasetRowPermissionsTreeRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/DatasetRowPermissionsTreeRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.dataset.dto; +package io.gisbi.api.permissions.dataset.dto; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/Item.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/Item.java similarity index 85% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/Item.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/Item.java index b1e5f84..1c098b5 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/Item.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/Item.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.dataset.dto; +package io.gisbi.api.permissions.dataset.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/LangSwitchRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/LangSwitchRequest.java similarity index 83% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/LangSwitchRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/LangSwitchRequest.java index 3c7dc5a..bff445e 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/LangSwitchRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/LangSwitchRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.dataset.dto; +package io.gisbi.api.permissions.dataset.dto; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/WhiteListUsersRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/WhiteListUsersRequest.java similarity index 76% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/WhiteListUsersRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/WhiteListUsersRequest.java index 04690b9..03b509a 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/WhiteListUsersRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/dataset/dto/WhiteListUsersRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.dataset.dto; +package io.gisbi.api.permissions.dataset.dto; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/api/EmbeddedApi.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/api/EmbeddedApi.java similarity index 83% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/api/EmbeddedApi.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/api/EmbeddedApi.java index 960f806..701fbc6 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/api/EmbeddedApi.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/api/EmbeddedApi.java @@ -1,15 +1,14 @@ -package io.dataease.api.permissions.embedded.api; +package io.gisbi.api.permissions.embedded.api; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.permissions.embedded.dto.EmbeddedCreator; -import io.dataease.api.permissions.embedded.dto.EmbeddedEditor; -import io.dataease.api.permissions.embedded.dto.EmbeddedOrigin; -import io.dataease.api.permissions.embedded.dto.EmbeddedResetRequest; -import io.dataease.api.permissions.embedded.vo.EmbeddedGridVO; -import io.dataease.license.config.XpackResource; -import io.dataease.model.KeywordRequest; +import io.gisbi.api.permissions.embedded.dto.EmbeddedCreator; +import io.gisbi.api.permissions.embedded.dto.EmbeddedEditor; +import io.gisbi.api.permissions.embedded.dto.EmbeddedOrigin; +import io.gisbi.api.permissions.embedded.dto.EmbeddedResetRequest; +import io.gisbi.api.permissions.embedded.vo.EmbeddedGridVO; +import io.gisbi.model.KeywordRequest; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -25,9 +24,8 @@ import java.util.Map; @Tag(name = "嵌入式") @ApiSupport(order = 883, author = "fit2cloud-someone") -@XpackResource -public interface EmbeddedApi { +public interface EmbeddedApi { @Operation(summary = "查询") @ApiOperationSupport(order = 1) @PostMapping("/pager/{goPage}/{pageSize}") diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedCreator.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/dto/EmbeddedCreator.java similarity index 89% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedCreator.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/dto/EmbeddedCreator.java index 27974b5..31529bc 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedCreator.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/dto/EmbeddedCreator.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.embedded.dto; +package io.gisbi.api.permissions.embedded.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedEditor.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/dto/EmbeddedEditor.java similarity index 90% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedEditor.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/dto/EmbeddedEditor.java index 1083e8d..ca36ef4 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedEditor.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/dto/EmbeddedEditor.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.embedded.dto; +package io.gisbi.api.permissions.embedded.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedOrigin.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/dto/EmbeddedOrigin.java similarity index 77% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedOrigin.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/dto/EmbeddedOrigin.java index e1ae5b3..c4aad07 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedOrigin.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/dto/EmbeddedOrigin.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.embedded.dto; +package io.gisbi.api.permissions.embedded.dto; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedResetRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/dto/EmbeddedResetRequest.java similarity index 87% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedResetRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/dto/EmbeddedResetRequest.java index fdfbbb4..46c56d8 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedResetRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/dto/EmbeddedResetRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.embedded.dto; +package io.gisbi.api.permissions.embedded.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/vo/EmbeddedGridVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/vo/EmbeddedGridVO.java similarity index 94% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/vo/EmbeddedGridVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/vo/EmbeddedGridVO.java index 328d138..7a5d1d2 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/vo/EmbeddedGridVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/embedded/vo/EmbeddedGridVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.embedded.vo; +package io.gisbi.api.permissions.embedded.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/login/api/LoginApi.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/login/api/LoginApi.java similarity index 85% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/login/api/LoginApi.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/login/api/LoginApi.java index 417174a..9cad5c8 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/login/api/LoginApi.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/login/api/LoginApi.java @@ -1,13 +1,13 @@ -package io.dataease.api.permissions.login.api; +package io.gisbi.api.permissions.login.api; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.permissions.login.dto.MfaLoginDTO; -import io.dataease.api.permissions.login.dto.PwdLoginDTO; -import io.dataease.api.permissions.login.vo.MfaQrVO; -import io.dataease.api.permissions.user.dto.ModifyPwdRequest; -import io.dataease.auth.vo.TokenVO; +import io.gisbi.api.permissions.login.dto.MfaLoginDTO; +import io.gisbi.api.permissions.login.dto.PwdLoginDTO; +import io.gisbi.api.permissions.login.vo.MfaQrVO; +import io.gisbi.api.permissions.user.dto.ModifyPwdRequest; +import io.gisbi.auth.vo.TokenVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/login/dto/AccountLockStatus.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/login/dto/AccountLockStatus.java similarity index 89% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/login/dto/AccountLockStatus.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/login/dto/AccountLockStatus.java index e79b02b..3e979d3 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/login/dto/AccountLockStatus.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/login/dto/AccountLockStatus.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.login.dto; +package io.gisbi.api.permissions.login.dto; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/login/dto/MfaLoginDTO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/login/dto/MfaLoginDTO.java similarity index 86% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/login/dto/MfaLoginDTO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/login/dto/MfaLoginDTO.java index e636a75..c52dd38 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/login/dto/MfaLoginDTO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/login/dto/MfaLoginDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.login.dto; +package io.gisbi.api.permissions.login.dto; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/login/dto/PwdLoginDTO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/login/dto/PwdLoginDTO.java similarity index 92% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/login/dto/PwdLoginDTO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/login/dto/PwdLoginDTO.java index 49ec7e0..c2b8170 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/login/dto/PwdLoginDTO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/login/dto/PwdLoginDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.login.dto; +package io.gisbi.api.permissions.login.dto; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/login/vo/MfaQrVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/login/vo/MfaQrVO.java similarity index 85% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/login/vo/MfaQrVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/login/vo/MfaQrVO.java index 17733ea..8a3e364 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/login/vo/MfaQrVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/login/vo/MfaQrVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.login.vo; +package io.gisbi.api.permissions.login.vo; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/api/OrgApi.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/api/OrgApi.java similarity index 75% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/api/OrgApi.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/api/OrgApi.java index b42df9c..7036012 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/api/OrgApi.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/api/OrgApi.java @@ -1,15 +1,15 @@ -package io.dataease.api.permissions.org.api; +package io.gisbi.api.permissions.org.api; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.permissions.org.dto.OrgCreator; -import io.dataease.api.permissions.org.dto.OrgEditor; -import io.dataease.api.permissions.org.dto.OrgRequest; -import io.dataease.api.permissions.org.vo.MountedVO; -import io.dataease.api.permissions.org.vo.OrgDetailVO; -import io.dataease.api.permissions.org.vo.OrgPageVO; -import io.dataease.auth.DeApiPath; -import io.dataease.auth.DePermit; -import io.dataease.model.KeywordRequest; +import io.gisbi.api.permissions.org.dto.OrgCreator; +import io.gisbi.api.permissions.org.dto.OrgEditor; +import io.gisbi.api.permissions.org.dto.OrgRequest; +import io.gisbi.api.permissions.org.vo.MountedVO; +import io.gisbi.api.permissions.org.vo.OrgDetailVO; +import io.gisbi.api.permissions.org.vo.OrgPageVO; +import io.gisbi.auth.DeApiPath; +import io.gisbi.auth.DePermit; +import io.gisbi.model.KeywordRequest; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -21,8 +21,8 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; -import static io.dataease.constant.AuthResourceEnum.ORG; -import static io.dataease.constant.AuthResourceEnum.ROLE; +import static io.gisbi.constant.AuthResourceEnum.ORG; +import static io.gisbi.constant.AuthResourceEnum.ROLE; @Tag(name = "组织") @ApiSupport(order = 886, author = "fit2cloud-someone") diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgCreator.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/dto/OrgCreator.java similarity index 91% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgCreator.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/dto/OrgCreator.java index 4eb01bd..bf7cd46 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgCreator.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/dto/OrgCreator.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.org.dto; +package io.gisbi.api.permissions.org.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgEditor.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/dto/OrgEditor.java similarity index 90% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgEditor.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/dto/OrgEditor.java index e136b82..49bcc4b 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgEditor.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/dto/OrgEditor.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.org.dto; +package io.gisbi.api.permissions.org.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/dto/OrgRequest.java similarity index 86% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/dto/OrgRequest.java index 89c9b5b..b0c3e62 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/dto/OrgRequest.java @@ -1,6 +1,6 @@ -package io.dataease.api.permissions.org.dto; +package io.gisbi.api.permissions.org.dto; -import io.dataease.model.KeywordRequest; +import io.gisbi.model.KeywordRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/MountedVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/vo/MountedVO.java similarity index 94% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/MountedVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/vo/MountedVO.java index d12fb36..0e56af2 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/MountedVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/vo/MountedVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.org.vo; +package io.gisbi.api.permissions.org.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/OrgDetailVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/vo/OrgDetailVO.java similarity index 85% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/OrgDetailVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/vo/OrgDetailVO.java index bdf8c1c..689a486 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/OrgDetailVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/vo/OrgDetailVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.org.vo; +package io.gisbi.api.permissions.org.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/OrgPageVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/vo/OrgPageVO.java similarity index 95% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/OrgPageVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/vo/OrgPageVO.java index 272cab7..b92dc63 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/OrgPageVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/org/vo/OrgPageVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.org.vo; +package io.gisbi.api.permissions.org.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/relation/api/RelationApi.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/relation/api/RelationApi.java similarity index 65% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/relation/api/RelationApi.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/relation/api/RelationApi.java index dd43769..bc2371c 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/relation/api/RelationApi.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/relation/api/RelationApi.java @@ -1,6 +1,6 @@ -package io.dataease.api.permissions.relation.api; +package io.gisbi.api.permissions.relation.api; -import io.dataease.exception.DEException; +import io.gisbi.exception.DEException; /** * @Author Junjun diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/relation/dto/RelationDTO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/relation/dto/RelationDTO.java similarity index 90% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/relation/dto/RelationDTO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/relation/dto/RelationDTO.java index 53a993c..9455ea8 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/relation/dto/RelationDTO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/relation/dto/RelationDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.relation.dto; +package io.gisbi.api.permissions.relation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/relation/dto/RelationListDTO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/relation/dto/RelationListDTO.java similarity index 92% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/relation/dto/RelationListDTO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/relation/dto/RelationListDTO.java index 25f0580..9df6705 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/relation/dto/RelationListDTO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/relation/dto/RelationListDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.relation.dto; +package io.gisbi.api.permissions.relation.dto; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/api/RoleApi.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/api/RoleApi.java similarity index 88% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/api/RoleApi.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/api/RoleApi.java index 34e7145..b0e8c6a 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/api/RoleApi.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/api/RoleApi.java @@ -1,13 +1,13 @@ -package io.dataease.api.permissions.role.api; +package io.gisbi.api.permissions.role.api; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.permissions.role.dto.*; -import io.dataease.api.permissions.role.vo.ExternalUserVO; -import io.dataease.api.permissions.role.vo.RoleDetailVO; -import io.dataease.api.permissions.role.vo.RoleVO; -import io.dataease.auth.DeApiPath; -import io.dataease.auth.DePermit; -import io.dataease.model.KeywordRequest; +import io.gisbi.api.permissions.role.dto.*; +import io.gisbi.api.permissions.role.vo.ExternalUserVO; +import io.gisbi.api.permissions.role.vo.RoleDetailVO; +import io.gisbi.api.permissions.role.vo.RoleVO; +import io.gisbi.auth.DeApiPath; +import io.gisbi.auth.DePermit; +import io.gisbi.model.KeywordRequest; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; -import static io.dataease.constant.AuthResourceEnum.ROLE; +import static io.gisbi.constant.AuthResourceEnum.ROLE; @Tag(name = "角色") @ApiSupport(order = 887, author = "fit2cloud-someone") diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/MountExternalUserRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/MountExternalUserRequest.java similarity index 90% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/MountExternalUserRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/MountExternalUserRequest.java index 821aa9e..701b6b5 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/MountExternalUserRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/MountExternalUserRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.role.dto; +package io.gisbi.api.permissions.role.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/MountUserRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/MountUserRequest.java similarity index 90% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/MountUserRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/MountUserRequest.java index b1767ec..44ecc92 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/MountUserRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/MountUserRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.role.dto; +package io.gisbi.api.permissions.role.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/RoleCopyRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/RoleCopyRequest.java similarity index 86% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/RoleCopyRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/RoleCopyRequest.java index facd13e..bf0d2b5 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/RoleCopyRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/RoleCopyRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.role.dto; +package io.gisbi.api.permissions.role.dto; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/RoleCreator.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/RoleCreator.java similarity index 94% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/RoleCreator.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/RoleCreator.java index a9add0f..b109a12 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/RoleCreator.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/RoleCreator.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.role.dto; +package io.gisbi.api.permissions.role.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/RoleEditor.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/RoleEditor.java similarity index 92% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/RoleEditor.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/RoleEditor.java index 1a14fb9..a52ff4e 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/RoleEditor.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/RoleEditor.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.role.dto; +package io.gisbi.api.permissions.role.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/RoleRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/RoleRequest.java similarity index 82% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/RoleRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/RoleRequest.java index 2c98a71..ebf50f0 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/RoleRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/RoleRequest.java @@ -1,6 +1,6 @@ -package io.dataease.api.permissions.role.dto; +package io.gisbi.api.permissions.role.dto; -import io.dataease.model.KeywordRequest; +import io.gisbi.model.KeywordRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/UnmountUserRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/UnmountUserRequest.java similarity index 91% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/UnmountUserRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/UnmountUserRequest.java index 58dea48..dfa1ba6 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/UnmountUserRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/UnmountUserRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.role.dto; +package io.gisbi.api.permissions.role.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/UserRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/UserRequest.java similarity index 85% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/UserRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/UserRequest.java index 6c12ab1..c08e234 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/dto/UserRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/dto/UserRequest.java @@ -1,6 +1,6 @@ -package io.dataease.api.permissions.role.dto; +package io.gisbi.api.permissions.role.dto; -import io.dataease.model.KeywordRequest; +import io.gisbi.model.KeywordRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/vo/ExternalUserVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/vo/ExternalUserVO.java similarity index 94% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/vo/ExternalUserVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/vo/ExternalUserVO.java index 2000df0..4a97f59 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/vo/ExternalUserVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/vo/ExternalUserVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.role.vo; +package io.gisbi.api.permissions.role.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/vo/RoleDetailVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/vo/RoleDetailVO.java similarity index 82% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/vo/RoleDetailVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/vo/RoleDetailVO.java index ec53c0d..8c7b681 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/vo/RoleDetailVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/vo/RoleDetailVO.java @@ -1,8 +1,8 @@ -package io.dataease.api.permissions.role.vo; +package io.gisbi.api.permissions.role.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.api.permissions.role.dto.RoleCreator; +import io.gisbi.api.permissions.role.dto.RoleCreator; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/vo/RoleVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/vo/RoleVO.java similarity index 94% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/vo/RoleVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/vo/RoleVO.java index c67df4c..bfb8d67 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/vo/RoleVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/role/vo/RoleVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.role.vo; +package io.gisbi.api.permissions.role.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/setting/api/PerSettingApi.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/setting/api/PerSettingApi.java similarity index 87% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/setting/api/PerSettingApi.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/setting/api/PerSettingApi.java index 489aca9..9da45e6 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/setting/api/PerSettingApi.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/setting/api/PerSettingApi.java @@ -1,8 +1,7 @@ -package io.dataease.api.permissions.setting.api; +package io.gisbi.api.permissions.setting.api; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.permissions.setting.vo.PerSettingItemVO; -import io.dataease.license.config.XpackResource; +import io.gisbi.api.permissions.setting.vo.PerSettingItemVO; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -15,7 +14,6 @@ import java.util.List; @Tag(name = "认证相关设置") @ApiSupport(order = 882) -@XpackResource public interface PerSettingApi { @Operation(summary = "查询设置") diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/setting/vo/PerSettingItemVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/setting/vo/PerSettingItemVO.java similarity index 91% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/setting/vo/PerSettingItemVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/setting/vo/PerSettingItemVO.java index 74435db..f77f368 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/setting/vo/PerSettingItemVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/setting/vo/PerSettingItemVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.setting.vo; +package io.gisbi.api.permissions.setting.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/api/UserApi.java similarity index 93% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/api/UserApi.java index 96117cf..925a435 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/api/UserApi.java @@ -1,16 +1,16 @@ -package io.dataease.api.permissions.user.api; +package io.gisbi.api.permissions.user.api; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.permissions.login.dto.MfaLoginDTO; -import io.dataease.api.permissions.login.vo.MfaQrVO; -import io.dataease.api.permissions.role.dto.UserRequest; -import io.dataease.api.permissions.user.dto.*; -import io.dataease.api.permissions.user.vo.*; -import io.dataease.auth.DeApiPath; -import io.dataease.auth.DePermit; -import io.dataease.auth.vo.TokenVO; -import io.dataease.model.KeywordRequest; +import io.gisbi.api.permissions.login.dto.MfaLoginDTO; +import io.gisbi.api.permissions.login.vo.MfaQrVO; +import io.gisbi.api.permissions.role.dto.UserRequest; +import io.gisbi.api.permissions.user.dto.*; +import io.gisbi.api.permissions.user.vo.*; +import io.gisbi.auth.DeApiPath; +import io.gisbi.auth.DePermit; +import io.gisbi.auth.vo.TokenVO; +import io.gisbi.model.KeywordRequest; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -23,7 +23,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; import java.util.Map; -import static io.dataease.constant.AuthResourceEnum.USER; +import static io.gisbi.constant.AuthResourceEnum.USER; @Tag(name = "用户") diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/bo/PlatformUser.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/bo/PlatformUser.java similarity index 91% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/bo/PlatformUser.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/bo/PlatformUser.java index ce89bab..3dc679b 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/bo/PlatformUser.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/bo/PlatformUser.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.user.bo; +package io.gisbi.api.permissions.user.bo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/EnableSwitchRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/EnableSwitchRequest.java similarity index 92% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/EnableSwitchRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/EnableSwitchRequest.java index 9a31c43..750d707 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/EnableSwitchRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/EnableSwitchRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.user.dto; +package io.gisbi.api.permissions.user.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/LangSwitchRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/LangSwitchRequest.java similarity index 90% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/LangSwitchRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/LangSwitchRequest.java index b47b61c..7412580 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/LangSwitchRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/LangSwitchRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.user.dto; +package io.gisbi.api.permissions.user.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/ModifyPwdRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/ModifyPwdRequest.java similarity index 92% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/ModifyPwdRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/ModifyPwdRequest.java index 39e94f2..f65905b 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/ModifyPwdRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/ModifyPwdRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.user.dto; +package io.gisbi.api.permissions.user.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserBindRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/UserBindRequest.java similarity index 78% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserBindRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/UserBindRequest.java index 5f3f5b3..03b1a7e 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserBindRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/UserBindRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.user.dto; +package io.gisbi.api.permissions.user.dto; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserCreator.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/UserCreator.java similarity index 91% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserCreator.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/UserCreator.java index 11e54fe..5d72794 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserCreator.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/UserCreator.java @@ -1,7 +1,7 @@ -package io.dataease.api.permissions.user.dto; +package io.gisbi.api.permissions.user.dto; import com.fasterxml.jackson.annotation.JsonIgnore; -import io.dataease.api.permissions.variable.dto.SysVariableValueItem; +import io.gisbi.api.permissions.variable.dto.SysVariableValueItem; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserEditor.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/UserEditor.java similarity index 90% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserEditor.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/UserEditor.java index 614072e..43b490a 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserEditor.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/UserEditor.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.user.dto; +package io.gisbi.api.permissions.user.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserGridRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/UserGridRequest.java similarity index 81% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserGridRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/UserGridRequest.java index 0cefb41..8d0743b 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserGridRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/UserGridRequest.java @@ -1,6 +1,6 @@ -package io.dataease.api.permissions.user.dto; +package io.gisbi.api.permissions.user.dto; -import io.dataease.model.KeywordRequest; +import io.gisbi.model.KeywordRequest; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserReciRequest.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/UserReciRequest.java similarity index 87% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserReciRequest.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/UserReciRequest.java index a651113..d0c1f8d 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserReciRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/dto/UserReciRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.user.dto; +package io.gisbi.api.permissions.user.dto; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/CurIpVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/CurIpVO.java similarity index 86% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/CurIpVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/CurIpVO.java index e135bd1..376c55b 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/CurIpVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/CurIpVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.user.vo; +package io.gisbi.api.permissions.user.vo; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/CurUserVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/CurUserVO.java similarity index 94% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/CurUserVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/CurUserVO.java index 75ec610..3a4b329 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/CurUserVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/CurUserVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.user.vo; +package io.gisbi.api.permissions.user.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserFormVO.java similarity index 91% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserFormVO.java index 9a357de..0b7bd31 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserFormVO.java @@ -1,8 +1,8 @@ -package io.dataease.api.permissions.user.vo; +package io.gisbi.api.permissions.user.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.api.permissions.variable.dto.SysVariableValueItem; +import io.gisbi.api.permissions.variable.dto.SysVariableValueItem; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridRoleItem.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserGridRoleItem.java similarity index 85% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridRoleItem.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserGridRoleItem.java index 27fabeb..454896f 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridRoleItem.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserGridRoleItem.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.user.vo; +package io.gisbi.api.permissions.user.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserGridVO.java similarity index 96% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserGridVO.java index 7c59307..20640e4 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserGridVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.user.vo; +package io.gisbi.api.permissions.user.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserImportVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserImportVO.java similarity index 94% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserImportVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserImportVO.java index 3e071da..7fd682a 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserImportVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserImportVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.user.vo; +package io.gisbi.api.permissions.user.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserItem.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserItem.java similarity index 93% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserItem.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserItem.java index 060214c..c518205 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserItem.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserItem.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.user.vo; +package io.gisbi.api.permissions.user.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserItemVO.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserItemVO.java similarity index 94% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserItemVO.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserItemVO.java index 6d54d50..54f79d6 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserItemVO.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/user/vo/UserItemVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.user.vo; +package io.gisbi.api.permissions.user.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/variable/api/SysVariablesApi.java similarity index 88% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/variable/api/SysVariablesApi.java index 0c094f7..34dbb37 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/variable/api/SysVariablesApi.java @@ -1,11 +1,11 @@ -package io.dataease.api.permissions.variable.api; +package io.gisbi.api.permissions.variable.api; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.permissions.variable.dto.SysVariableDto; -import io.dataease.api.permissions.variable.dto.SysVariableValueDto; -import io.dataease.auth.DeApiPath; +import io.gisbi.api.permissions.variable.dto.SysVariableDto; +import io.gisbi.api.permissions.variable.dto.SysVariableValueDto; +import io.gisbi.auth.DeApiPath; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; -import static io.dataease.constant.AuthResourceEnum.SYSTEM; +import static io.gisbi.constant.AuthResourceEnum.SYSTEM; @Tag(name = "系统变量") @ApiSupport(order = 881, author = "fit2cloud-someone") diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableDto.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/variable/dto/SysVariableDto.java similarity index 92% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableDto.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/variable/dto/SysVariableDto.java index 506e077..90b7c1f 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableDto.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/variable/dto/SysVariableDto.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.variable.dto; +package io.gisbi.api.permissions.variable.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableValueDto.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/variable/dto/SysVariableValueDto.java similarity index 89% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableValueDto.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/variable/dto/SysVariableValueDto.java index 3dbe0bc..36bf8dc 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableValueDto.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/variable/dto/SysVariableValueDto.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.variable.dto; +package io.gisbi.api.permissions.variable.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableValueItem.java b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/variable/dto/SysVariableValueItem.java similarity index 94% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableValueItem.java rename to sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/variable/dto/SysVariableValueItem.java index 15b2d1e..168a894 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableValueItem.java +++ b/sdk/api/api-permissions/src/main/java/io/gisbi/api/permissions/variable/dto/SysVariableValueItem.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.variable.dto; +package io.gisbi.api.permissions.variable.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-sync/pom.xml b/sdk/api/api-sync/pom.xml index d334f83..601b966 100644 --- a/sdk/api/api-sync/pom.xml +++ b/sdk/api/api-sync/pom.xml @@ -4,9 +4,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> api - io.dataease - ${dataease.version} + io.gisbi + 1.0.0 + + + com.baomidou + mybatis-plus-core + 3.5.6 + compile + + 4.0.0 api-sync diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/api/SyncDatasourceApi.java similarity index 83% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/api/SyncDatasourceApi.java index 999ded9..379f685 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/api/SyncDatasourceApi.java @@ -1,13 +1,13 @@ -package io.dataease.api.sync.datasource.api; +package io.gisbi.api.sync.datasource.api; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.dataease.api.sync.datasource.dto.DBTableDTO; -import io.dataease.api.sync.datasource.dto.DatasourceGridRequest; -import io.dataease.api.sync.datasource.dto.GetDatasourceRequest; -import io.dataease.api.sync.datasource.dto.SyncDatasourceDTO; -import io.dataease.api.sync.datasource.vo.SyncDatasourceVO; -import io.dataease.auth.DeApiPath; -import io.dataease.exception.DEException; +import io.gisbi.api.sync.datasource.dto.DBTableDTO; +import io.gisbi.api.sync.datasource.dto.DatasourceGridRequest; +import io.gisbi.api.sync.datasource.dto.GetDatasourceRequest; +import io.gisbi.api.sync.datasource.dto.SyncDatasourceDTO; +import io.gisbi.api.sync.datasource.vo.SyncDatasourceVO; +import io.gisbi.auth.DeApiPath; +import io.gisbi.exception.DEException; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; -import static io.dataease.constant.AuthResourceEnum.SYNC_DATASOURCE; +import static io.gisbi.constant.AuthResourceEnum.SYNC_DATASOURCE; /** * @author fit2cloud diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/DBTableDTO.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/dto/DBTableDTO.java similarity index 86% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/DBTableDTO.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/dto/DBTableDTO.java index a8112d8..0792cc3 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/DBTableDTO.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/dto/DBTableDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.sync.datasource.dto; +package io.gisbi.api.sync.datasource.dto; import lombok.Getter; import lombok.Setter; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/DatasourceGridRequest.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/dto/DatasourceGridRequest.java similarity index 79% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/DatasourceGridRequest.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/dto/DatasourceGridRequest.java index 27bd525..48918ff 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/DatasourceGridRequest.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/dto/DatasourceGridRequest.java @@ -1,6 +1,6 @@ -package io.dataease.api.sync.datasource.dto; +package io.gisbi.api.sync.datasource.dto; -import io.dataease.model.KeywordRequest; +import io.gisbi.model.KeywordRequest; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/GetDatasourceRequest.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/dto/GetDatasourceRequest.java similarity index 87% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/GetDatasourceRequest.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/dto/GetDatasourceRequest.java index 2818c7c..acd0293 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/GetDatasourceRequest.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/dto/GetDatasourceRequest.java @@ -1,4 +1,4 @@ -package io.dataease.api.sync.datasource.dto; +package io.gisbi.api.sync.datasource.dto; import lombok.Data; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/SyncDatasourceDTO.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/dto/SyncDatasourceDTO.java similarity index 94% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/SyncDatasourceDTO.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/dto/SyncDatasourceDTO.java index 8c8146f..038f776 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/SyncDatasourceDTO.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/dto/SyncDatasourceDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.sync.datasource.dto; +package io.gisbi.api.sync.datasource.dto; import lombok.Data; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/vo/SyncDatasourceVO.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/vo/SyncDatasourceVO.java similarity index 94% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/vo/SyncDatasourceVO.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/vo/SyncDatasourceVO.java index 385b8a9..1ff5a4a 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/vo/SyncDatasourceVO.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/datasource/vo/SyncDatasourceVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.sync.datasource.vo; +package io.gisbi.api.sync.datasource.vo; import lombok.Data; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/summary/api/SummaryApi.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/summary/api/SummaryApi.java similarity index 79% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/summary/api/SummaryApi.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/summary/api/SummaryApi.java index 9e83033..11d7b90 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/summary/api/SummaryApi.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/summary/api/SummaryApi.java @@ -1,13 +1,13 @@ -package io.dataease.api.sync.summary.api; +package io.gisbi.api.sync.summary.api; -import io.dataease.auth.DeApiPath; +import io.gisbi.auth.DeApiPath; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import java.util.Map; -import static io.dataease.constant.AuthResourceEnum.SUMMARY; +import static io.gisbi.constant.AuthResourceEnum.SUMMARY; /** * @author fit2cloud diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskApi.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/api/TaskApi.java similarity index 85% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskApi.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/api/TaskApi.java index bd8ebe0..cf1bb21 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskApi.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/api/TaskApi.java @@ -1,19 +1,19 @@ -package io.dataease.api.sync.task.api; +package io.gisbi.api.sync.task.api; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.sync.task.dto.TaskGridRequest; -import io.dataease.api.sync.task.dto.TaskInfoDTO; -import io.dataease.api.sync.task.vo.TaskInfoVO; -import io.dataease.auth.DeApiPath; -import io.dataease.exception.DEException; +import io.gisbi.api.sync.task.dto.TaskGridRequest; +import io.gisbi.api.sync.task.dto.TaskInfoDTO; +import io.gisbi.api.sync.task.vo.TaskInfoVO; +import io.gisbi.auth.DeApiPath; +import io.gisbi.exception.DEException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; import java.util.List; -import static io.dataease.constant.AuthResourceEnum.TASK; +import static io.gisbi.constant.AuthResourceEnum.TASK; /** * @author fit2cloud diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskLogApi.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/api/TaskLogApi.java similarity index 82% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskLogApi.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/api/TaskLogApi.java index 3e11737..30523ad 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskLogApi.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/api/TaskLogApi.java @@ -1,17 +1,17 @@ -package io.dataease.api.sync.task.api; +package io.gisbi.api.sync.task.api; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.dataease.api.sync.task.dto.TaskLogGridRequest; -import io.dataease.api.sync.task.vo.LogResultVO; -import io.dataease.api.sync.task.vo.TaskLogVO; -import io.dataease.auth.DeApiPath; +import io.gisbi.api.sync.task.dto.TaskLogGridRequest; +import io.gisbi.api.sync.task.vo.LogResultVO; +import io.gisbi.api.sync.task.vo.TaskLogVO; +import io.gisbi.auth.DeApiPath; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import io.swagger.v3.oas.annotations.Hidden; -import static io.dataease.constant.AuthResourceEnum.TASK; +import static io.gisbi.constant.AuthResourceEnum.TASK; /** * @author fit2cloud diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Source.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/Source.java similarity index 80% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Source.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/Source.java index 5fba8e1..8e85e36 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Source.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/Source.java @@ -1,6 +1,6 @@ -package io.dataease.api.sync.task.dto; +package io.gisbi.api.sync.task.dto; -import io.dataease.api.sync.datasource.dto.SyncDatasourceDTO; +import io.gisbi.api.sync.datasource.dto.SyncDatasourceDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TableField.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/TableField.java similarity index 92% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TableField.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/TableField.java index 092b14b..e3106c3 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TableField.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/TableField.java @@ -1,4 +1,4 @@ -package io.dataease.api.sync.task.dto; +package io.gisbi.api.sync.task.dto; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Target.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/Target.java similarity index 84% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Target.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/Target.java index d32cccc..b05efaf 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Target.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/Target.java @@ -1,6 +1,6 @@ -package io.dataease.api.sync.task.dto; +package io.gisbi.api.sync.task.dto; -import io.dataease.api.sync.datasource.dto.SyncDatasourceDTO; +import io.gisbi.api.sync.datasource.dto.SyncDatasourceDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskGridRequest.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/TaskGridRequest.java similarity index 82% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskGridRequest.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/TaskGridRequest.java index 71402d0..9fa16c6 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskGridRequest.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/TaskGridRequest.java @@ -1,6 +1,6 @@ -package io.dataease.api.sync.task.dto; +package io.gisbi.api.sync.task.dto; -import io.dataease.model.KeywordRequest; +import io.gisbi.model.KeywordRequest; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskInfoDTO.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/TaskInfoDTO.java similarity index 98% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskInfoDTO.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/TaskInfoDTO.java index eb4d6e2..dcc917d 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskInfoDTO.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/TaskInfoDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.sync.task.dto; +package io.gisbi.api.sync.task.dto; import lombok.Data; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskLogGridRequest.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/TaskLogGridRequest.java similarity index 80% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskLogGridRequest.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/TaskLogGridRequest.java index fa7ab8a..0264d80 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskLogGridRequest.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/dto/TaskLogGridRequest.java @@ -1,6 +1,6 @@ -package io.dataease.api.sync.task.dto; +package io.gisbi.api.sync.task.dto; -import io.dataease.model.KeywordRequest; +import io.gisbi.model.KeywordRequest; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/vo/LogResultVO.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/vo/LogResultVO.java similarity index 94% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/vo/LogResultVO.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/vo/LogResultVO.java index f69791b..93aeb00 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/vo/LogResultVO.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/vo/LogResultVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.sync.task.vo; +package io.gisbi.api.sync.task.vo; import lombok.Getter; import lombok.Setter; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/vo/TaskInfoVO.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/vo/TaskInfoVO.java similarity index 95% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/vo/TaskInfoVO.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/vo/TaskInfoVO.java index a36bca7..8ecec7a 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/vo/TaskInfoVO.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/vo/TaskInfoVO.java @@ -1,7 +1,7 @@ -package io.dataease.api.sync.task.vo; +package io.gisbi.api.sync.task.vo; -import io.dataease.api.sync.task.dto.Source; -import io.dataease.api.sync.task.dto.Target; +import io.gisbi.api.sync.task.dto.Source; +import io.gisbi.api.sync.task.dto.Target; import lombok.Data; import java.time.LocalDateTime; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/vo/TaskLogVO.java b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/vo/TaskLogVO.java similarity index 91% rename from sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/vo/TaskLogVO.java rename to sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/vo/TaskLogVO.java index 44289bc..82caa32 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/vo/TaskLogVO.java +++ b/sdk/api/api-sync/src/main/java/io/gisbi/api/sync/task/vo/TaskLogVO.java @@ -1,4 +1,4 @@ -package io.dataease.api.sync.task.vo; +package io.gisbi.api.sync.task.vo; import lombok.Data; diff --git a/sdk/api/pom.xml b/sdk/api/pom.xml index d9f8c90..bc62132 100644 --- a/sdk/api/pom.xml +++ b/sdk/api/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> sdk - io.dataease - ${dataease.version} + io.gisbi + 1.0.0 4.0.0 @@ -21,15 +21,9 @@ - io.dataease + io.gisbi common - ${project.version} - - - - io.dataease - dataease-license-sdk - ${project.version} + 1.0.0 diff --git a/sdk/common/pom.xml b/sdk/common/pom.xml index 92d6c9f..7a41874 100644 --- a/sdk/common/pom.xml +++ b/sdk/common/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> sdk - io.dataease - ${dataease.version} + io.gisbi + 1.0.0 4.0.0 @@ -124,18 +124,6 @@ - - io.dataease - extensions-view - ${project.version} - - - - io.dataease - extensions-datafilling - ${project.version} - - diff --git a/sdk/common/src/main/java/io/dataease/auth/DeApiPath.java b/sdk/common/src/main/java/io/gisbi/auth/DeApiPath.java similarity index 82% rename from sdk/common/src/main/java/io/dataease/auth/DeApiPath.java rename to sdk/common/src/main/java/io/gisbi/auth/DeApiPath.java index 121a75c..317cc50 100644 --- a/sdk/common/src/main/java/io/dataease/auth/DeApiPath.java +++ b/sdk/common/src/main/java/io/gisbi/auth/DeApiPath.java @@ -1,6 +1,6 @@ -package io.dataease.auth; +package io.gisbi.auth; -import io.dataease.constant.AuthResourceEnum; +import io.gisbi.constant.AuthResourceEnum; import org.springframework.core.annotation.AliasFor; import java.lang.annotation.*; diff --git a/sdk/common/src/main/java/io/dataease/auth/DeLinkPermit.java b/sdk/common/src/main/java/io/gisbi/auth/DeLinkPermit.java similarity index 87% rename from sdk/common/src/main/java/io/dataease/auth/DeLinkPermit.java rename to sdk/common/src/main/java/io/gisbi/auth/DeLinkPermit.java index 46eba5e..318147b 100644 --- a/sdk/common/src/main/java/io/dataease/auth/DeLinkPermit.java +++ b/sdk/common/src/main/java/io/gisbi/auth/DeLinkPermit.java @@ -1,4 +1,4 @@ -package io.dataease.auth; +package io.gisbi.auth; import java.lang.annotation.*; diff --git a/sdk/common/src/main/java/io/dataease/auth/DePermit.java b/sdk/common/src/main/java/io/gisbi/auth/DePermit.java similarity index 92% rename from sdk/common/src/main/java/io/dataease/auth/DePermit.java rename to sdk/common/src/main/java/io/gisbi/auth/DePermit.java index 3c7b668..5426b6e 100644 --- a/sdk/common/src/main/java/io/dataease/auth/DePermit.java +++ b/sdk/common/src/main/java/io/gisbi/auth/DePermit.java @@ -1,4 +1,4 @@ -package io.dataease.auth; +package io.gisbi.auth; import java.lang.annotation.*; diff --git a/sdk/common/src/main/java/io/dataease/auth/bo/LinkTokenUserBO.java b/sdk/common/src/main/java/io/gisbi/auth/bo/LinkTokenUserBO.java similarity index 75% rename from sdk/common/src/main/java/io/dataease/auth/bo/LinkTokenUserBO.java rename to sdk/common/src/main/java/io/gisbi/auth/bo/LinkTokenUserBO.java index a7809ea..a8fa062 100644 --- a/sdk/common/src/main/java/io/dataease/auth/bo/LinkTokenUserBO.java +++ b/sdk/common/src/main/java/io/gisbi/auth/bo/LinkTokenUserBO.java @@ -1,4 +1,4 @@ -package io.dataease.auth.bo; +package io.gisbi.auth.bo; import java.io.Serializable; diff --git a/sdk/common/src/main/java/io/dataease/auth/bo/TokenUserBO.java b/sdk/common/src/main/java/io/gisbi/auth/bo/TokenUserBO.java similarity index 92% rename from sdk/common/src/main/java/io/dataease/auth/bo/TokenUserBO.java rename to sdk/common/src/main/java/io/gisbi/auth/bo/TokenUserBO.java index 6e34c54..1f17497 100644 --- a/sdk/common/src/main/java/io/dataease/auth/bo/TokenUserBO.java +++ b/sdk/common/src/main/java/io/gisbi/auth/bo/TokenUserBO.java @@ -1,4 +1,4 @@ -package io.dataease.auth.bo; +package io.gisbi.auth.bo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sdk/common/src/main/java/io/dataease/auth/config/SubstituleLoginConfig.java b/sdk/common/src/main/java/io/gisbi/auth/config/SubstituleLoginConfig.java similarity index 95% rename from sdk/common/src/main/java/io/dataease/auth/config/SubstituleLoginConfig.java rename to sdk/common/src/main/java/io/gisbi/auth/config/SubstituleLoginConfig.java index ee742cb..1a58ae8 100644 --- a/sdk/common/src/main/java/io/dataease/auth/config/SubstituleLoginConfig.java +++ b/sdk/common/src/main/java/io/gisbi/auth/config/SubstituleLoginConfig.java @@ -1,8 +1,8 @@ -package io.dataease.auth.config; +package io.gisbi.auth.config; import com.fasterxml.jackson.databind.ObjectMapper; -import io.dataease.utils.CommonBeanFactory; -import io.dataease.utils.LogUtil; +import io.gisbi.utils.CommonBeanFactory; +import io.gisbi.utils.LogUtil; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/sdk/common/src/main/java/io/dataease/auth/filter/CommunityTokenFilter.java b/sdk/common/src/main/java/io/gisbi/auth/filter/CommunityTokenFilter.java similarity index 93% rename from sdk/common/src/main/java/io/dataease/auth/filter/CommunityTokenFilter.java rename to sdk/common/src/main/java/io/gisbi/auth/filter/CommunityTokenFilter.java index 91211b4..e8e2fc8 100644 --- a/sdk/common/src/main/java/io/dataease/auth/filter/CommunityTokenFilter.java +++ b/sdk/common/src/main/java/io/gisbi/auth/filter/CommunityTokenFilter.java @@ -1,14 +1,13 @@ -package io.dataease.auth.filter; +package io.gisbi.auth.filter; import com.auth0.jwt.JWT; import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.interfaces.DecodedJWT; import com.auth0.jwt.interfaces.Verification; -import io.dataease.auth.bo.TokenUserBO; -import io.dataease.auth.config.SubstituleLoginConfig; -import io.dataease.license.utils.LicenseUtil; -import io.dataease.utils.*; +import io.gisbi.auth.bo.TokenUserBO; +import io.gisbi.auth.config.SubstituleLoginConfig; +import io.gisbi.utils.*; import jakarta.servlet.*; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.ObjectUtils; @@ -34,7 +33,7 @@ public class CommunityTokenFilter implements Filter { Long userId = null; String token = ServletUtils.getToken(); TokenUserBO userBO = null; - if (StringUtils.isNotBlank(token) && ObjectUtils.isNotEmpty(userBO = AuthUtils.getUser()) && ObjectUtils.isNotEmpty(userId = userBO.getUserId()) && !LicenseUtil.licenseValid()) { + if (StringUtils.isNotBlank(token) && ObjectUtils.isNotEmpty(userBO = AuthUtils.getUser()) && ObjectUtils.isNotEmpty(userId = userBO.getUserId()) ) { String secret = null; if (ObjectUtils.isEmpty(CommonBeanFactory.getBean("loginServer"))) { String pwd = SubstituleLoginConfig.getPwd(); diff --git a/sdk/common/src/main/java/io/dataease/auth/filter/FilterConfig.java b/sdk/common/src/main/java/io/gisbi/auth/filter/FilterConfig.java similarity index 96% rename from sdk/common/src/main/java/io/dataease/auth/filter/FilterConfig.java rename to sdk/common/src/main/java/io/gisbi/auth/filter/FilterConfig.java index e37b120..96990c0 100644 --- a/sdk/common/src/main/java/io/dataease/auth/filter/FilterConfig.java +++ b/sdk/common/src/main/java/io/gisbi/auth/filter/FilterConfig.java @@ -1,4 +1,4 @@ -package io.dataease.auth.filter; +package io.gisbi.auth.filter; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; diff --git a/sdk/common/src/main/java/io/dataease/auth/filter/TokenFilter.java b/sdk/common/src/main/java/io/gisbi/auth/filter/TokenFilter.java similarity index 80% rename from sdk/common/src/main/java/io/dataease/auth/filter/TokenFilter.java rename to sdk/common/src/main/java/io/gisbi/auth/filter/TokenFilter.java index 37edca8..f019675 100644 --- a/sdk/common/src/main/java/io/dataease/auth/filter/TokenFilter.java +++ b/sdk/common/src/main/java/io/gisbi/auth/filter/TokenFilter.java @@ -1,11 +1,10 @@ -package io.dataease.auth.filter; +package io.gisbi.auth.filter; -import io.dataease.auth.bo.TokenUserBO; -import io.dataease.constant.AuthConstant; -import io.dataease.exception.DEException; -import io.dataease.license.utils.LicenseUtil; -import io.dataease.result.ResultMessage; -import io.dataease.utils.*; +import io.gisbi.auth.bo.TokenUserBO; +import io.gisbi.constant.AuthConstant; +import io.gisbi.exception.DEException; +import io.gisbi.result.ResultMessage; +import io.gisbi.utils.*; import jakarta.servlet.*; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -82,18 +81,7 @@ public class TokenFilter implements Filter { UserUtils.setUserInfo(userBO); filterChain.doFilter(servletRequest, servletResponse); } catch (Exception e) { - if (!LicenseUtil.licenseValid()) { - HttpServletResponse res = (HttpServletResponse) servletResponse; - ResultMessage resultMessage = new ResultMessage(HttpStatus.UNAUTHORIZED.value(), e.getMessage()); - HttpHeaders headers = new HttpHeaders(); - String msg = URLEncoder.encode(e.getMessage(), StandardCharsets.UTF_8).replace("+", "%20"); - headers.add(headName, msg); - ResponseEntity entity = new ResponseEntity<>(resultMessage, headers, HttpStatus.UNAUTHORIZED); - sendResponseEntity(res, entity); - LogUtil.error(e.getMessage(), e); - } else { - throw e; - } + throw e; } finally { UserUtils.removeUser(); } diff --git a/sdk/common/src/main/java/io/dataease/auth/interceptor/CorsConfig.java b/sdk/common/src/main/java/io/gisbi/auth/interceptor/CorsConfig.java similarity index 96% rename from sdk/common/src/main/java/io/dataease/auth/interceptor/CorsConfig.java rename to sdk/common/src/main/java/io/gisbi/auth/interceptor/CorsConfig.java index 9d0b563..817b492 100644 --- a/sdk/common/src/main/java/io/dataease/auth/interceptor/CorsConfig.java +++ b/sdk/common/src/main/java/io/gisbi/auth/interceptor/CorsConfig.java @@ -1,6 +1,6 @@ -package io.dataease.auth.interceptor; +package io.gisbi.auth.interceptor; -import io.dataease.constant.AuthConstant; +import io.gisbi.constant.AuthConstant; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/sdk/common/src/main/java/io/dataease/auth/vo/InvalidPwdVO.java b/sdk/common/src/main/java/io/gisbi/auth/vo/InvalidPwdVO.java similarity index 94% rename from sdk/common/src/main/java/io/dataease/auth/vo/InvalidPwdVO.java rename to sdk/common/src/main/java/io/gisbi/auth/vo/InvalidPwdVO.java index 77ed11d..1aaecbe 100644 --- a/sdk/common/src/main/java/io/dataease/auth/vo/InvalidPwdVO.java +++ b/sdk/common/src/main/java/io/gisbi/auth/vo/InvalidPwdVO.java @@ -1,4 +1,4 @@ -package io.dataease.auth.vo; +package io.gisbi.auth.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/common/src/main/java/io/dataease/auth/vo/MfaItem.java b/sdk/common/src/main/java/io/gisbi/auth/vo/MfaItem.java similarity index 94% rename from sdk/common/src/main/java/io/dataease/auth/vo/MfaItem.java rename to sdk/common/src/main/java/io/gisbi/auth/vo/MfaItem.java index b896877..1fca0e3 100644 --- a/sdk/common/src/main/java/io/dataease/auth/vo/MfaItem.java +++ b/sdk/common/src/main/java/io/gisbi/auth/vo/MfaItem.java @@ -1,4 +1,4 @@ -package io.dataease.auth.vo; +package io.gisbi.auth.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/common/src/main/java/io/dataease/auth/vo/TokenVO.java b/sdk/common/src/main/java/io/gisbi/auth/vo/TokenVO.java similarity index 95% rename from sdk/common/src/main/java/io/dataease/auth/vo/TokenVO.java rename to sdk/common/src/main/java/io/gisbi/auth/vo/TokenVO.java index d4f4c78..d0ef5f6 100644 --- a/sdk/common/src/main/java/io/dataease/auth/vo/TokenVO.java +++ b/sdk/common/src/main/java/io/gisbi/auth/vo/TokenVO.java @@ -1,4 +1,4 @@ -package io.dataease.auth.vo; +package io.gisbi.auth.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/sdk/common/src/main/java/io/dataease/cache/DECacheService.java b/sdk/common/src/main/java/io/gisbi/cache/DECacheService.java similarity index 92% rename from sdk/common/src/main/java/io/dataease/cache/DECacheService.java rename to sdk/common/src/main/java/io/gisbi/cache/DECacheService.java index cb33f00..42deb91 100644 --- a/sdk/common/src/main/java/io/dataease/cache/DECacheService.java +++ b/sdk/common/src/main/java/io/gisbi/cache/DECacheService.java @@ -1,4 +1,4 @@ -package io.dataease.cache; +package io.gisbi.cache; import java.util.concurrent.TimeUnit; diff --git a/sdk/common/src/main/java/io/dataease/cache/annotation/CacheClear.java b/sdk/common/src/main/java/io/gisbi/cache/annotation/CacheClear.java similarity index 90% rename from sdk/common/src/main/java/io/dataease/cache/annotation/CacheClear.java rename to sdk/common/src/main/java/io/gisbi/cache/annotation/CacheClear.java index 51e236a..f711a24 100644 --- a/sdk/common/src/main/java/io/dataease/cache/annotation/CacheClear.java +++ b/sdk/common/src/main/java/io/gisbi/cache/annotation/CacheClear.java @@ -1,4 +1,4 @@ -package io.dataease.cache.annotation; +package io.gisbi.cache.annotation; import org.springframework.core.annotation.AliasFor; diff --git a/sdk/common/src/main/java/io/dataease/cache/impl/DefaultCacheImpl.java b/sdk/common/src/main/java/io/gisbi/cache/impl/DefaultCacheImpl.java similarity index 97% rename from sdk/common/src/main/java/io/dataease/cache/impl/DefaultCacheImpl.java rename to sdk/common/src/main/java/io/gisbi/cache/impl/DefaultCacheImpl.java index e474022..10ecb25 100644 --- a/sdk/common/src/main/java/io/dataease/cache/impl/DefaultCacheImpl.java +++ b/sdk/common/src/main/java/io/gisbi/cache/impl/DefaultCacheImpl.java @@ -1,7 +1,7 @@ -package io.dataease.cache.impl; +package io.gisbi.cache.impl; -import io.dataease.cache.DECacheService; -import io.dataease.utils.LogUtil; +import io.gisbi.cache.DECacheService; +import io.gisbi.utils.LogUtil; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; diff --git a/sdk/common/src/main/java/io/dataease/cache/impl/RedisCacheImpl.java b/sdk/common/src/main/java/io/gisbi/cache/impl/RedisCacheImpl.java similarity index 95% rename from sdk/common/src/main/java/io/dataease/cache/impl/RedisCacheImpl.java rename to sdk/common/src/main/java/io/gisbi/cache/impl/RedisCacheImpl.java index 5eafee0..c6d9f5b 100644 --- a/sdk/common/src/main/java/io/dataease/cache/impl/RedisCacheImpl.java +++ b/sdk/common/src/main/java/io/gisbi/cache/impl/RedisCacheImpl.java @@ -1,7 +1,7 @@ -package io.dataease.cache.impl; +package io.gisbi.cache.impl; -import io.dataease.cache.DECacheService; -import io.dataease.utils.CommonBeanFactory; +import io.gisbi.cache.DECacheService; +import io.gisbi.utils.CommonBeanFactory; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; diff --git a/sdk/common/src/main/java/io/dataease/constant/AuthConstant.java b/sdk/common/src/main/java/io/gisbi/constant/AuthConstant.java similarity index 97% rename from sdk/common/src/main/java/io/dataease/constant/AuthConstant.java rename to sdk/common/src/main/java/io/gisbi/constant/AuthConstant.java index 60c94fa..46cac65 100644 --- a/sdk/common/src/main/java/io/dataease/constant/AuthConstant.java +++ b/sdk/common/src/main/java/io/gisbi/constant/AuthConstant.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; public class AuthConstant { diff --git a/sdk/common/src/main/java/io/dataease/constant/AuthEnum.java b/sdk/common/src/main/java/io/gisbi/constant/AuthEnum.java similarity index 92% rename from sdk/common/src/main/java/io/dataease/constant/AuthEnum.java rename to sdk/common/src/main/java/io/gisbi/constant/AuthEnum.java index 926a925..7143f43 100644 --- a/sdk/common/src/main/java/io/dataease/constant/AuthEnum.java +++ b/sdk/common/src/main/java/io/gisbi/constant/AuthEnum.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; public enum AuthEnum { READ(1), USER(2), EXPORT(4), EXPORT_VIEW(5), EXPORT_DETAIL(6), MANAGE(7), AUTH(9); diff --git a/sdk/common/src/main/java/io/dataease/constant/AuthResourceEnum.java b/sdk/common/src/main/java/io/gisbi/constant/AuthResourceEnum.java similarity index 95% rename from sdk/common/src/main/java/io/dataease/constant/AuthResourceEnum.java rename to sdk/common/src/main/java/io/gisbi/constant/AuthResourceEnum.java index 2edeee3..2668322 100644 --- a/sdk/common/src/main/java/io/dataease/constant/AuthResourceEnum.java +++ b/sdk/common/src/main/java/io/gisbi/constant/AuthResourceEnum.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; public enum AuthResourceEnum { diff --git a/sdk/common/src/main/java/io/dataease/constant/BusiResourceEnum.java b/sdk/common/src/main/java/io/gisbi/constant/BusiResourceEnum.java similarity index 91% rename from sdk/common/src/main/java/io/dataease/constant/BusiResourceEnum.java rename to sdk/common/src/main/java/io/gisbi/constant/BusiResourceEnum.java index fcb1143..9aae226 100644 --- a/sdk/common/src/main/java/io/dataease/constant/BusiResourceEnum.java +++ b/sdk/common/src/main/java/io/gisbi/constant/BusiResourceEnum.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; public enum BusiResourceEnum { diff --git a/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java b/sdk/common/src/main/java/io/gisbi/constant/CacheConstant.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/constant/CacheConstant.java rename to sdk/common/src/main/java/io/gisbi/constant/CacheConstant.java index d277b4f..4a7a4d9 100644 --- a/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java +++ b/sdk/common/src/main/java/io/gisbi/constant/CacheConstant.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; public class CacheConstant { public static class UserCacheConstant { diff --git a/sdk/common/src/main/java/io/dataease/constant/ColumnPermissionConstants.java b/sdk/common/src/main/java/io/gisbi/constant/ColumnPermissionConstants.java similarity index 84% rename from sdk/common/src/main/java/io/dataease/constant/ColumnPermissionConstants.java rename to sdk/common/src/main/java/io/gisbi/constant/ColumnPermissionConstants.java index bb55144..6fad2e9 100644 --- a/sdk/common/src/main/java/io/dataease/constant/ColumnPermissionConstants.java +++ b/sdk/common/src/main/java/io/gisbi/constant/ColumnPermissionConstants.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; public class ColumnPermissionConstants { diff --git a/sdk/common/src/main/java/io/dataease/constant/CommonConstants.java b/sdk/common/src/main/java/io/gisbi/constant/CommonConstants.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/constant/CommonConstants.java rename to sdk/common/src/main/java/io/gisbi/constant/CommonConstants.java index f281d75..6ef9277 100644 --- a/sdk/common/src/main/java/io/dataease/constant/CommonConstants.java +++ b/sdk/common/src/main/java/io/gisbi/constant/CommonConstants.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; /** * Author: wangjiahao diff --git a/sdk/common/src/main/java/io/dataease/constant/DataFillingFinishTaskEnum.java b/sdk/common/src/main/java/io/gisbi/constant/DataFillingFinishTaskEnum.java similarity index 94% rename from sdk/common/src/main/java/io/dataease/constant/DataFillingFinishTaskEnum.java rename to sdk/common/src/main/java/io/gisbi/constant/DataFillingFinishTaskEnum.java index f21004a..571afe8 100644 --- a/sdk/common/src/main/java/io/dataease/constant/DataFillingFinishTaskEnum.java +++ b/sdk/common/src/main/java/io/gisbi/constant/DataFillingFinishTaskEnum.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; import java.util.Arrays; diff --git a/sdk/common/src/main/java/io/dataease/constant/DataSourceType.java b/sdk/common/src/main/java/io/gisbi/constant/DataSourceType.java similarity index 96% rename from sdk/common/src/main/java/io/dataease/constant/DataSourceType.java rename to sdk/common/src/main/java/io/gisbi/constant/DataSourceType.java index ad94cd5..5071f0f 100644 --- a/sdk/common/src/main/java/io/dataease/constant/DataSourceType.java +++ b/sdk/common/src/main/java/io/gisbi/constant/DataSourceType.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; public enum DataSourceType {oracle(1), sqlServer(2), TiDB(3), hive(4), impala(5), mariadb(6), StarRocks(7), ds_doris(8), pg(9), mongo(10), ck(11), db2(12), redshift(13), es(14), API(15), Excel(16), influxdb(17), sls(18), kingbase(19), mongobi(20), maxcompute(21), presto(22), diff --git a/sdk/common/src/main/java/io/dataease/constant/DeTypeConstants.java b/sdk/common/src/main/java/io/gisbi/constant/DeTypeConstants.java similarity index 92% rename from sdk/common/src/main/java/io/dataease/constant/DeTypeConstants.java rename to sdk/common/src/main/java/io/gisbi/constant/DeTypeConstants.java index 8c30487..06d13e1 100644 --- a/sdk/common/src/main/java/io/dataease/constant/DeTypeConstants.java +++ b/sdk/common/src/main/java/io/gisbi/constant/DeTypeConstants.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; public class DeTypeConstants { diff --git a/sdk/common/src/main/java/io/dataease/constant/LogOT.java b/sdk/common/src/main/java/io/gisbi/constant/LogOT.java similarity index 97% rename from sdk/common/src/main/java/io/dataease/constant/LogOT.java rename to sdk/common/src/main/java/io/gisbi/constant/LogOT.java index 512da34..7dde77e 100644 --- a/sdk/common/src/main/java/io/dataease/constant/LogOT.java +++ b/sdk/common/src/main/java/io/gisbi/constant/LogOT.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; import java.util.Arrays; diff --git a/sdk/common/src/main/java/io/dataease/constant/LogST.java b/sdk/common/src/main/java/io/gisbi/constant/LogST.java similarity index 97% rename from sdk/common/src/main/java/io/dataease/constant/LogST.java rename to sdk/common/src/main/java/io/gisbi/constant/LogST.java index ba7126f..e7eddbd 100644 --- a/sdk/common/src/main/java/io/dataease/constant/LogST.java +++ b/sdk/common/src/main/java/io/gisbi/constant/LogST.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; import java.util.Arrays; diff --git a/sdk/common/src/main/java/io/dataease/constant/MessageEnum.java b/sdk/common/src/main/java/io/gisbi/constant/MessageEnum.java similarity index 95% rename from sdk/common/src/main/java/io/dataease/constant/MessageEnum.java rename to sdk/common/src/main/java/io/gisbi/constant/MessageEnum.java index 94801ff..ffac670 100644 --- a/sdk/common/src/main/java/io/dataease/constant/MessageEnum.java +++ b/sdk/common/src/main/java/io/gisbi/constant/MessageEnum.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; import java.util.Arrays; diff --git a/sdk/common/src/main/java/io/dataease/constant/ReportLastStatusEnum.java b/sdk/common/src/main/java/io/gisbi/constant/ReportLastStatusEnum.java similarity index 94% rename from sdk/common/src/main/java/io/dataease/constant/ReportLastStatusEnum.java rename to sdk/common/src/main/java/io/gisbi/constant/ReportLastStatusEnum.java index 69a33af..4bb372c 100644 --- a/sdk/common/src/main/java/io/dataease/constant/ReportLastStatusEnum.java +++ b/sdk/common/src/main/java/io/gisbi/constant/ReportLastStatusEnum.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; import java.util.Arrays; diff --git a/sdk/common/src/main/java/io/dataease/constant/ReportTaskEnum.java b/sdk/common/src/main/java/io/gisbi/constant/ReportTaskEnum.java similarity index 94% rename from sdk/common/src/main/java/io/dataease/constant/ReportTaskEnum.java rename to sdk/common/src/main/java/io/gisbi/constant/ReportTaskEnum.java index ec74478..df7b57c 100644 --- a/sdk/common/src/main/java/io/dataease/constant/ReportTaskEnum.java +++ b/sdk/common/src/main/java/io/gisbi/constant/ReportTaskEnum.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; import java.util.Arrays; diff --git a/sdk/common/src/main/java/io/dataease/constant/SQLConstants.java b/sdk/common/src/main/java/io/gisbi/constant/SQLConstants.java similarity index 99% rename from sdk/common/src/main/java/io/dataease/constant/SQLConstants.java rename to sdk/common/src/main/java/io/gisbi/constant/SQLConstants.java index 9bff295..ca73114 100644 --- a/sdk/common/src/main/java/io/dataease/constant/SQLConstants.java +++ b/sdk/common/src/main/java/io/gisbi/constant/SQLConstants.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; import java.util.ArrayList; import java.util.List; diff --git a/sdk/common/src/main/java/io/dataease/constant/SortConstants.java b/sdk/common/src/main/java/io/gisbi/constant/SortConstants.java similarity index 91% rename from sdk/common/src/main/java/io/dataease/constant/SortConstants.java rename to sdk/common/src/main/java/io/gisbi/constant/SortConstants.java index 07ef912..2d896af 100644 --- a/sdk/common/src/main/java/io/dataease/constant/SortConstants.java +++ b/sdk/common/src/main/java/io/gisbi/constant/SortConstants.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; public class SortConstants { diff --git a/sdk/common/src/main/java/io/dataease/constant/StaticResourceConstants.java b/sdk/common/src/main/java/io/gisbi/constant/StaticResourceConstants.java similarity index 89% rename from sdk/common/src/main/java/io/dataease/constant/StaticResourceConstants.java rename to sdk/common/src/main/java/io/gisbi/constant/StaticResourceConstants.java index 343be5e..ab5078f 100644 --- a/sdk/common/src/main/java/io/dataease/constant/StaticResourceConstants.java +++ b/sdk/common/src/main/java/io/gisbi/constant/StaticResourceConstants.java @@ -1,11 +1,11 @@ -package io.dataease.constant; +package io.gisbi.constant; -import io.dataease.utils.ConfigUtils; -import io.dataease.utils.ModelUtils; +import io.gisbi.utils.ConfigUtils; +import io.gisbi.utils.ModelUtils; import java.io.File; -import static io.dataease.utils.StaticResourceUtils.ensureSuffix; +import static io.gisbi.utils.StaticResourceUtils.ensureSuffix; public class StaticResourceConstants { diff --git a/sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java b/sdk/common/src/main/java/io/gisbi/constant/XpackSettingConstants.java similarity index 97% rename from sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java rename to sdk/common/src/main/java/io/gisbi/constant/XpackSettingConstants.java index fab976d..31d7a41 100644 --- a/sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java +++ b/sdk/common/src/main/java/io/gisbi/constant/XpackSettingConstants.java @@ -1,4 +1,4 @@ -package io.dataease.constant; +package io.gisbi.constant; public class XpackSettingConstants { diff --git a/sdk/common/src/main/java/io/dataease/doc/SwaggerConfig.java b/sdk/common/src/main/java/io/gisbi/doc/SwaggerConfig.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/doc/SwaggerConfig.java rename to sdk/common/src/main/java/io/gisbi/doc/SwaggerConfig.java index 9ef4f09..0e0cad7 100644 --- a/sdk/common/src/main/java/io/dataease/doc/SwaggerConfig.java +++ b/sdk/common/src/main/java/io/gisbi/doc/SwaggerConfig.java @@ -1,4 +1,4 @@ -package io.dataease.doc; +package io.gisbi.doc; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Contact; @@ -16,7 +16,7 @@ import java.util.Map; @Configuration public class SwaggerConfig { - @Value("${dataease.version}") + @Value("1.0.0") private String version; @Bean diff --git a/sdk/common/src/main/java/io/dataease/exception/DEException.java b/sdk/common/src/main/java/io/gisbi/exception/DEException.java similarity index 94% rename from sdk/common/src/main/java/io/dataease/exception/DEException.java rename to sdk/common/src/main/java/io/gisbi/exception/DEException.java index 662c488..aee5ef0 100644 --- a/sdk/common/src/main/java/io/dataease/exception/DEException.java +++ b/sdk/common/src/main/java/io/gisbi/exception/DEException.java @@ -1,6 +1,6 @@ -package io.dataease.exception; +package io.gisbi.exception; -import io.dataease.result.ResultCode; +import io.gisbi.result.ResultCode; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/sdk/common/src/main/java/io/dataease/exception/GlobalExceptionHandler.java b/sdk/common/src/main/java/io/gisbi/exception/GlobalExceptionHandler.java similarity index 89% rename from sdk/common/src/main/java/io/dataease/exception/GlobalExceptionHandler.java rename to sdk/common/src/main/java/io/gisbi/exception/GlobalExceptionHandler.java index bb23716..d997585 100644 --- a/sdk/common/src/main/java/io/dataease/exception/GlobalExceptionHandler.java +++ b/sdk/common/src/main/java/io/gisbi/exception/GlobalExceptionHandler.java @@ -1,10 +1,10 @@ -package io.dataease.exception; +package io.gisbi.exception; -import io.dataease.i18n.Translator; -import io.dataease.result.ResultCode; -import io.dataease.result.ResultMessage; -import io.dataease.utils.LogUtil; +import io.gisbi.i18n.Translator; +import io.gisbi.result.ResultCode; +import io.gisbi.result.ResultMessage; +import io.gisbi.utils.LogUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.validation.ObjectError; import org.springframework.web.bind.MethodArgumentNotValidException; diff --git a/sdk/common/src/main/java/io/dataease/feign/DeFeign.java b/sdk/common/src/main/java/io/gisbi/feign/DeFeign.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/feign/DeFeign.java rename to sdk/common/src/main/java/io/gisbi/feign/DeFeign.java index 5ef4022..21d0194 100644 --- a/sdk/common/src/main/java/io/dataease/feign/DeFeign.java +++ b/sdk/common/src/main/java/io/gisbi/feign/DeFeign.java @@ -1,4 +1,4 @@ -package io.dataease.feign; +package io.gisbi.feign; import org.springframework.core.annotation.AliasFor; diff --git a/sdk/common/src/main/java/io/dataease/filter/HtmlResourceFilter.java b/sdk/common/src/main/java/io/gisbi/filter/HtmlResourceFilter.java similarity index 94% rename from sdk/common/src/main/java/io/dataease/filter/HtmlResourceFilter.java rename to sdk/common/src/main/java/io/gisbi/filter/HtmlResourceFilter.java index cdeda6b..5b57568 100644 --- a/sdk/common/src/main/java/io/dataease/filter/HtmlResourceFilter.java +++ b/sdk/common/src/main/java/io/gisbi/filter/HtmlResourceFilter.java @@ -1,7 +1,7 @@ -package io.dataease.filter; +package io.gisbi.filter; -import io.dataease.result.ResultMessage; -import io.dataease.utils.JsonUtil; +import io.gisbi.result.ResultMessage; +import io.gisbi.utils.JsonUtil; import jakarta.servlet.*; import jakarta.servlet.FilterConfig; import jakarta.servlet.http.HttpServletResponse; diff --git a/sdk/common/src/main/java/io/dataease/i18n/DeI18nMessageConfig.java b/sdk/common/src/main/java/io/gisbi/i18n/DeI18nMessageConfig.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/i18n/DeI18nMessageConfig.java rename to sdk/common/src/main/java/io/gisbi/i18n/DeI18nMessageConfig.java index c82b529..7acd814 100644 --- a/sdk/common/src/main/java/io/dataease/i18n/DeI18nMessageConfig.java +++ b/sdk/common/src/main/java/io/gisbi/i18n/DeI18nMessageConfig.java @@ -1,4 +1,4 @@ -package io.dataease.i18n; +package io.gisbi.i18n; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext; diff --git a/sdk/common/src/main/java/io/dataease/i18n/DeI18nStarter.java b/sdk/common/src/main/java/io/gisbi/i18n/DeI18nStarter.java similarity index 95% rename from sdk/common/src/main/java/io/dataease/i18n/DeI18nStarter.java rename to sdk/common/src/main/java/io/gisbi/i18n/DeI18nStarter.java index f521bab..4a677be 100644 --- a/sdk/common/src/main/java/io/dataease/i18n/DeI18nStarter.java +++ b/sdk/common/src/main/java/io/gisbi/i18n/DeI18nStarter.java @@ -1,4 +1,4 @@ -package io.dataease.i18n; +package io.gisbi.i18n; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.ApplicationArguments; diff --git a/sdk/common/src/main/java/io/dataease/i18n/DeReloadableResourceBundleMessageSource.java b/sdk/common/src/main/java/io/gisbi/i18n/DeReloadableResourceBundleMessageSource.java similarity index 95% rename from sdk/common/src/main/java/io/dataease/i18n/DeReloadableResourceBundleMessageSource.java rename to sdk/common/src/main/java/io/gisbi/i18n/DeReloadableResourceBundleMessageSource.java index dd4cf85..61d7a57 100644 --- a/sdk/common/src/main/java/io/dataease/i18n/DeReloadableResourceBundleMessageSource.java +++ b/sdk/common/src/main/java/io/gisbi/i18n/DeReloadableResourceBundleMessageSource.java @@ -1,4 +1,4 @@ -package io.dataease.i18n; +package io.gisbi.i18n; import org.springframework.context.support.ReloadableResourceBundleMessageSource; diff --git a/sdk/common/src/main/java/io/dataease/i18n/DynamicI18nUtils.java b/sdk/common/src/main/java/io/gisbi/i18n/DynamicI18nUtils.java similarity index 96% rename from sdk/common/src/main/java/io/dataease/i18n/DynamicI18nUtils.java rename to sdk/common/src/main/java/io/gisbi/i18n/DynamicI18nUtils.java index 6ec3096..2900ebe 100644 --- a/sdk/common/src/main/java/io/dataease/i18n/DynamicI18nUtils.java +++ b/sdk/common/src/main/java/io/gisbi/i18n/DynamicI18nUtils.java @@ -1,4 +1,4 @@ -package io.dataease.i18n; +package io.gisbi.i18n; import jakarta.annotation.Resource; import org.springframework.context.support.ReloadableResourceBundleMessageSource; diff --git a/sdk/common/src/main/java/io/dataease/i18n/I18n.java b/sdk/common/src/main/java/io/gisbi/i18n/I18n.java similarity index 87% rename from sdk/common/src/main/java/io/dataease/i18n/I18n.java rename to sdk/common/src/main/java/io/gisbi/i18n/I18n.java index 35a0f53..d162be6 100644 --- a/sdk/common/src/main/java/io/dataease/i18n/I18n.java +++ b/sdk/common/src/main/java/io/gisbi/i18n/I18n.java @@ -1,4 +1,4 @@ -package io.dataease.i18n; +package io.gisbi.i18n; import java.lang.annotation.*; diff --git a/sdk/common/src/main/java/io/dataease/i18n/Lang.java b/sdk/common/src/main/java/io/gisbi/i18n/Lang.java similarity index 97% rename from sdk/common/src/main/java/io/dataease/i18n/Lang.java rename to sdk/common/src/main/java/io/gisbi/i18n/Lang.java index adeb160..92572e5 100644 --- a/sdk/common/src/main/java/io/dataease/i18n/Lang.java +++ b/sdk/common/src/main/java/io/gisbi/i18n/Lang.java @@ -1,4 +1,4 @@ -package io.dataease.i18n; +package io.gisbi.i18n; import lombok.Getter; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/common/src/main/java/io/dataease/i18n/Translator.java b/sdk/common/src/main/java/io/gisbi/i18n/Translator.java similarity index 97% rename from sdk/common/src/main/java/io/dataease/i18n/Translator.java rename to sdk/common/src/main/java/io/gisbi/i18n/Translator.java index 3b44052..7ad457b 100644 --- a/sdk/common/src/main/java/io/dataease/i18n/Translator.java +++ b/sdk/common/src/main/java/io/gisbi/i18n/Translator.java @@ -1,10 +1,10 @@ -package io.dataease.i18n; +package io.gisbi.i18n; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.dataease.exception.DEException; -import io.dataease.utils.BeanUtils; -import io.dataease.utils.JsonUtil; -import io.dataease.utils.LogUtil; +import io.gisbi.exception.DEException; +import io.gisbi.utils.BeanUtils; +import io.gisbi.utils.JsonUtil; +import io.gisbi.utils.LogUtil; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/common/src/main/java/io/dataease/jackson/JacksonConfig.java b/sdk/common/src/main/java/io/gisbi/jackson/JacksonConfig.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/jackson/JacksonConfig.java rename to sdk/common/src/main/java/io/gisbi/jackson/JacksonConfig.java index 6ce89a4..61fd6ec 100644 --- a/sdk/common/src/main/java/io/dataease/jackson/JacksonConfig.java +++ b/sdk/common/src/main/java/io/gisbi/jackson/JacksonConfig.java @@ -1,4 +1,4 @@ -package io.dataease.jackson; +package io.gisbi.jackson; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.StreamReadConstraints; diff --git a/sdk/common/src/main/java/io/dataease/listener/MyCacheListener.java b/sdk/common/src/main/java/io/gisbi/listener/MyCacheListener.java similarity index 95% rename from sdk/common/src/main/java/io/dataease/listener/MyCacheListener.java rename to sdk/common/src/main/java/io/gisbi/listener/MyCacheListener.java index 8acfcef..257800b 100644 --- a/sdk/common/src/main/java/io/dataease/listener/MyCacheListener.java +++ b/sdk/common/src/main/java/io/gisbi/listener/MyCacheListener.java @@ -1,4 +1,4 @@ -package io.dataease.listener; +package io.gisbi.listener; import org.ehcache.event.CacheEvent; import org.ehcache.event.CacheEventListener; diff --git a/sdk/common/src/main/java/io/dataease/listener/RedisCacheListener.java b/sdk/common/src/main/java/io/gisbi/listener/RedisCacheListener.java similarity index 96% rename from sdk/common/src/main/java/io/dataease/listener/RedisCacheListener.java rename to sdk/common/src/main/java/io/gisbi/listener/RedisCacheListener.java index 1e15fb3..d050789 100644 --- a/sdk/common/src/main/java/io/dataease/listener/RedisCacheListener.java +++ b/sdk/common/src/main/java/io/gisbi/listener/RedisCacheListener.java @@ -1,6 +1,6 @@ -package io.dataease.listener; +package io.gisbi.listener; -import io.dataease.utils.LogUtil; +import io.gisbi.utils.LogUtil; import jakarta.annotation.Resource; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.context.event.ApplicationReadyEvent; diff --git a/sdk/common/src/main/java/io/dataease/log/DeLog.java b/sdk/common/src/main/java/io/gisbi/log/DeLog.java similarity index 74% rename from sdk/common/src/main/java/io/dataease/log/DeLog.java rename to sdk/common/src/main/java/io/gisbi/log/DeLog.java index a8b6f43..8173af6 100644 --- a/sdk/common/src/main/java/io/dataease/log/DeLog.java +++ b/sdk/common/src/main/java/io/gisbi/log/DeLog.java @@ -1,7 +1,7 @@ -package io.dataease.log; +package io.gisbi.log; -import io.dataease.constant.LogOT; -import io.dataease.constant.LogST; +import io.gisbi.constant.LogOT; +import io.gisbi.constant.LogST; import java.lang.annotation.*; diff --git a/sdk/common/src/main/java/io/dataease/model/BusiNodeRequest.java b/sdk/common/src/main/java/io/gisbi/model/BusiNodeRequest.java similarity index 93% rename from sdk/common/src/main/java/io/dataease/model/BusiNodeRequest.java rename to sdk/common/src/main/java/io/gisbi/model/BusiNodeRequest.java index 092e481..e0f6b94 100644 --- a/sdk/common/src/main/java/io/dataease/model/BusiNodeRequest.java +++ b/sdk/common/src/main/java/io/gisbi/model/BusiNodeRequest.java @@ -1,4 +1,4 @@ -package io.dataease.model; +package io.gisbi.model; import lombok.Data; diff --git a/sdk/common/src/main/java/io/dataease/model/BusiNodeVO.java b/sdk/common/src/main/java/io/gisbi/model/BusiNodeVO.java similarity index 97% rename from sdk/common/src/main/java/io/dataease/model/BusiNodeVO.java rename to sdk/common/src/main/java/io/gisbi/model/BusiNodeVO.java index d70dfaf..bbfcbfe 100644 --- a/sdk/common/src/main/java/io/dataease/model/BusiNodeVO.java +++ b/sdk/common/src/main/java/io/gisbi/model/BusiNodeVO.java @@ -1,4 +1,4 @@ -package io.dataease.model; +package io.gisbi.model; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/common/src/main/java/io/dataease/model/DeModel.java b/sdk/common/src/main/java/io/gisbi/model/DeModel.java similarity index 70% rename from sdk/common/src/main/java/io/dataease/model/DeModel.java rename to sdk/common/src/main/java/io/gisbi/model/DeModel.java index 4af27c6..7ed241e 100644 --- a/sdk/common/src/main/java/io/dataease/model/DeModel.java +++ b/sdk/common/src/main/java/io/gisbi/model/DeModel.java @@ -1,4 +1,4 @@ -package io.dataease.model; +package io.gisbi.model; public enum DeModel { diff --git a/sdk/common/src/main/java/io/dataease/model/ExportTaskDTO.java b/sdk/common/src/main/java/io/gisbi/model/ExportTaskDTO.java similarity index 96% rename from sdk/common/src/main/java/io/dataease/model/ExportTaskDTO.java rename to sdk/common/src/main/java/io/gisbi/model/ExportTaskDTO.java index f8cc112..e53ea31 100644 --- a/sdk/common/src/main/java/io/dataease/model/ExportTaskDTO.java +++ b/sdk/common/src/main/java/io/gisbi/model/ExportTaskDTO.java @@ -1,4 +1,4 @@ -package io.dataease.model; +package io.gisbi.model; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/common/src/main/java/io/dataease/model/ITreeBase.java b/sdk/common/src/main/java/io/gisbi/model/ITreeBase.java similarity index 90% rename from sdk/common/src/main/java/io/dataease/model/ITreeBase.java rename to sdk/common/src/main/java/io/gisbi/model/ITreeBase.java index ce609d4..9ae6a04 100644 --- a/sdk/common/src/main/java/io/dataease/model/ITreeBase.java +++ b/sdk/common/src/main/java/io/gisbi/model/ITreeBase.java @@ -1,4 +1,4 @@ -package io.dataease.model; +package io.gisbi.model; import java.util.List; diff --git a/sdk/common/src/main/java/io/dataease/model/KeywordRequest.java b/sdk/common/src/main/java/io/gisbi/model/KeywordRequest.java similarity index 93% rename from sdk/common/src/main/java/io/dataease/model/KeywordRequest.java rename to sdk/common/src/main/java/io/gisbi/model/KeywordRequest.java index 89e1dcb..a110cd6 100644 --- a/sdk/common/src/main/java/io/dataease/model/KeywordRequest.java +++ b/sdk/common/src/main/java/io/gisbi/model/KeywordRequest.java @@ -1,4 +1,4 @@ -package io.dataease.model; +package io.gisbi.model; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/sdk/common/src/main/java/io/dataease/model/LogItemModel.java b/sdk/common/src/main/java/io/gisbi/model/LogItemModel.java similarity index 74% rename from sdk/common/src/main/java/io/dataease/model/LogItemModel.java rename to sdk/common/src/main/java/io/gisbi/model/LogItemModel.java index 062a404..c83d964 100644 --- a/sdk/common/src/main/java/io/dataease/model/LogItemModel.java +++ b/sdk/common/src/main/java/io/gisbi/model/LogItemModel.java @@ -1,6 +1,6 @@ -package io.dataease.model; +package io.gisbi.model; -import io.dataease.constant.LogST; +import io.gisbi.constant.LogST; import lombok.Data; import java.io.Serializable; diff --git a/sdk/common/src/main/java/io/dataease/model/RSAModel.java b/sdk/common/src/main/java/io/gisbi/model/RSAModel.java similarity index 84% rename from sdk/common/src/main/java/io/dataease/model/RSAModel.java rename to sdk/common/src/main/java/io/gisbi/model/RSAModel.java index 9dd7116..9432018 100644 --- a/sdk/common/src/main/java/io/dataease/model/RSAModel.java +++ b/sdk/common/src/main/java/io/gisbi/model/RSAModel.java @@ -1,4 +1,4 @@ -package io.dataease.model; +package io.gisbi.model; import lombok.Data; diff --git a/sdk/common/src/main/java/io/dataease/model/TreeBaseModel.java b/sdk/common/src/main/java/io/gisbi/model/TreeBaseModel.java similarity index 87% rename from sdk/common/src/main/java/io/dataease/model/TreeBaseModel.java rename to sdk/common/src/main/java/io/gisbi/model/TreeBaseModel.java index 5d26034..5e6b136 100644 --- a/sdk/common/src/main/java/io/dataease/model/TreeBaseModel.java +++ b/sdk/common/src/main/java/io/gisbi/model/TreeBaseModel.java @@ -1,4 +1,4 @@ -package io.dataease.model; +package io.gisbi.model; import java.io.Serializable; diff --git a/sdk/common/src/main/java/io/dataease/model/TreeModel.java b/sdk/common/src/main/java/io/gisbi/model/TreeModel.java similarity index 94% rename from sdk/common/src/main/java/io/dataease/model/TreeModel.java rename to sdk/common/src/main/java/io/gisbi/model/TreeModel.java index 6ccc83c..5e79fd0 100644 --- a/sdk/common/src/main/java/io/dataease/model/TreeModel.java +++ b/sdk/common/src/main/java/io/gisbi/model/TreeModel.java @@ -1,4 +1,4 @@ -package io.dataease.model; +package io.gisbi.model; import lombok.Data; diff --git a/sdk/common/src/main/java/io/dataease/model/TreeResultModel.java b/sdk/common/src/main/java/io/gisbi/model/TreeResultModel.java similarity index 79% rename from sdk/common/src/main/java/io/dataease/model/TreeResultModel.java rename to sdk/common/src/main/java/io/gisbi/model/TreeResultModel.java index 4c5e3c9..ebc347b 100644 --- a/sdk/common/src/main/java/io/dataease/model/TreeResultModel.java +++ b/sdk/common/src/main/java/io/gisbi/model/TreeResultModel.java @@ -1,4 +1,4 @@ -package io.dataease.model; +package io.gisbi.model; import java.util.List; diff --git a/sdk/common/src/main/java/io/dataease/model/excel/AutoAdaptWidthStyleStrategy.java b/sdk/common/src/main/java/io/gisbi/model/excel/AutoAdaptWidthStyleStrategy.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/model/excel/AutoAdaptWidthStyleStrategy.java rename to sdk/common/src/main/java/io/gisbi/model/excel/AutoAdaptWidthStyleStrategy.java index 8655ff4..7e129c3 100644 --- a/sdk/common/src/main/java/io/dataease/model/excel/AutoAdaptWidthStyleStrategy.java +++ b/sdk/common/src/main/java/io/gisbi/model/excel/AutoAdaptWidthStyleStrategy.java @@ -1,4 +1,4 @@ -package io.dataease.model.excel; +package io.gisbi.model.excel; import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.metadata.Head; @@ -7,7 +7,7 @@ import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy; -import io.dataease.i18n.Translator; +import io.gisbi.i18n.Translator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.ss.usermodel.Cell; diff --git a/sdk/common/src/main/java/io/dataease/model/excel/ErrWriteHandler.java b/sdk/common/src/main/java/io/gisbi/model/excel/ErrWriteHandler.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/model/excel/ErrWriteHandler.java rename to sdk/common/src/main/java/io/gisbi/model/excel/ErrWriteHandler.java index d8f290f..4947064 100644 --- a/sdk/common/src/main/java/io/dataease/model/excel/ErrWriteHandler.java +++ b/sdk/common/src/main/java/io/gisbi/model/excel/ErrWriteHandler.java @@ -1,4 +1,4 @@ -package io.dataease.model.excel; +package io.gisbi.model.excel; import com.alibaba.excel.write.handler.RowWriteHandler; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; diff --git a/sdk/common/src/main/java/io/dataease/mybatisplus/MyBatisPlusPaginationInnerConfig.java b/sdk/common/src/main/java/io/gisbi/mybatisplus/MyBatisPlusPaginationInnerConfig.java similarity index 95% rename from sdk/common/src/main/java/io/dataease/mybatisplus/MyBatisPlusPaginationInnerConfig.java rename to sdk/common/src/main/java/io/gisbi/mybatisplus/MyBatisPlusPaginationInnerConfig.java index e809ad2..1ae7d08 100644 --- a/sdk/common/src/main/java/io/dataease/mybatisplus/MyBatisPlusPaginationInnerConfig.java +++ b/sdk/common/src/main/java/io/gisbi/mybatisplus/MyBatisPlusPaginationInnerConfig.java @@ -1,4 +1,4 @@ -package io.dataease.mybatisplus; +package io.gisbi.mybatisplus; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; diff --git a/sdk/common/src/main/java/io/dataease/result/ResultCode.java b/sdk/common/src/main/java/io/gisbi/result/ResultCode.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/result/ResultCode.java rename to sdk/common/src/main/java/io/gisbi/result/ResultCode.java index 55e5849..9329a1c 100644 --- a/sdk/common/src/main/java/io/dataease/result/ResultCode.java +++ b/sdk/common/src/main/java/io/gisbi/result/ResultCode.java @@ -1,4 +1,4 @@ -package io.dataease.result; +package io.gisbi.result; public enum ResultCode { /* 成功状态码 */ diff --git a/sdk/common/src/main/java/io/dataease/result/ResultMessage.java b/sdk/common/src/main/java/io/gisbi/result/ResultMessage.java similarity index 97% rename from sdk/common/src/main/java/io/dataease/result/ResultMessage.java rename to sdk/common/src/main/java/io/gisbi/result/ResultMessage.java index d2985bc..beb608d 100644 --- a/sdk/common/src/main/java/io/dataease/result/ResultMessage.java +++ b/sdk/common/src/main/java/io/gisbi/result/ResultMessage.java @@ -1,4 +1,4 @@ -package io.dataease.result; +package io.gisbi.result; import lombok.Data; diff --git a/sdk/common/src/main/java/io/dataease/result/ResultResponseBodyAdvice.java b/sdk/common/src/main/java/io/gisbi/result/ResultResponseBodyAdvice.java similarity index 93% rename from sdk/common/src/main/java/io/dataease/result/ResultResponseBodyAdvice.java rename to sdk/common/src/main/java/io/gisbi/result/ResultResponseBodyAdvice.java index ef2dc5a..5a1e4e3 100644 --- a/sdk/common/src/main/java/io/dataease/result/ResultResponseBodyAdvice.java +++ b/sdk/common/src/main/java/io/gisbi/result/ResultResponseBodyAdvice.java @@ -1,8 +1,8 @@ -package io.dataease.result; +package io.gisbi.result; -import io.dataease.i18n.I18n; -import io.dataease.i18n.Translator; -import io.dataease.utils.JsonUtil; +import io.gisbi.i18n.I18n; +import io.gisbi.i18n.Translator; +import io.gisbi.utils.JsonUtil; import org.springframework.core.MethodParameter; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; diff --git a/sdk/common/src/main/java/io/dataease/rsa/dao/entity/CoreRsa.java b/sdk/common/src/main/java/io/gisbi/rsa/dao/entity/CoreRsa.java similarity index 97% rename from sdk/common/src/main/java/io/dataease/rsa/dao/entity/CoreRsa.java rename to sdk/common/src/main/java/io/gisbi/rsa/dao/entity/CoreRsa.java index fd42d07..5ed5f01 100644 --- a/sdk/common/src/main/java/io/dataease/rsa/dao/entity/CoreRsa.java +++ b/sdk/common/src/main/java/io/gisbi/rsa/dao/entity/CoreRsa.java @@ -1,4 +1,4 @@ -package io.dataease.rsa.dao.entity; +package io.gisbi.rsa.dao.entity; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; diff --git a/sdk/common/src/main/java/io/dataease/rsa/dao/mapper/CoreRsaMapper.java b/sdk/common/src/main/java/io/gisbi/rsa/dao/mapper/CoreRsaMapper.java similarity index 76% rename from sdk/common/src/main/java/io/dataease/rsa/dao/mapper/CoreRsaMapper.java rename to sdk/common/src/main/java/io/gisbi/rsa/dao/mapper/CoreRsaMapper.java index 848783e..dca202c 100644 --- a/sdk/common/src/main/java/io/dataease/rsa/dao/mapper/CoreRsaMapper.java +++ b/sdk/common/src/main/java/io/gisbi/rsa/dao/mapper/CoreRsaMapper.java @@ -1,6 +1,6 @@ -package io.dataease.rsa.dao.mapper; +package io.gisbi.rsa.dao.mapper; -import io.dataease.rsa.dao.entity.CoreRsa; +import io.gisbi.rsa.dao.entity.CoreRsa; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/sdk/common/src/main/java/io/dataease/rsa/manage/RsaManage.java b/sdk/common/src/main/java/io/gisbi/rsa/manage/RsaManage.java similarity index 78% rename from sdk/common/src/main/java/io/dataease/rsa/manage/RsaManage.java rename to sdk/common/src/main/java/io/gisbi/rsa/manage/RsaManage.java index ac37a51..51303e7 100644 --- a/sdk/common/src/main/java/io/dataease/rsa/manage/RsaManage.java +++ b/sdk/common/src/main/java/io/gisbi/rsa/manage/RsaManage.java @@ -1,17 +1,17 @@ -package io.dataease.rsa.manage; +package io.gisbi.rsa.manage; -import io.dataease.model.RSAModel; -import io.dataease.rsa.dao.entity.CoreRsa; -import io.dataease.rsa.dao.mapper.CoreRsaMapper; -import io.dataease.utils.CommonBeanFactory; -import io.dataease.utils.RsaUtils; +import io.gisbi.model.RSAModel; +import io.gisbi.rsa.dao.entity.CoreRsa; +import io.gisbi.rsa.dao.mapper.CoreRsaMapper; +import io.gisbi.utils.CommonBeanFactory; +import io.gisbi.utils.RsaUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Component; -import static io.dataease.constant.CacheConstant.CommonCacheConstant.RSA_CACHE; +import static io.gisbi.constant.CacheConstant.CommonCacheConstant.RSA_CACHE; @Component public class RsaManage { diff --git a/sdk/common/src/main/java/io/dataease/rsa/starter/RsaStarter.java b/sdk/common/src/main/java/io/gisbi/rsa/starter/RsaStarter.java similarity index 84% rename from sdk/common/src/main/java/io/dataease/rsa/starter/RsaStarter.java rename to sdk/common/src/main/java/io/gisbi/rsa/starter/RsaStarter.java index 2f90859..479fccd 100644 --- a/sdk/common/src/main/java/io/dataease/rsa/starter/RsaStarter.java +++ b/sdk/common/src/main/java/io/gisbi/rsa/starter/RsaStarter.java @@ -1,7 +1,7 @@ -package io.dataease.rsa.starter; +package io.gisbi.rsa.starter; -import io.dataease.rsa.manage.RsaManage; -import io.dataease.utils.LogUtil; +import io.gisbi.rsa.manage.RsaManage; +import io.gisbi.utils.LogUtil; import jakarta.annotation.Resource; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; diff --git a/sdk/common/src/main/java/io/dataease/traffic/DeTraffic.java b/sdk/common/src/main/java/io/gisbi/traffic/DeTraffic.java similarity index 86% rename from sdk/common/src/main/java/io/dataease/traffic/DeTraffic.java rename to sdk/common/src/main/java/io/gisbi/traffic/DeTraffic.java index 7999cb6..234e60a 100644 --- a/sdk/common/src/main/java/io/dataease/traffic/DeTraffic.java +++ b/sdk/common/src/main/java/io/gisbi/traffic/DeTraffic.java @@ -1,4 +1,4 @@ -package io.dataease.traffic; +package io.gisbi.traffic; import java.lang.annotation.*; diff --git a/sdk/common/src/main/java/io/dataease/traffic/DeTrafficAop.java b/sdk/common/src/main/java/io/gisbi/traffic/DeTrafficAop.java similarity index 90% rename from sdk/common/src/main/java/io/dataease/traffic/DeTrafficAop.java rename to sdk/common/src/main/java/io/gisbi/traffic/DeTrafficAop.java index ea9cd86..82679f3 100644 --- a/sdk/common/src/main/java/io/dataease/traffic/DeTrafficAop.java +++ b/sdk/common/src/main/java/io/gisbi/traffic/DeTrafficAop.java @@ -1,10 +1,10 @@ -package io.dataease.traffic; +package io.gisbi.traffic; -import io.dataease.exception.DEException; -import io.dataease.traffic.dao.entity.CoreApiTraffic; -import io.dataease.traffic.dao.mapper.CoreApiTrafficMapper; -import io.dataease.utils.IDUtils; -import io.dataease.utils.LogUtil; +import io.gisbi.exception.DEException; +import io.gisbi.traffic.dao.entity.CoreApiTraffic; +import io.gisbi.traffic.dao.mapper.CoreApiTrafficMapper; +import io.gisbi.utils.IDUtils; +import io.gisbi.utils.LogUtil; import jakarta.annotation.Resource; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/sdk/common/src/main/java/io/dataease/traffic/dao/entity/CoreApiTraffic.java b/sdk/common/src/main/java/io/gisbi/traffic/dao/entity/CoreApiTraffic.java similarity index 91% rename from sdk/common/src/main/java/io/dataease/traffic/dao/entity/CoreApiTraffic.java rename to sdk/common/src/main/java/io/gisbi/traffic/dao/entity/CoreApiTraffic.java index 7881ab7..8ce793c 100644 --- a/sdk/common/src/main/java/io/dataease/traffic/dao/entity/CoreApiTraffic.java +++ b/sdk/common/src/main/java/io/gisbi/traffic/dao/entity/CoreApiTraffic.java @@ -1,4 +1,4 @@ -package io.dataease.traffic.dao.entity; +package io.gisbi.traffic.dao.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/sdk/common/src/main/java/io/dataease/traffic/dao/mapper/CoreApiTrafficMapper.java b/sdk/common/src/main/java/io/gisbi/traffic/dao/mapper/CoreApiTrafficMapper.java similarity index 90% rename from sdk/common/src/main/java/io/dataease/traffic/dao/mapper/CoreApiTrafficMapper.java rename to sdk/common/src/main/java/io/gisbi/traffic/dao/mapper/CoreApiTrafficMapper.java index de5837d..46fb363 100644 --- a/sdk/common/src/main/java/io/dataease/traffic/dao/mapper/CoreApiTrafficMapper.java +++ b/sdk/common/src/main/java/io/gisbi/traffic/dao/mapper/CoreApiTrafficMapper.java @@ -1,6 +1,6 @@ -package io.dataease.traffic.dao.mapper; +package io.gisbi.traffic.dao.mapper; -import io.dataease.traffic.dao.entity.CoreApiTraffic; +import io.gisbi.traffic.dao.entity.CoreApiTraffic; import org.apache.ibatis.annotations.*; @Mapper diff --git a/sdk/common/src/main/java/io/dataease/traffic/starter/DeTrafficStarter.java b/sdk/common/src/main/java/io/gisbi/traffic/starter/DeTrafficStarter.java similarity index 81% rename from sdk/common/src/main/java/io/dataease/traffic/starter/DeTrafficStarter.java rename to sdk/common/src/main/java/io/gisbi/traffic/starter/DeTrafficStarter.java index b00e3c2..16c7956 100644 --- a/sdk/common/src/main/java/io/dataease/traffic/starter/DeTrafficStarter.java +++ b/sdk/common/src/main/java/io/gisbi/traffic/starter/DeTrafficStarter.java @@ -1,7 +1,7 @@ -package io.dataease.traffic.starter; +package io.gisbi.traffic.starter; -import io.dataease.traffic.dao.mapper.CoreApiTrafficMapper; -import io.dataease.utils.LogUtil; +import io.gisbi.traffic.dao.mapper.CoreApiTrafficMapper; +import io.gisbi.utils.LogUtil; import jakarta.annotation.Resource; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; diff --git a/sdk/common/src/main/java/io/dataease/utils/AesUtils.java b/sdk/common/src/main/java/io/gisbi/utils/AesUtils.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/utils/AesUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/AesUtils.java index ed7d454..82c8b01 100644 --- a/sdk/common/src/main/java/io/dataease/utils/AesUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/AesUtils.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/common/src/main/java/io/dataease/utils/AuthUtils.java b/sdk/common/src/main/java/io/gisbi/utils/AuthUtils.java similarity index 92% rename from sdk/common/src/main/java/io/dataease/utils/AuthUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/AuthUtils.java index d7dc571..2cc523f 100644 --- a/sdk/common/src/main/java/io/dataease/utils/AuthUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/AuthUtils.java @@ -1,6 +1,6 @@ -package io.dataease.utils; +package io.gisbi.utils; -import io.dataease.auth.bo.TokenUserBO; +import io.gisbi.auth.bo.TokenUserBO; import org.apache.commons.lang3.ObjectUtils; public class AuthUtils { diff --git a/sdk/common/src/main/java/io/dataease/utils/BeanUtils.java b/sdk/common/src/main/java/io/gisbi/utils/BeanUtils.java similarity index 99% rename from sdk/common/src/main/java/io/dataease/utils/BeanUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/BeanUtils.java index bd51304..4d09fac 100644 --- a/sdk/common/src/main/java/io/dataease/utils/BeanUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/BeanUtils.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/common/src/main/java/io/dataease/utils/CacheUtils.java b/sdk/common/src/main/java/io/gisbi/utils/CacheUtils.java similarity index 97% rename from sdk/common/src/main/java/io/dataease/utils/CacheUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/CacheUtils.java index a203137..5780000 100644 --- a/sdk/common/src/main/java/io/dataease/utils/CacheUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/CacheUtils.java @@ -1,7 +1,7 @@ -package io.dataease.utils; +package io.gisbi.utils; -import io.dataease.cache.DECacheService; +import io.gisbi.cache.DECacheService; import org.apache.commons.lang3.ObjectUtils; import java.util.Arrays; diff --git a/sdk/common/src/main/java/io/dataease/utils/CalendarUtils.java b/sdk/common/src/main/java/io/gisbi/utils/CalendarUtils.java similarity index 94% rename from sdk/common/src/main/java/io/dataease/utils/CalendarUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/CalendarUtils.java index 8c99af3..346ae6e 100644 --- a/sdk/common/src/main/java/io/dataease/utils/CalendarUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/CalendarUtils.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import org.apache.commons.lang3.ObjectUtils; diff --git a/sdk/common/src/main/java/io/dataease/utils/CommonBeanFactory.java b/sdk/common/src/main/java/io/gisbi/utils/CommonBeanFactory.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/utils/CommonBeanFactory.java rename to sdk/common/src/main/java/io/gisbi/utils/CommonBeanFactory.java index 52cbd85..26205fa 100644 --- a/sdk/common/src/main/java/io/dataease/utils/CommonBeanFactory.java +++ b/sdk/common/src/main/java/io/gisbi/utils/CommonBeanFactory.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import io.micrometer.common.util.StringUtils; import org.springframework.beans.BeansException; diff --git a/sdk/common/src/main/java/io/dataease/utils/CommonExcelUtils.java b/sdk/common/src/main/java/io/gisbi/utils/CommonExcelUtils.java similarity index 96% rename from sdk/common/src/main/java/io/dataease/utils/CommonExcelUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/CommonExcelUtils.java index b90686a..2398766 100644 --- a/sdk/common/src/main/java/io/dataease/utils/CommonExcelUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/CommonExcelUtils.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.event.AnalysisEventListener; @@ -6,8 +6,8 @@ import com.alibaba.excel.write.builder.ExcelWriterBuilder; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.metadata.style.WriteFont; import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; -import io.dataease.model.excel.AutoAdaptWidthStyleStrategy; -import io.dataease.model.excel.ErrWriteHandler; +import io.gisbi.model.excel.AutoAdaptWidthStyleStrategy; +import io.gisbi.model.excel.ErrWriteHandler; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.collections4.CollectionUtils; diff --git a/sdk/common/src/main/java/io/dataease/utils/CommonThreadPool.java b/sdk/common/src/main/java/io/gisbi/utils/CommonThreadPool.java similarity index 99% rename from sdk/common/src/main/java/io/dataease/utils/CommonThreadPool.java rename to sdk/common/src/main/java/io/gisbi/utils/CommonThreadPool.java index 829a878..3624b2b 100644 --- a/sdk/common/src/main/java/io/dataease/utils/CommonThreadPool.java +++ b/sdk/common/src/main/java/io/gisbi/utils/CommonThreadPool.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; diff --git a/sdk/common/src/main/java/io/dataease/utils/CommunityUtils.java b/sdk/common/src/main/java/io/gisbi/utils/CommunityUtils.java similarity index 91% rename from sdk/common/src/main/java/io/dataease/utils/CommunityUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/CommunityUtils.java index 4d4cf3f..846aba9 100644 --- a/sdk/common/src/main/java/io/dataease/utils/CommunityUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/CommunityUtils.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; public class CommunityUtils { diff --git a/sdk/common/src/main/java/io/dataease/utils/ConfigUtils.java b/sdk/common/src/main/java/io/gisbi/utils/ConfigUtils.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/utils/ConfigUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/ConfigUtils.java index 1729fab..bed6acd 100644 --- a/sdk/common/src/main/java/io/dataease/utils/ConfigUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/ConfigUtils.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.core.io.FileSystemResource; diff --git a/sdk/common/src/main/java/io/dataease/utils/DateUtils.java b/sdk/common/src/main/java/io/gisbi/utils/DateUtils.java similarity index 96% rename from sdk/common/src/main/java/io/dataease/utils/DateUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/DateUtils.java index 6d5fa8a..d9a9cd0 100644 --- a/sdk/common/src/main/java/io/dataease/utils/DateUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/DateUtils.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/common/src/main/java/io/dataease/utils/DeClassUtils.java b/sdk/common/src/main/java/io/gisbi/utils/DeClassUtils.java similarity index 97% rename from sdk/common/src/main/java/io/dataease/utils/DeClassUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/DeClassUtils.java index c427dd5..f7ba3e8 100644 --- a/sdk/common/src/main/java/io/dataease/utils/DeClassUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/DeClassUtils.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; public class DeClassUtils { diff --git a/sdk/common/src/main/java/io/dataease/utils/DeReflectUtil.java b/sdk/common/src/main/java/io/gisbi/utils/DeReflectUtil.java similarity index 94% rename from sdk/common/src/main/java/io/dataease/utils/DeReflectUtil.java rename to sdk/common/src/main/java/io/gisbi/utils/DeReflectUtil.java index 3a261e1..efbf469 100644 --- a/sdk/common/src/main/java/io/dataease/utils/DeReflectUtil.java +++ b/sdk/common/src/main/java/io/gisbi/utils/DeReflectUtil.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import org.apache.commons.lang3.ArrayUtils; diff --git a/sdk/common/src/main/java/io/dataease/utils/DelayQueueUtils.java b/sdk/common/src/main/java/io/gisbi/utils/DelayQueueUtils.java similarity index 96% rename from sdk/common/src/main/java/io/dataease/utils/DelayQueueUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/DelayQueueUtils.java index 715ccf1..17adca8 100644 --- a/sdk/common/src/main/java/io/dataease/utils/DelayQueueUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/DelayQueueUtils.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import org.apache.commons.lang3.ObjectUtils; diff --git a/sdk/common/src/main/java/io/dataease/utils/FileUtils.java b/sdk/common/src/main/java/io/gisbi/utils/FileUtils.java similarity index 99% rename from sdk/common/src/main/java/io/dataease/utils/FileUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/FileUtils.java index 3db673e..eacbbe7 100644 --- a/sdk/common/src/main/java/io/dataease/utils/FileUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/FileUtils.java @@ -1,6 +1,6 @@ -package io.dataease.utils; +package io.gisbi.utils; -import io.dataease.exception.DEException; +import io.gisbi.exception.DEException; import org.springframework.lang.NonNull; import org.springframework.util.Assert; import org.springframework.web.multipart.MultipartFile; diff --git a/sdk/common/src/main/java/io/dataease/utils/HttpClientConfig.java b/sdk/common/src/main/java/io/gisbi/utils/HttpClientConfig.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/utils/HttpClientConfig.java rename to sdk/common/src/main/java/io/gisbi/utils/HttpClientConfig.java index 1432f9b..7ecfb20 100644 --- a/sdk/common/src/main/java/io/dataease/utils/HttpClientConfig.java +++ b/sdk/common/src/main/java/io/gisbi/utils/HttpClientConfig.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.config.RequestConfig.Builder; diff --git a/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java b/sdk/common/src/main/java/io/gisbi/utils/HttpClientUtil.java similarity index 99% rename from sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java rename to sdk/common/src/main/java/io/gisbi/utils/HttpClientUtil.java index 35af304..fd776aa 100644 --- a/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java +++ b/sdk/common/src/main/java/io/gisbi/utils/HttpClientUtil.java @@ -1,6 +1,6 @@ -package io.dataease.utils; +package io.gisbi.utils; -import io.dataease.exception.DEException; +import io.gisbi.exception.DEException; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -41,7 +41,7 @@ import java.security.cert.X509Certificate; import java.util.*; import java.util.stream.Collectors; -import static io.dataease.result.ResultCode.SYSTEM_INNER_ERROR; +import static io.gisbi.result.ResultCode.SYSTEM_INNER_ERROR; public class HttpClientUtil { diff --git a/sdk/common/src/main/java/io/dataease/utils/IDUtils.java b/sdk/common/src/main/java/io/gisbi/utils/IDUtils.java similarity index 94% rename from sdk/common/src/main/java/io/dataease/utils/IDUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/IDUtils.java index e362279..9474da1 100644 --- a/sdk/common/src/main/java/io/dataease/utils/IDUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/IDUtils.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import org.apache.commons.lang3.ObjectUtils; diff --git a/sdk/common/src/main/java/io/dataease/utils/IPUtils.java b/sdk/common/src/main/java/io/gisbi/utils/IPUtils.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/utils/IPUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/IPUtils.java index 06e3ab1..7d428c4 100644 --- a/sdk/common/src/main/java/io/dataease/utils/IPUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/IPUtils.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.ObjectUtils; diff --git a/sdk/common/src/main/java/io/dataease/utils/JsonUtil.java b/sdk/common/src/main/java/io/gisbi/utils/JsonUtil.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/utils/JsonUtil.java rename to sdk/common/src/main/java/io/gisbi/utils/JsonUtil.java index 4b93c12..efcdc2e 100644 --- a/sdk/common/src/main/java/io/dataease/utils/JsonUtil.java +++ b/sdk/common/src/main/java/io/gisbi/utils/JsonUtil.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/sdk/common/src/main/java/io/dataease/utils/LogUtil.java b/sdk/common/src/main/java/io/gisbi/utils/LogUtil.java similarity index 99% rename from sdk/common/src/main/java/io/dataease/utils/LogUtil.java rename to sdk/common/src/main/java/io/gisbi/utils/LogUtil.java index ffaecd0..045d224 100644 --- a/sdk/common/src/main/java/io/dataease/utils/LogUtil.java +++ b/sdk/common/src/main/java/io/gisbi/utils/LogUtil.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/common/src/main/java/io/dataease/utils/LongArray2StringSerialize.java b/sdk/common/src/main/java/io/gisbi/utils/LongArray2StringSerialize.java similarity index 96% rename from sdk/common/src/main/java/io/dataease/utils/LongArray2StringSerialize.java rename to sdk/common/src/main/java/io/gisbi/utils/LongArray2StringSerialize.java index 0858600..da89fd6 100644 --- a/sdk/common/src/main/java/io/dataease/utils/LongArray2StringSerialize.java +++ b/sdk/common/src/main/java/io/gisbi/utils/LongArray2StringSerialize.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/sdk/common/src/main/java/io/dataease/utils/Md5Utils.java b/sdk/common/src/main/java/io/gisbi/utils/Md5Utils.java similarity index 97% rename from sdk/common/src/main/java/io/dataease/utils/Md5Utils.java rename to sdk/common/src/main/java/io/gisbi/utils/Md5Utils.java index cdd1219..ba53264 100644 --- a/sdk/common/src/main/java/io/dataease/utils/Md5Utils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/Md5Utils.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import java.security.MessageDigest; diff --git a/sdk/common/src/main/java/io/dataease/utils/ModelUtils.java b/sdk/common/src/main/java/io/gisbi/utils/ModelUtils.java similarity index 89% rename from sdk/common/src/main/java/io/dataease/utils/ModelUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/ModelUtils.java index 7ec21af..1b31e76 100644 --- a/sdk/common/src/main/java/io/dataease/utils/ModelUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/ModelUtils.java @@ -1,6 +1,6 @@ -package io.dataease.utils; +package io.gisbi.utils; -import io.dataease.model.DeModel; +import io.gisbi.model.DeModel; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/sdk/common/src/main/java/io/dataease/utils/Pager.java b/sdk/common/src/main/java/io/gisbi/utils/Pager.java similarity index 96% rename from sdk/common/src/main/java/io/dataease/utils/Pager.java rename to sdk/common/src/main/java/io/gisbi/utils/Pager.java index 5e1348d..92dca06 100644 --- a/sdk/common/src/main/java/io/dataease/utils/Pager.java +++ b/sdk/common/src/main/java/io/gisbi/utils/Pager.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; public class Pager { private T listObject; diff --git a/sdk/common/src/main/java/io/dataease/utils/RsaUtils.java b/sdk/common/src/main/java/io/gisbi/utils/RsaUtils.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/utils/RsaUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/RsaUtils.java index a5b1114..2d5924f 100644 --- a/sdk/common/src/main/java/io/dataease/utils/RsaUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/RsaUtils.java @@ -1,10 +1,10 @@ -package io.dataease.utils; +package io.gisbi.utils; -import io.dataease.exception.DEException; -import io.dataease.model.RSAModel; -import io.dataease.rsa.dao.entity.CoreRsa; -import io.dataease.rsa.manage.RsaManage; +import io.gisbi.exception.DEException; +import io.gisbi.model.RSAModel; +import io.gisbi.rsa.dao.entity.CoreRsa; +import io.gisbi.rsa.manage.RsaManage; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.RandomStringUtils; diff --git a/sdk/common/src/main/java/io/dataease/utils/ServletUtils.java b/sdk/common/src/main/java/io/gisbi/utils/ServletUtils.java similarity index 96% rename from sdk/common/src/main/java/io/dataease/utils/ServletUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/ServletUtils.java index 1c3dacd..6d57cc4 100644 --- a/sdk/common/src/main/java/io/dataease/utils/ServletUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/ServletUtils.java @@ -1,6 +1,6 @@ -package io.dataease.utils; +package io.gisbi.utils; -import io.dataease.constant.AuthConstant; +import io.gisbi.constant.AuthConstant; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.ObjectUtils; diff --git a/sdk/common/src/main/java/io/dataease/utils/SnowFlake.java b/sdk/common/src/main/java/io/gisbi/utils/SnowFlake.java similarity index 99% rename from sdk/common/src/main/java/io/dataease/utils/SnowFlake.java rename to sdk/common/src/main/java/io/gisbi/utils/SnowFlake.java index 4d0b44e..c8042cf 100644 --- a/sdk/common/src/main/java/io/dataease/utils/SnowFlake.java +++ b/sdk/common/src/main/java/io/gisbi/utils/SnowFlake.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; public class SnowFlake { diff --git a/sdk/common/src/main/java/io/dataease/utils/StaticResourceUtils.java b/sdk/common/src/main/java/io/gisbi/utils/StaticResourceUtils.java similarity index 97% rename from sdk/common/src/main/java/io/dataease/utils/StaticResourceUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/StaticResourceUtils.java index 1bb4350..06eaf78 100644 --- a/sdk/common/src/main/java/io/dataease/utils/StaticResourceUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/StaticResourceUtils.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import org.apache.commons.lang3.StringUtils; import org.springframework.lang.NonNull; @@ -9,7 +9,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Base64; -import static io.dataease.constant.StaticResourceConstants.*; +import static io.gisbi.constant.StaticResourceConstants.*; public class StaticResourceUtils { diff --git a/sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java b/sdk/common/src/main/java/io/gisbi/utils/SystemSettingUtils.java similarity index 90% rename from sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/SystemSettingUtils.java index 4b110e7..576d454 100644 --- a/sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/SystemSettingUtils.java @@ -1,6 +1,6 @@ -package io.dataease.utils; +package io.gisbi.utils; -import io.dataease.constant.XpackSettingConstants; +import io.gisbi.constant.XpackSettingConstants; import java.util.List; diff --git a/sdk/common/src/main/java/io/dataease/utils/TokenUtils.java b/sdk/common/src/main/java/io/gisbi/utils/TokenUtils.java similarity index 93% rename from sdk/common/src/main/java/io/dataease/utils/TokenUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/TokenUtils.java index 526e7bc..45f0b01 100644 --- a/sdk/common/src/main/java/io/dataease/utils/TokenUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/TokenUtils.java @@ -1,9 +1,9 @@ -package io.dataease.utils; +package io.gisbi.utils; import com.auth0.jwt.JWT; import com.auth0.jwt.interfaces.DecodedJWT; -import io.dataease.auth.bo.TokenUserBO; -import io.dataease.exception.DEException; +import io.gisbi.auth.bo.TokenUserBO; +import io.gisbi.exception.DEException; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/common/src/main/java/io/dataease/utils/TreeUtils.java b/sdk/common/src/main/java/io/gisbi/utils/TreeUtils.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/utils/TreeUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/TreeUtils.java index d7f2e64..06ff7cc 100644 --- a/sdk/common/src/main/java/io/dataease/utils/TreeUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/TreeUtils.java @@ -1,7 +1,7 @@ -package io.dataease.utils; +package io.gisbi.utils; -import io.dataease.constant.SortConstants; -import io.dataease.model.*; +import io.gisbi.constant.SortConstants; +import io.gisbi.model.*; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/common/src/main/java/io/dataease/utils/UserUtils.java b/sdk/common/src/main/java/io/gisbi/utils/UserUtils.java similarity index 85% rename from sdk/common/src/main/java/io/dataease/utils/UserUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/UserUtils.java index 4e820d5..0779935 100644 --- a/sdk/common/src/main/java/io/dataease/utils/UserUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/UserUtils.java @@ -1,6 +1,6 @@ -package io.dataease.utils; +package io.gisbi.utils; -import io.dataease.auth.bo.TokenUserBO; +import io.gisbi.auth.bo.TokenUserBO; public class UserUtils { diff --git a/sdk/common/src/main/java/io/dataease/utils/VersionUtil.java b/sdk/common/src/main/java/io/gisbi/utils/VersionUtil.java similarity index 72% rename from sdk/common/src/main/java/io/dataease/utils/VersionUtil.java rename to sdk/common/src/main/java/io/gisbi/utils/VersionUtil.java index 396e83b..7febfe9 100644 --- a/sdk/common/src/main/java/io/dataease/utils/VersionUtil.java +++ b/sdk/common/src/main/java/io/gisbi/utils/VersionUtil.java @@ -1,4 +1,4 @@ -package io.dataease.utils; +package io.gisbi.utils; import org.springframework.core.env.Environment; @@ -8,7 +8,7 @@ public class VersionUtil { public static String getRandomVersion() { Environment environment = CommonBeanFactory.getBean(Environment.class); assert environment != null; - return environment.getProperty("dataease.version", "2.0.0"); + return environment.getProperty("gisbi.version", "1.0.0"); } } diff --git a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java b/sdk/common/src/main/java/io/gisbi/utils/WhitelistUtils.java similarity index 96% rename from sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java rename to sdk/common/src/main/java/io/gisbi/utils/WhitelistUtils.java index e7f2885..e5ee0db 100644 --- a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java +++ b/sdk/common/src/main/java/io/gisbi/utils/WhitelistUtils.java @@ -1,14 +1,14 @@ -package io.dataease.utils; +package io.gisbi.utils; -import io.dataease.constant.AuthConstant; -import io.dataease.exception.DEException; +import io.gisbi.constant.AuthConstant; +import io.gisbi.exception.DEException; import org.apache.commons.lang3.StringUtils; import org.springframework.core.env.Environment; import java.util.List; import java.util.Objects; -import static io.dataease.result.ResultCode.INTERFACE_ADDRESS_INVALID; +import static io.gisbi.result.ResultCode.INTERFACE_ADDRESS_INVALID; public class WhitelistUtils { diff --git a/sdk/common/src/main/java/io/dataease/websocket/WsMessage.java b/sdk/common/src/main/java/io/gisbi/websocket/WsMessage.java similarity index 90% rename from sdk/common/src/main/java/io/dataease/websocket/WsMessage.java rename to sdk/common/src/main/java/io/gisbi/websocket/WsMessage.java index da40be3..97edbe0 100644 --- a/sdk/common/src/main/java/io/dataease/websocket/WsMessage.java +++ b/sdk/common/src/main/java/io/gisbi/websocket/WsMessage.java @@ -1,4 +1,4 @@ -package io.dataease.websocket; +package io.gisbi.websocket; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sdk/common/src/main/java/io/dataease/websocket/WsService.java b/sdk/common/src/main/java/io/gisbi/websocket/WsService.java similarity index 72% rename from sdk/common/src/main/java/io/dataease/websocket/WsService.java rename to sdk/common/src/main/java/io/gisbi/websocket/WsService.java index 0a8b65b..73283f4 100644 --- a/sdk/common/src/main/java/io/dataease/websocket/WsService.java +++ b/sdk/common/src/main/java/io/gisbi/websocket/WsService.java @@ -1,4 +1,4 @@ -package io.dataease.websocket; +package io.gisbi.websocket; diff --git a/sdk/distributed/pom.xml b/sdk/distributed/pom.xml deleted file mode 100644 index bc0a6f8..0000000 --- a/sdk/distributed/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - sdk - io.dataease - ${dataease.version} - - 4.0.0 - - distributed - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - org.springframework.cloud - spring-cloud-loadbalancer - - - - - io.dataease - common - ${project.version} - - - - org.springframework.boot - spring-boot-configuration-processor - - - - org.flywaydb - flyway-core - - - - org.flywaydb - flyway-mysql - - - - - - - - - src/main/resources - - **/*.* - - - - - - \ No newline at end of file diff --git a/sdk/distributed/src/main/java/io/dataease/DeFeignConfiguration.java b/sdk/distributed/src/main/java/io/dataease/DeFeignConfiguration.java deleted file mode 100644 index 826d8f0..0000000 --- a/sdk/distributed/src/main/java/io/dataease/DeFeignConfiguration.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.dataease; - -import io.dataease.rpc.DeFeignRegister; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -@Configuration -@EnableFeignClients -@Import(DeFeignRegister.class) -public class DeFeignConfiguration { -} diff --git a/sdk/distributed/src/main/java/io/dataease/dds/DynamicContextHolder.java b/sdk/distributed/src/main/java/io/dataease/dds/DynamicContextHolder.java deleted file mode 100644 index 970ea47..0000000 --- a/sdk/distributed/src/main/java/io/dataease/dds/DynamicContextHolder.java +++ /dev/null @@ -1,34 +0,0 @@ -package io.dataease.dds; - -import java.util.ArrayDeque; -import java.util.Deque; - -public class DynamicContextHolder { - - private static final ThreadLocal> CONTEXT_HOLDER = new ThreadLocal() { - @Override - protected Object initialValue() { - return new ArrayDeque(); - } - }; - - - public static String peek() { - return CONTEXT_HOLDER.get().peek(); - } - - - public static void push(String dataSource) { - CONTEXT_HOLDER.get().push(dataSource); - } - - - public static void poll() { - Deque deque = CONTEXT_HOLDER.get(); - deque.poll(); - if (deque.isEmpty()) { - CONTEXT_HOLDER.remove(); - } - } - -} diff --git a/sdk/distributed/src/main/java/io/dataease/dds/DynamicDataSource.java b/sdk/distributed/src/main/java/io/dataease/dds/DynamicDataSource.java deleted file mode 100644 index 18b37cf..0000000 --- a/sdk/distributed/src/main/java/io/dataease/dds/DynamicDataSource.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.dataease.dds; - -import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; - - -public class DynamicDataSource extends AbstractRoutingDataSource { - - @Override - protected Object determineCurrentLookupKey() { - return DynamicContextHolder.peek(); - } - - - -} diff --git a/sdk/distributed/src/main/java/io/dataease/dds/config/DynamicDataSourceProperties.java b/sdk/distributed/src/main/java/io/dataease/dds/config/DynamicDataSourceProperties.java deleted file mode 100644 index a254c8f..0000000 --- a/sdk/distributed/src/main/java/io/dataease/dds/config/DynamicDataSourceProperties.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.dataease.dds.config; - - -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; - -import java.util.LinkedHashMap; -import java.util.Map; - -@ConfigurationProperties(prefix = "dynamic") -public class DynamicDataSourceProperties { - - private Map datasource = new LinkedHashMap<>(); - - public Map getDatasource() { - return datasource; - } - - public void setDatasource(Map datasource) { - this.datasource = datasource; - } - -} diff --git a/sdk/distributed/src/main/java/io/dataease/dds/config/DynamicDsConfig.java b/sdk/distributed/src/main/java/io/dataease/dds/config/DynamicDsConfig.java deleted file mode 100644 index 2f6a5b8..0000000 --- a/sdk/distributed/src/main/java/io/dataease/dds/config/DynamicDsConfig.java +++ /dev/null @@ -1,95 +0,0 @@ -package io.dataease.dds.config; - -import com.zaxxer.hikari.HikariDataSource; -import io.dataease.dds.DynamicDataSource; -import io.dataease.dds.constant.DataSourceConstant; -import io.dataease.dds.interceptor.DSInterceptor; -import io.dataease.dds.provider.TenantDatasourceProvider; -import io.dataease.flyway.TenantFlywayUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.util.CollectionUtils; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -import javax.sql.DataSource; -import java.util.HashMap; -import java.util.Map; - - -@Configuration -@EnableConfigurationProperties(DynamicDataSourceProperties.class) -public class DynamicDsConfig implements WebMvcConfigurer { - - @Value("${de.tenant.ds.lazy:false}") - private Boolean tenantDsLazyLoad; - - @Value("${spring.application.name}") - private String appName; - - @Autowired - private DynamicDataSourceProperties properties; - - @Bean - @ConfigurationProperties(prefix = "spring.datasource") - public DataSourceProperties dataSourceProperties() { - return new DataSourceProperties(); - } - - - @Bean - public DynamicDataSource dynamicDataSource(DataSourceProperties dataSourceProperties) { - DynamicDataSource dynamicDataSource = new DynamicDataSource(); - //设置多个数据源的map - Map dynamicDataSourceMap = getDynamicDataSource(); - HikariDataSource defaultDataSource = dataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource.class).build(); - dynamicDataSourceMap.put(DataSourceConstant.DATA_SOURCE_MANAGE, defaultDataSource); - if (!tenantDsLazyLoad) { - Map dbInfo = TenantDatasourceProvider.getDbInfo(defaultDataSource); - if (!CollectionUtils.isEmpty(dbInfo)) { - dynamicDataSourceMap.putAll(dbInfo); - } - } - dynamicDataSource.setTargetDataSources(dynamicDataSourceMap); - for (Map.Entry entry : dynamicDataSourceMap.entrySet()) { - Object key = entry.getKey(); - boolean isManage = key.equals(DataSourceConstant.DATA_SOURCE_MANAGE); - try { - TenantFlywayUtil.executeFlyway((HikariDataSource) entry.getValue(), isManage, appName); - } catch (Exception e) { - // 记录日志 循环继续 - } - } - //默认数据源 - dynamicDataSource.setDefaultTargetDataSource(defaultDataSource); - return dynamicDataSource; - - } - - /** - * 从配置文件加载额外的数据源 - * DE官方库业务库可以从这里加载进去(客户业务库是从数据库读进去) - * - * @return - */ - private Map getDynamicDataSource() { - Map dataSourcePropertiesMap = properties.getDatasource(); - Map targetDataSources = new HashMap<>(dataSourcePropertiesMap.size()); - dataSourcePropertiesMap.forEach((k, v) -> { - HikariDataSource hikariDataSource = v.initializeDataSourceBuilder().type(HikariDataSource.class).build(); - targetDataSources.put(k, hikariDataSource); - }); - return targetDataSources; - } - - - @Override - public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(new DSInterceptor()); - } -} diff --git a/sdk/distributed/src/main/java/io/dataease/dds/constant/DataSourceConstant.java b/sdk/distributed/src/main/java/io/dataease/dds/constant/DataSourceConstant.java deleted file mode 100644 index c11bed3..0000000 --- a/sdk/distributed/src/main/java/io/dataease/dds/constant/DataSourceConstant.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.dataease.dds.constant; - -public class DataSourceConstant { - - /** - * 这里的命名统一在配置文件命名的基础上加dataSource前缀且改小驼峰 - * 默认数据源名称 - */ - public static final String DATA_SOURCE_MANAGE = "manege-ds"; - - /** - * 递增可配数据源名称 - * 这里的命名统一在配置文件命名的基础上加dataSource前缀且改小驼峰 - * 后面可接着 db2... dbn 也可以根据 - */ - public static final String DATA_SOURCE_OFFICIAL = "official-ds"; - - - public static final String DS_NAME_PREFIX = "tenant_%s_%s"; -} diff --git a/sdk/distributed/src/main/java/io/dataease/dds/interceptor/DSInterceptor.java b/sdk/distributed/src/main/java/io/dataease/dds/interceptor/DSInterceptor.java deleted file mode 100644 index 4a838ac..0000000 --- a/sdk/distributed/src/main/java/io/dataease/dds/interceptor/DSInterceptor.java +++ /dev/null @@ -1,31 +0,0 @@ -package io.dataease.dds.interceptor; - -import io.dataease.dds.DynamicContextHolder; -import io.dataease.dds.constant.DataSourceConstant; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.web.servlet.HandlerInterceptor; - -/** - * 不同租户不同二级域名 - * nginx下把租户ID以及租户创建时间设置在请求头 - * 获取请求头部租户ID和创建时间 - * 根据租户ID和创建时间获取租户数据源名称 - * 切换数据源 - */ -public class DSInterceptor implements HandlerInterceptor { - - - @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - String tenant = request.getHeader("tenant"); - String time = request.getHeader("time"); - DynamicContextHolder.push(getTenantDsKey(tenant, time)); - return true; - } - - private String getTenantDsKey(String tenant, String time) { - if (null == tenant || null == time) return "official-ds"; - return String.format(DataSourceConstant.DS_NAME_PREFIX, tenant, time); - } -} diff --git a/sdk/distributed/src/main/java/io/dataease/dds/provider/TenantDatasourceProvider.java b/sdk/distributed/src/main/java/io/dataease/dds/provider/TenantDatasourceProvider.java deleted file mode 100644 index 49c5ffb..0000000 --- a/sdk/distributed/src/main/java/io/dataease/dds/provider/TenantDatasourceProvider.java +++ /dev/null @@ -1,141 +0,0 @@ -package io.dataease.dds.provider; - - -import com.zaxxer.hikari.HikariConfig; -import com.zaxxer.hikari.HikariDataSource; -import org.springframework.util.CollectionUtils; -import org.springframework.util.ObjectUtils; - -import javax.sql.DataSource; -import java.sql.*; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -public class TenantDatasourceProvider { - - private static final String MYSQL_DRIVER_CLASS_NAME = "com.mysql.cj.jdbc.Driver"; - - private static final String DS_NAME_PREFIX = "tenant_%s_%s"; - - private static final String ALL_TENANT_SQL = "select d.*, i.create_time from tenant_db d left join tenant_info i on d.tenant_id = i.id"; - private static final String ONE_TENANT_SQL = "select d.*, i.create_time from tenant_db d left join tenant_info i on d.tenant_id = i.id where d.tenant_id = ? "; - - - /** - * 这里需要加上异常处理 - * 某个数据源不能构建成功 continue 不能影响全局 - * @param manage - * @return - */ - public static Map getDbInfo(DataSource manage) { - Connection connection = null; - PreparedStatement statement = null; - ResultSet resultSet = null; - try { - connection = manage.getConnection(); - statement = connection.prepareStatement(ALL_TENANT_SQL); - resultSet = statement.executeQuery(); - List> mapList = parseResultSet(resultSet); - if (!CollectionUtils.isEmpty(mapList)) { - return mapList.stream().collect(Collectors.toMap(TenantDatasourceProvider::getDsKey, TenantDatasourceProvider::buildHikari)); - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - close(connection,statement, resultSet); - } - return null; - } - - - - public static Map getDbInfo(DataSource manage, Long tenantId) throws Exception{ - - - Connection connection = null; - PreparedStatement statement = null; - ResultSet resultSet = null; - try { - connection = manage.getConnection(); - statement = connection.prepareStatement(ONE_TENANT_SQL); - statement.setLong(1, tenantId); - resultSet = statement.executeQuery(); - List> mapList = parseResultSet(resultSet); - if (!CollectionUtils.isEmpty(mapList)) { - return mapList.stream().collect(Collectors.toMap(TenantDatasourceProvider::getDsKey, TenantDatasourceProvider::buildHikari)); - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - close(connection,statement, resultSet); - } - return null; - - } - - private static String getDsKey(Map row) { - Long tenantId = (Long) row.get("tenant_id"); - Long createTime = (Long) row.get("create_time"); - Object dsKeyObj = null; - if (!ObjectUtils.isEmpty((dsKeyObj = row.get("ds_key")))) { - return dsKeyObj.toString(); - } - return String.format(DS_NAME_PREFIX, tenantId.toString(), createTime.toString()); - } - - private static DataSource buildHikari(Map param) { - HikariConfig config = new HikariConfig(); - config.setDriverClassName(param.getOrDefault("driver_class", MYSQL_DRIVER_CLASS_NAME).toString()); - config.setJdbcUrl(param.get("url").toString()); - config.setUsername(param.get("username").toString()); - config.setPassword(param.get("pwd").toString()); - HikariDataSource hikariDataSource = new HikariDataSource(config); - return hikariDataSource; - } - - private static List> parseResultSet(ResultSet resultSet) throws Exception{ - List> resultList = new ArrayList<>(); - ResultSetMetaData metaData = resultSet.getMetaData(); - int columnCount = metaData.getColumnCount(); - while (resultSet.next()) { - Map row = new HashMap<>(); - for (int i = 1; i <= columnCount; i++) { - Object cellVal = resultSet.getObject(i); - String columnLabel = metaData.getColumnLabel(i); - row.put(columnLabel, cellVal); - } - resultList.add(row); - } - return resultList; - } - - public static void close(Connection connection, PreparedStatement statement, ResultSet rs) { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (Exception e) { - e.printStackTrace(); - } - try { - if (statement != null) { - statement.close(); - } - } catch (Exception e) { - e.printStackTrace(); - } - try { - if (rs != null && !rs.isClosed()) { - rs.close(); - } - } catch (Exception e) { - e.printStackTrace(); - } - - - } - -} diff --git a/sdk/distributed/src/main/java/io/dataease/flyway/TenantFlywayUtil.java b/sdk/distributed/src/main/java/io/dataease/flyway/TenantFlywayUtil.java deleted file mode 100644 index acc0ece..0000000 --- a/sdk/distributed/src/main/java/io/dataease/flyway/TenantFlywayUtil.java +++ /dev/null @@ -1,42 +0,0 @@ -package io.dataease.flyway; - -import org.flywaydb.core.Flyway; -import org.flywaydb.core.api.configuration.ClassicConfiguration; -import org.flywaydb.core.api.configuration.Configuration; - -import javax.sql.DataSource; -import java.nio.charset.Charset; - -public class TenantFlywayUtil { - - private static final String FLYWAY_MANAGE_TABLE_NAME = "de_manage_version"; - - private static final String FLYWAY_TABLENAME_FORMAT = "de_tenant_%s_version"; - private static final String FLYWAY_LOCATION = "classpath:db/migration"; - private static final String FLYWAY_MANAGE_LOCATION = "classpath:db/distributed/manage"; - - - private static Configuration buildConfiguration(DataSource dataSource, boolean isManager, String appName) { - ClassicConfiguration configuration = new ClassicConfiguration(); - configuration.setValidateOnMigrate(true); - configuration.setBaselineOnMigrate(true); - configuration.setTable(isManager ? FLYWAY_MANAGE_TABLE_NAME : getVersionTableName(appName)); - configuration.setEncoding(Charset.forName("utf-8")); - configuration.setOutOfOrder(true); - configuration.setBaselineVersionAsString("1"); - configuration.setLocationsAsStrings(isManager ? FLYWAY_MANAGE_LOCATION : FLYWAY_LOCATION); - configuration.setDataSource(dataSource); - return configuration; - } - - public static void executeFlyway(DataSource dataSource, boolean isManage, String appName) throws Exception { - Configuration configuration = buildConfiguration(dataSource, isManage, appName); - Flyway flyway = new Flyway(configuration); - flyway.migrate(); - } - - private static String getVersionTableName(String appName) { - return String.format(FLYWAY_TABLENAME_FORMAT, appName); - } - -} diff --git a/sdk/distributed/src/main/java/io/dataease/rpc/DeFeignRegister.java b/sdk/distributed/src/main/java/io/dataease/rpc/DeFeignRegister.java deleted file mode 100644 index 45419b8..0000000 --- a/sdk/distributed/src/main/java/io/dataease/rpc/DeFeignRegister.java +++ /dev/null @@ -1,410 +0,0 @@ -package io.dataease.rpc; - -import feign.Request; - -import io.dataease.feign.DeFeign; -import org.springframework.aop.scope.ScopedProxyUtils; -import org.springframework.beans.factory.FactoryBean; -import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; -import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition; -import org.springframework.beans.factory.config.*; -import org.springframework.beans.factory.support.AbstractBeanDefinition; -import org.springframework.beans.factory.support.BeanDefinitionBuilder; -import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; -import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.cloud.openfeign.*; -import org.springframework.context.EnvironmentAware; -import org.springframework.context.ResourceLoaderAware; -import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; -import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; -import org.springframework.core.annotation.AnnotationAttributes; -import org.springframework.core.env.Environment; -import org.springframework.core.io.ResourceLoader; -import org.springframework.core.type.AnnotationMetadata; -import org.springframework.core.type.filter.AnnotationTypeFilter; -import org.springframework.util.Assert; -import org.springframework.util.ClassUtils; -import org.springframework.util.ObjectUtils; -import org.springframework.util.StringUtils; - -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.*; - -public class DeFeignRegister implements ImportBeanDefinitionRegistrar, ResourceLoaderAware, EnvironmentAware { - - private ResourceLoader resourceLoader; - - private Environment environment; - - public DeFeignRegister() { - } - - static void validateFallback(final Class clazz) { - Assert.isTrue(!clazz.isInterface(), "Fallback class must implement the interface annotated by @DeFeign"); - } - - static void validateFallbackFactory(final Class clazz) { - Assert.isTrue(!clazz.isInterface(), "Fallback factory must produce instances " - + "of fallback classes that implement the interface annotated by @DeFeign"); - } - - static String getName(String name) { - if (!StringUtils.hasText(name)) { - return ""; - } - - String host = null; - try { - String url; - if (!name.startsWith("http://") && !name.startsWith("https://")) { - url = "http://" + name; - } else { - url = name; - } - host = new URI(url).getHost(); - - } catch (URISyntaxException ignored) { - } - Assert.state(host != null, "Service id not legal hostname (" + name + ")"); - return name; - } - - static String getUrl(String url) { - if (StringUtils.hasText(url) && !(url.startsWith("#{") && url.contains("}"))) { - if (!url.contains("://")) { - url = "http://" + url; - } - try { - new URL(url); - } catch (MalformedURLException e) { - throw new IllegalArgumentException(url + " is malformed", e); - } - } - return url; - } - - static String getPath(String path) { - if (StringUtils.hasText(path)) { - path = path.trim(); - if (!path.startsWith("/")) { - path = "/" + path; - } - if (path.endsWith("/")) { - path = path.substring(0, path.length() - 1); - } - } - return path; - } - - @Override - public void setResourceLoader(ResourceLoader resourceLoader) { - this.resourceLoader = resourceLoader; - } - - @Override - public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) { - registerDeFeigns(metadata, registry); - } - - - public void registerDeFeigns(AnnotationMetadata metadata, BeanDefinitionRegistry registry) { - LinkedHashSet candidateComponents = new LinkedHashSet<>(); - Map attrs = metadata.getAnnotationAttributes(EnableFeignClients.class.getName()); - final Class[] clients = attrs == null ? null : (Class[]) attrs.get("clients"); - if (clients == null || clients.length == 0) { - ClassPathScanningCandidateComponentProvider scanner = getScanner(); - scanner.setResourceLoader(this.resourceLoader); - scanner.addIncludeFilter(new AnnotationTypeFilter(DeFeign.class)); - Set basePackages = getBasePackages(metadata); - for (String basePackage : basePackages) { - candidateComponents.addAll(scanner.findCandidateComponents(basePackage)); - } - } else { - for (Class clazz : clients) { - candidateComponents.add(new AnnotatedGenericBeanDefinition(clazz)); - } - } - - for (BeanDefinition candidateComponent : candidateComponents) { - if (candidateComponent instanceof AnnotatedBeanDefinition beanDefinition) { - // verify annotated class is an interface - AnnotationMetadata annotationMetadata = beanDefinition.getMetadata(); - Assert.isTrue(annotationMetadata.isInterface(), "@DeFeign can only be specified on an interface"); - - Map attributes = annotationMetadata - .getAnnotationAttributes(DeFeign.class.getCanonicalName()); - - registerDeFeign(registry, annotationMetadata, attributes); - } - } - } - - private void registerDeFeign(BeanDefinitionRegistry registry, AnnotationMetadata annotationMetadata, - Map attributes) { - String className = annotationMetadata.getClassName(); - if (String.valueOf(false).equals( - environment.getProperty("spring.cloud.openfeign.lazy-attributes-resolution", String.valueOf(false)))) { - eagerlyRegisterDeFeignBeanDefinition(className, attributes, registry); - } else { - lazilyRegisterDeFeignBeanDefinition(className, attributes, registry); - } - } - - private void eagerlyRegisterDeFeignBeanDefinition(String className, Map attributes, - BeanDefinitionRegistry registry) { - validate(attributes); - BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(FeignClientFactoryBean.class); - definition.addPropertyValue("url", getUrl(null, attributes)); - definition.addPropertyValue("path", getPath(null, attributes)); - String name = getName(attributes); - definition.addPropertyValue("name", name); - String contextId = getContextId(null, attributes); - definition.addPropertyValue("contextId", contextId); - definition.addPropertyValue("type", className); - definition.addPropertyValue("dismiss404", Boolean.parseBoolean(String.valueOf(attributes.get("dismiss404")))); - Object fallback = attributes.get("fallback"); - if (fallback != null) { - definition.addPropertyValue("fallback", - (fallback instanceof Class ? fallback : ClassUtils.resolveClassName(fallback.toString(), null))); - } - Object fallbackFactory = attributes.get("fallbackFactory"); - if (fallbackFactory != null) { - definition.addPropertyValue("fallbackFactory", fallbackFactory instanceof Class ? fallbackFactory - : ClassUtils.resolveClassName(fallbackFactory.toString(), null)); - } - definition.addPropertyValue("fallbackFactory", attributes.get("fallbackFactory")); - definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE); - definition.addPropertyValue("refreshableClient", isClientRefreshEnabled()); - String[] qualifiers = getQualifiers(attributes); - if (ObjectUtils.isEmpty(qualifiers)) { - qualifiers = new String[]{contextId + "DeFeign"}; - } - // This is done so that there's a way to retrieve qualifiers while generating AOT - // code - definition.addPropertyValue("qualifiers", qualifiers); - AbstractBeanDefinition beanDefinition = definition.getBeanDefinition(); - beanDefinition.setAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE, className); - // has a default, won't be null - boolean primary = (Boolean) attributes.get("primary"); - beanDefinition.setPrimary(primary); - BeanDefinitionHolder holder = new BeanDefinitionHolder(beanDefinition, className, qualifiers); - BeanDefinitionReaderUtils.registerBeanDefinition(holder, registry); - registerRefreshableBeanDefinition(registry, contextId, Request.Options.class, OptionsFactoryBean.class); - registerRefreshableBeanDefinition(registry, contextId, RefreshableUrl.class, RefreshableUrlFactoryBean.class); - } - - private void lazilyRegisterDeFeignBeanDefinition(String className, Map attributes, - BeanDefinitionRegistry registry) { - ConfigurableBeanFactory beanFactory = registry instanceof ConfigurableBeanFactory - ? (ConfigurableBeanFactory) registry : null; - Class clazz = ClassUtils.resolveClassName(className, null); - String contextId = getContextId(beanFactory, attributes); - String name = getName(attributes); - FeignClientFactoryBean factoryBean = new FeignClientFactoryBean(); - factoryBean.setBeanFactory(beanFactory); - factoryBean.setName(name); - factoryBean.setContextId(contextId); - factoryBean.setType(clazz); - factoryBean.setRefreshableClient(isClientRefreshEnabled()); - BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(clazz, () -> { - factoryBean.setUrl(getUrl(beanFactory, attributes)); - factoryBean.setPath(getPath(beanFactory, attributes)); - factoryBean.setDismiss404(Boolean.parseBoolean(String.valueOf(attributes.get("dismiss404")))); - Object fallback = attributes.get("fallback"); - if (fallback != null) { - factoryBean.setFallback(fallback instanceof Class ? (Class) fallback - : ClassUtils.resolveClassName(fallback.toString(), null)); - } - Object fallbackFactory = attributes.get("fallbackFactory"); - if (fallbackFactory != null) { - factoryBean.setFallbackFactory(fallbackFactory instanceof Class ? (Class) fallbackFactory - : ClassUtils.resolveClassName(fallbackFactory.toString(), null)); - } - return factoryBean.getObject(); - }); - definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE); - definition.setLazyInit(true); - validate(attributes); - - AbstractBeanDefinition beanDefinition = definition.getBeanDefinition(); - beanDefinition.setAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE, className); - beanDefinition.setAttribute("DeFeignsRegistrarFactoryBean", factoryBean); - - // has a default, won't be null - boolean primary = (Boolean) attributes.get("primary"); - - beanDefinition.setPrimary(primary); - - String[] qualifiers = getQualifiers(attributes); - if (ObjectUtils.isEmpty(qualifiers)) { - qualifiers = new String[]{contextId + "DeFeign"}; - } - - BeanDefinitionHolder holder = new BeanDefinitionHolder(beanDefinition, className, qualifiers); - BeanDefinitionReaderUtils.registerBeanDefinition(holder, registry); - - registerRefreshableBeanDefinition(registry, contextId, Request.Options.class, OptionsFactoryBean.class); - registerRefreshableBeanDefinition(registry, contextId, RefreshableUrl.class, RefreshableUrlFactoryBean.class); - } - - private void validate(Map attributes) { - AnnotationAttributes annotation = AnnotationAttributes.fromMap(attributes); - // This blows up if an aliased property is overspecified - // FIXME annotation.getAliasedString("name", DeFeign.class, null); - validateFallback(annotation.getClass("fallback")); - validateFallbackFactory(annotation.getClass("fallbackFactory")); - } - - /* for testing */ String getName(Map attributes) { - return getName(null, attributes); - } - - String getName(ConfigurableBeanFactory beanFactory, Map attributes) { - String name = (String) attributes.get("serviceId"); - if (!StringUtils.hasText(name)) { - name = (String) attributes.get("name"); - } - if (!StringUtils.hasText(name)) { - name = (String) attributes.get("value"); - } - name = resolve(beanFactory, name); - return getName(name); - } - - private String getContextId(ConfigurableBeanFactory beanFactory, Map attributes) { - String contextId = (String) attributes.get("contextId"); - if (!StringUtils.hasText(contextId)) { - return getName(attributes); - } - - contextId = resolve(beanFactory, contextId); - return getName(contextId); - } - - private String resolve(ConfigurableBeanFactory beanFactory, String value) { - if (StringUtils.hasText(value)) { - if (beanFactory == null) { - return this.environment.resolvePlaceholders(value); - } - BeanExpressionResolver resolver = beanFactory.getBeanExpressionResolver(); - String resolved = beanFactory.resolveEmbeddedValue(value); - if (resolver == null) { - return resolved; - } - Object evaluateValue = resolver.evaluate(resolved, new BeanExpressionContext(beanFactory, null)); - if (evaluateValue != null) { - return String.valueOf(evaluateValue); - } - return null; - } - return value; - } - - private String getUrl(ConfigurableBeanFactory beanFactory, Map attributes) { - String url = resolve(beanFactory, (String) attributes.get("url")); - return getUrl(url); - } - - private String getPath(ConfigurableBeanFactory beanFactory, Map attributes) { - String path = resolve(beanFactory, (String) attributes.get("path")); - return getPath(path); - } - - protected ClassPathScanningCandidateComponentProvider getScanner() { - return new ClassPathScanningCandidateComponentProvider(false, this.environment) { - @Override - protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) { - boolean isCandidate = false; - if (beanDefinition.getMetadata().isIndependent()) { - if (!beanDefinition.getMetadata().isAnnotation()) { - isCandidate = true; - } - } - return isCandidate; - } - }; - } - - protected Set getBasePackages(AnnotationMetadata importingClassMetadata) { - Map attributes = importingClassMetadata - .getAnnotationAttributes(EnableFeignClients.class.getCanonicalName()); - - Set basePackages = new HashSet<>(); - for (String pkg : (String[]) attributes.get("value")) { - if (StringUtils.hasText(pkg)) { - basePackages.add(pkg); - } - } - for (String pkg : (String[]) attributes.get("basePackages")) { - if (StringUtils.hasText(pkg)) { - basePackages.add(pkg); - } - } - for (Class clazz : (Class[]) attributes.get("basePackageClasses")) { - basePackages.add(ClassUtils.getPackageName(clazz)); - } - - if (basePackages.isEmpty()) { - basePackages.add(ClassUtils.getPackageName(importingClassMetadata.getClassName())); - } - return basePackages; - } - - private String getQualifier(Map client) { - if (client == null) { - return null; - } - String qualifier = (String) client.get("qualifier"); - if (StringUtils.hasText(qualifier)) { - return qualifier; - } - return null; - } - - private String[] getQualifiers(Map client) { - if (client == null) { - return null; - } - List qualifierList = new ArrayList<>(Arrays.asList((String[]) client.get("qualifiers"))); - qualifierList.removeIf(qualifier -> !StringUtils.hasText(qualifier)); - if (qualifierList.isEmpty() && getQualifier(client) != null) { - qualifierList = Collections.singletonList(getQualifier(client)); - } - return !qualifierList.isEmpty() ? qualifierList.toArray(new String[0]) : null; - } - - - @Override - public void setEnvironment(Environment environment) { - this.environment = environment; - } - - /** - * This method registers beans definition with refreshScope. - * - * @param registry spring bean definition registry - * @param contextId name of feign client - * @param beanType type of bean - * @param factoryBeanType points to a relevant bean factory - */ - private void registerRefreshableBeanDefinition(BeanDefinitionRegistry registry, String contextId, Class beanType, - Class factoryBeanType) { - if (isClientRefreshEnabled()) { - String beanName = beanType.getCanonicalName() + "-" + contextId; - BeanDefinitionBuilder definitionBuilder = BeanDefinitionBuilder.genericBeanDefinition(factoryBeanType); - definitionBuilder.setScope("refresh"); - definitionBuilder.addPropertyValue("contextId", contextId); - BeanDefinitionHolder definitionHolder = new BeanDefinitionHolder(definitionBuilder.getBeanDefinition(), - beanName); - definitionHolder = ScopedProxyUtils.createScopedProxy(definitionHolder, registry, true); - BeanDefinitionReaderUtils.registerBeanDefinition(definitionHolder, registry); - } - } - - private boolean isClientRefreshEnabled() { - return environment.getProperty("spring.cloud.openfeign.client.refresh-enabled", Boolean.class, false); - } -} diff --git a/sdk/distributed/src/main/resources/db/distributed/manage/V1.1__manage_ddl.sql b/sdk/distributed/src/main/resources/db/distributed/manage/V1.1__manage_ddl.sql deleted file mode 100644 index 1644651..0000000 --- a/sdk/distributed/src/main/resources/db/distributed/manage/V1.1__manage_ddl.sql +++ /dev/null @@ -1,31 +0,0 @@ --- ---------------------------- --- Table structure for tenant_info --- ---------------------------- -DROP TABLE IF EXISTS `tenant_info`; -CREATE TABLE `tenant_info` -( - `id` bigint NOT NULL COMMENT '租户ID', - `domain` varchar(255) NOT NULL COMMENT '二级域名', - `account` varchar(255) NOT NULL COMMENT '管理员账号', - `pwd` varchar(255) NOT NULL COMMENT '管理员密码', - `company` varchar(255) DEFAULT NULL COMMENT '租户公司', - `create_time` bigint NOT NULL COMMENT '创建时间', - `update_time` bigint DEFAULT NULL COMMENT '修改时间', - `enable` tinyint(1) NOT NULL COMMENT '是否可用', - `deleted` tinyint(1) NOT NULL COMMENT '是否已删除', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - --- ---------------------------- --- Table structure for tenant_db --- ---------------------------- -DROP TABLE IF EXISTS `tenant_db`; -CREATE TABLE `tenant_db` -( - `id` bigint NOT NULL COMMENT '数据源ID', - `tenant_id` bigint NOT NULL COMMENT '租户ID', - `url` varchar(255) NOT NULL COMMENT 'jdbcurl', - `username` varchar(255) NOT NULL COMMENT 'db用户', - `pwd` varchar(255) NOT NULL COMMENT 'db密码', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file diff --git a/sdk/extensions/extensions-datafilling/pom.xml b/sdk/extensions/extensions-datafilling/pom.xml index 3950085..b454f99 100644 --- a/sdk/extensions/extensions-datafilling/pom.xml +++ b/sdk/extensions/extensions-datafilling/pom.xml @@ -4,25 +4,32 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.dataease + io.gisbi extensions - ${dataease.version} + 1.0.0 extensions-datafilling - - io.dataease - extensions-datasource - ${dataease.version} - org.apache.commons commons-collections4 4.5.0-M2 + + io.gisbi + common + 1.0.0 + compile + + + io.gisbi + extensions-datasource + 1.0.0 + compile + diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/api/DfPluginManageApi.java b/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/api/DfPluginManageApi.java deleted file mode 100644 index b4566aa..0000000 --- a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/api/DfPluginManageApi.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.dataease.extensions.datafilling.api; - -import io.dataease.extensions.datafilling.vo.XpackPluginsDfVO; - -import java.util.List; - -public interface DfPluginManageApi { - List queryPluginDf(); -} diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/factory/ExtDDLProviderFactory.java b/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/factory/ExtDDLProviderFactory.java deleted file mode 100644 index 685cece..0000000 --- a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/factory/ExtDDLProviderFactory.java +++ /dev/null @@ -1,60 +0,0 @@ -package io.dataease.extensions.datafilling.factory; - -import io.dataease.exception.DEException; -import io.dataease.extensions.datafilling.plugin.DataFillingPlugin; -import io.dataease.extensions.datafilling.provider.ExtDDLProvider; -import io.dataease.extensions.datafilling.vo.XpackPluginsDfVO; -import io.dataease.extensions.datasource.utils.SpringContextUtil; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; -import io.dataease.license.utils.LicenseUtil; -import io.dataease.license.utils.LogUtil; -import io.dataease.plugins.factory.DataEasePluginFactory; - -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -public class ExtDDLProviderFactory { - - private static final Map templateMap = new ConcurrentHashMap<>(); - - public static ExtDDLProvider getExtDDLProvider(String type) { - DatasourceConfiguration.DatasourceType datasourceType = DatasourceConfiguration.DatasourceType.valueOf(type); - switch (datasourceType) { - case mysql, mariadb -> { - return SpringContextUtil.getApplicationContext().getBean("mysqlExtDDLProvider", ExtDDLProvider.class); - } - } - ExtDDLProvider instance = getInstance(type); - if (instance == null) { - DEException.throwException("插件异常,请检查插件"); - } - return instance; - } - - public static ExtDDLProvider getInstance(String type) { - //if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); - String key = "df_" + type; - return templateMap.get(key); - } - - public static void loadPlugin(String type, DataFillingPlugin plugin) { - //if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); - String key = "df_" + type; - if (templateMap.containsKey(key)) return; - templateMap.put(key, plugin); - try { - String moduleName = plugin.getPluginInfo().getModuleName(); - DataEasePluginFactory.loadTemplate(moduleName, plugin); - } catch (Exception e) { - LogUtil.error(e.getMessage(), new Throwable(e)); - DEException.throwException(e); - } - } - - public static List getDfConfigList() { - //if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); - return templateMap.values().stream().map(DataFillingPlugin::getConfig).toList(); - } - -} diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/plugin/DataFillingPlugin.java b/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/plugin/DataFillingPlugin.java deleted file mode 100644 index a0fa4b1..0000000 --- a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/plugin/DataFillingPlugin.java +++ /dev/null @@ -1,37 +0,0 @@ -package io.dataease.extensions.datafilling.plugin; - -import io.dataease.exception.DEException; -import io.dataease.extensions.datafilling.factory.ExtDDLProviderFactory; -import io.dataease.extensions.datafilling.provider.ExtDDLProvider; -import io.dataease.extensions.datafilling.vo.XpackPluginsDfVO; -import io.dataease.license.utils.JsonUtil; -import io.dataease.plugins.template.DataEasePlugin; -import io.dataease.plugins.vo.DataEasePluginVO; - -public abstract class DataFillingPlugin extends ExtDDLProvider implements DataEasePlugin { - - @Override - public void loadPlugin() { - XpackPluginsDfVO viewConfig = getConfig(); - ExtDDLProviderFactory.loadPlugin(viewConfig.getType(), this); - } - - - public XpackPluginsDfVO getConfig() { - DataEasePluginVO pluginInfo = null; - try { - pluginInfo = getPluginInfo(); - } catch (Exception e) { - DEException.throwException(e); - } - String config = pluginInfo.getConfig(); - XpackPluginsDfVO vo = JsonUtil.parseObject(config, XpackPluginsDfVO.class); - vo.setIcon(pluginInfo.getIcon()); - return vo; - } - - @Override - public void unloadPlugin() { - - } -} diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/api/DfPluginManageApi.java b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/api/DfPluginManageApi.java new file mode 100644 index 0000000..593895a --- /dev/null +++ b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/api/DfPluginManageApi.java @@ -0,0 +1,9 @@ +package io.gisbi.extensions.datafilling.api; + +import io.gisbi.extensions.datafilling.vo.XpackPluginsDfVO; + +import java.util.List; + +public interface DfPluginManageApi { + List queryPluginDf(); +} diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtFormSettings.java b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/dto/ExtFormSettings.java similarity index 94% rename from sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtFormSettings.java rename to sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/dto/ExtFormSettings.java index 1b2fe57..146b560 100644 --- a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtFormSettings.java +++ b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/dto/ExtFormSettings.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datafilling.dto; +package io.gisbi.extensions.datafilling.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtIndexField.java b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/dto/ExtIndexField.java similarity index 93% rename from sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtIndexField.java rename to sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/dto/ExtIndexField.java index 68a93ff..fd81462 100644 --- a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtIndexField.java +++ b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/dto/ExtIndexField.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datafilling.dto; +package io.gisbi.extensions.datafilling.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtTableField.java b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/dto/ExtTableField.java similarity index 98% rename from sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtTableField.java rename to sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/dto/ExtTableField.java index 80b88c8..46663c0 100644 --- a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtTableField.java +++ b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/dto/ExtTableField.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datafilling.dto; +package io.gisbi.extensions.datafilling.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtraColumnItem.java b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/dto/ExtraColumnItem.java similarity index 79% rename from sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtraColumnItem.java rename to sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/dto/ExtraColumnItem.java index 2ead8a9..3293826 100644 --- a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtraColumnItem.java +++ b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/dto/ExtraColumnItem.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datafilling.dto; +package io.gisbi.extensions.datafilling.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/factory/ExtDDLProviderFactory.java b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/factory/ExtDDLProviderFactory.java new file mode 100644 index 0000000..5523b28 --- /dev/null +++ b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/factory/ExtDDLProviderFactory.java @@ -0,0 +1,58 @@ +package io.gisbi.extensions.datafilling.factory; + +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datafilling.plugin.DataFillingPlugin; +import io.gisbi.extensions.datafilling.provider.ExtDDLProvider; +import io.gisbi.extensions.datafilling.vo.XpackPluginsDfVO; +import io.gisbi.extensions.datasource.utils.SpringContextUtil; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class ExtDDLProviderFactory { + + private static final Map templateMap = new ConcurrentHashMap<>(); + + public static ExtDDLProvider getExtDDLProvider(String type) { + DatasourceConfiguration.DatasourceType datasourceType = DatasourceConfiguration.DatasourceType.valueOf(type); + switch (datasourceType) { + case mysql, mariadb -> { + return SpringContextUtil.getApplicationContext().getBean("mysqlExtDDLProvider", ExtDDLProvider.class); + } + } + ExtDDLProvider instance = getInstance(type); + if (instance == null) { + DEException.throwException("插件异常,请检查插件"); + } + return instance; + } + + public static ExtDDLProvider getInstance(String type) { + //if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); + String key = "df_" + type; + return templateMap.get(key); + } + +// public static void loadPlugin(String type, DataFillingPlugin plugin) { +// //if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); +// String key = "df_" + type; +// if (templateMap.containsKey(key)) return; +// templateMap.put(key, plugin); +// try { +// String moduleName = plugin.getPluginInfo().getModuleName(); +// DataEasePluginFactory.loadTemplate(moduleName, plugin); +// } catch (Exception e) { +// LogUtil.error(e.getMessage(), new Throwable(e)); +// DEException.throwException(e); +// } +// } + + public static List getDfConfigList() { + //if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); +// return templateMap.values().stream().map(DataFillingPlugin::getConfig).toList(); + return null; + } + +} diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/plugin/DataFillingPlugin.java b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/plugin/DataFillingPlugin.java new file mode 100644 index 0000000..b8eb868 --- /dev/null +++ b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/plugin/DataFillingPlugin.java @@ -0,0 +1,34 @@ +package io.gisbi.extensions.datafilling.plugin; + +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datafilling.factory.ExtDDLProviderFactory; +import io.gisbi.extensions.datafilling.provider.ExtDDLProvider; +import io.gisbi.extensions.datafilling.vo.XpackPluginsDfVO; + +public abstract class DataFillingPlugin extends ExtDDLProvider{ + + +// public void loadPlugin() { +// XpackPluginsDfVO viewConfig = getConfig(); +// //ExtDDLProviderFactory.loadPlugin(viewConfig.getType(), this); +// } + + +// public XpackPluginsDfVO getConfig() { +// DataEasePluginVO pluginInfo = null; +// try { +// pluginInfo = getPluginInfo(); +// } catch (Exception e) { +// DEException.throwException(e); +// } +// String config = pluginInfo.getConfig(); +// XpackPluginsDfVO vo = JsonUtil.parseObject(config, XpackPluginsDfVO.class); +// vo.setIcon(pluginInfo.getIcon()); +// return vo; +// } + + + public void unloadPlugin() { + + } +} diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/provider/ExtDDLProvider.java b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/provider/ExtDDLProvider.java similarity index 96% rename from sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/provider/ExtDDLProvider.java rename to sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/provider/ExtDDLProvider.java index d6f2814..4a61f1a 100644 --- a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/provider/ExtDDLProvider.java +++ b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/provider/ExtDDLProvider.java @@ -1,10 +1,10 @@ -package io.dataease.extensions.datafilling.provider; +package io.gisbi.extensions.datafilling.provider; -import io.dataease.extensions.datasource.dto.TableField; -import io.dataease.extensions.datafilling.dto.ExtIndexField; -import io.dataease.extensions.datafilling.dto.ExtTableField; -import io.dataease.extensions.datasource.dto.TableFieldWithValue; +import io.gisbi.extensions.datasource.dto.TableField; +import io.gisbi.extensions.datafilling.dto.ExtIndexField; +import io.gisbi.extensions.datafilling.dto.ExtTableField; +import io.gisbi.extensions.datasource.dto.TableFieldWithValue; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/utils/BeanUtils.java b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/utils/BeanUtils.java similarity index 92% rename from sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/utils/BeanUtils.java rename to sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/utils/BeanUtils.java index f34b4d8..c439114 100644 --- a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/utils/BeanUtils.java +++ b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/utils/BeanUtils.java @@ -1,6 +1,5 @@ -package io.dataease.extensions.datafilling.utils; +package io.gisbi.extensions.datafilling.utils; -import io.dataease.license.utils.LogUtil; import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Field; @@ -38,7 +37,7 @@ public class BeanUtils { Method method = bean.getClass().getMethod(getter); return method.invoke(bean); } catch (Exception e) { - LogUtil.error("failed to getFieldValueByName. ", e); +// LogUtil.error("failed to getFieldValueByName. ", e); return null; } } @@ -53,7 +52,7 @@ public class BeanUtils { Method method = bean.getClass().getMethod(setter, type); method.invoke(bean, value); } catch (Exception e) { - LogUtil.error("failed to setFieldValueByName. ", e); +// LogUtil.error("failed to setFieldValueByName. ", e); } } diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/vo/XpackPluginsDfVO.java b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/vo/XpackPluginsDfVO.java similarity index 88% rename from sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/vo/XpackPluginsDfVO.java rename to sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/vo/XpackPluginsDfVO.java index 76da754..58b5560 100644 --- a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/vo/XpackPluginsDfVO.java +++ b/sdk/extensions/extensions-datafilling/src/main/java/io/gisbi/extensions/datafilling/vo/XpackPluginsDfVO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datafilling.vo; +package io.gisbi.extensions.datafilling.vo; import lombok.Data; diff --git a/sdk/extensions/extensions-datasource/pom.xml b/sdk/extensions/extensions-datasource/pom.xml index 400b27f..7ffde6b 100644 --- a/sdk/extensions/extensions-datasource/pom.xml +++ b/sdk/extensions/extensions-datasource/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.dataease + io.gisbi extensions - ${dataease.version} + 1.0.0 extensions-datasource @@ -34,6 +34,12 @@ jsch ${jsch.version} + + io.gisbi + common + 1.0.0 + compile + diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/plugin/DataEaseDatasourcePlugin.java b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/plugin/DataEaseDatasourcePlugin.java deleted file mode 100644 index 4278a91..0000000 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/plugin/DataEaseDatasourcePlugin.java +++ /dev/null @@ -1,111 +0,0 @@ -package io.dataease.extensions.datasource.plugin; - -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.dto.DatasourceRequest; -import io.dataease.extensions.datasource.factory.ProviderFactory; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.datasource.vo.XpackPluginsDatasourceVO; -import io.dataease.license.utils.JsonUtil; -import io.dataease.plugins.template.DataEasePlugin; -import io.dataease.plugins.vo.DataEasePluginVO; -import org.apache.commons.lang3.StringUtils; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.net.URI; -import java.nio.file.Paths; -import java.security.ProtectionDomain; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.List; -import java.util.jar.JarEntry; -import java.util.jar.JarFile; - -/** - * @Author Junjun - */ -public abstract class DataEaseDatasourcePlugin extends Provider implements DataEasePlugin { - private final String DEFAULT_FILE_PATH = "/opt/dataease2.0/drivers/plugin"; - - - @Override - public List getSchema(DatasourceRequest datasourceRequest) { - return new ArrayList<>(); - } - - - @Override - public void loadPlugin() { - XpackPluginsDatasourceVO datasourceConfig = getConfig(); - ProviderFactory.loadPlugin(datasourceConfig.getType(), this); - try { - loadDriver(); - } catch (Exception e) { - DEException.throwException(e); - } - } - - private void loadDriver() throws Exception { - XpackPluginsDatasourceVO config = getConfig(); - String localPath = StringUtils.isEmpty(config.getDriverPath()) ? DEFAULT_FILE_PATH : config.getDriverPath(); - ProtectionDomain protectionDomain = this.getClass().getProtectionDomain(); - URI uri = protectionDomain.getCodeSource().getLocation().toURI(); - try (JarFile jarFile = new JarFile(new File(uri))) { - Enumeration entries = jarFile.entries(); - while (entries.hasMoreElements()) { - JarEntry entry = entries.nextElement(); - String name = entry.getName(); - if (StringUtils.endsWith(name, ".jar")) { - File file = new File(localPath, Paths.get(name).getFileName().toString()); - if (!file.getParentFile().exists()) { - file.getParentFile().mkdirs(); - } - - try (InputStream inputStream = jarFile.getInputStream(entry); - FileOutputStream outputStream = new FileOutputStream(file)) { - byte[] bytes = new byte[1024]; - int length; - while ((length = inputStream.read(bytes)) >= 0) { - outputStream.write(bytes, 0, length); - } - } - } - } - } - } - - public XpackPluginsDatasourceVO getConfig() { - DataEasePluginVO pluginInfo = null; - try { - pluginInfo = getPluginInfo(); - } catch (Exception e) { - DEException.throwException(e); - } - String config = pluginInfo.getConfig(); - XpackPluginsDatasourceVO vo = JsonUtil.parseObject(config, XpackPluginsDatasourceVO.class); - vo.setIcon(pluginInfo.getIcon()); - return vo; - } - - @Override - public void unloadPlugin() { - try { - ProtectionDomain protectionDomain = this.getClass().getProtectionDomain(); - URI uri = protectionDomain.getCodeSource().getLocation().toURI(); - try (JarFile jarFile = new JarFile(new File(uri))) { - Enumeration entries = jarFile.entries(); - while (entries.hasMoreElements()) { - JarEntry entry = entries.nextElement(); - String name = entry.getName(); - if (StringUtils.endsWith(name, ".jar")) { - File file = new File(DEFAULT_FILE_PATH, Paths.get(name).getFileName().toString()); - file.delete(); - } - } - } - } catch (Exception e) { - DEException.throwException(e); - } - } -} diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/api/PluginManageApi.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/api/PluginManageApi.java similarity index 54% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/api/PluginManageApi.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/api/PluginManageApi.java index 341dcff..653d1d0 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/api/PluginManageApi.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/api/PluginManageApi.java @@ -1,6 +1,6 @@ -package io.dataease.extensions.datasource.api; +package io.gisbi.extensions.datasource.api; -import io.dataease.extensions.datasource.vo.XpackPluginsDatasourceVO; +import io.gisbi.extensions.datasource.vo.XpackPluginsDatasourceVO; import java.util.List; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/constant/SqlPlaceholderConstants.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/constant/SqlPlaceholderConstants.java similarity index 91% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/constant/SqlPlaceholderConstants.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/constant/SqlPlaceholderConstants.java index 9cfac78..aca2dbf 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/constant/SqlPlaceholderConstants.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/constant/SqlPlaceholderConstants.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.constant; +package io.gisbi.extensions.datasource.constant; /** * @Author Junjun diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/ApiDefinition.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/ApiDefinition.java similarity index 95% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/ApiDefinition.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/ApiDefinition.java index 4c9e1f4..6f06233 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/ApiDefinition.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/ApiDefinition.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.dto; +package io.gisbi.extensions.datasource.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/ApiDefinitionRequest.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/ApiDefinitionRequest.java similarity index 96% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/ApiDefinitionRequest.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/ApiDefinitionRequest.java index 398a0cd..4cd936f 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/ApiDefinitionRequest.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/ApiDefinitionRequest.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.dto; +package io.gisbi.extensions.datasource.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/CalParam.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/CalParam.java similarity index 81% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/CalParam.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/CalParam.java index e451bc0..4c9b127 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/CalParam.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/CalParam.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.dto; +package io.gisbi.extensions.datasource.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/ConnectionObj.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/ConnectionObj.java similarity index 77% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/ConnectionObj.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/ConnectionObj.java index 3fb2e00..9199d65 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/ConnectionObj.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/ConnectionObj.java @@ -1,8 +1,8 @@ -package io.dataease.extensions.datasource.dto; +package io.gisbi.extensions.datasource.dto; import com.jcraft.jsch.Session; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import java.sql.Connection; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasetTableDTO.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasetTableDTO.java similarity index 96% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasetTableDTO.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasetTableDTO.java index 541837f..21f8dd1 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasetTableDTO.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasetTableDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.dto; +package io.gisbi.extensions.datasource.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasetTableFieldDTO.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasetTableFieldDTO.java similarity index 98% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasetTableFieldDTO.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasetTableFieldDTO.java index cb777e7..5d00e4d 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasetTableFieldDTO.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasetTableFieldDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.dto; +package io.gisbi.extensions.datasource.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceDTO.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasourceDTO.java similarity index 97% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceDTO.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasourceDTO.java index 9d22db9..11f68cd 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceDTO.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasourceDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.dto; +package io.gisbi.extensions.datasource.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceRequest.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasourceRequest.java similarity index 97% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceRequest.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasourceRequest.java index 2cbd717..16fedd3 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceRequest.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasourceRequest.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.dto; +package io.gisbi.extensions.datasource.dto; import lombok.Data; import org.springframework.util.StringUtils; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceSchemaDTO.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasourceSchemaDTO.java similarity index 75% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceSchemaDTO.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasourceSchemaDTO.java index b345572..4349a59 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceSchemaDTO.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DatasourceSchemaDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.dto; +package io.gisbi.extensions.datasource.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DsTypeDTO.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DsTypeDTO.java similarity index 81% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DsTypeDTO.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DsTypeDTO.java index 0158ffe..012253f 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DsTypeDTO.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/DsTypeDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.dto; +package io.gisbi.extensions.datasource.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/FieldGroupDTO.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/FieldGroupDTO.java similarity index 87% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/FieldGroupDTO.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/FieldGroupDTO.java index c3d3469..716cf3e 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/FieldGroupDTO.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/FieldGroupDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.dto; +package io.gisbi.extensions.datasource.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/SimpleDatasourceDTO.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/SimpleDatasourceDTO.java similarity index 93% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/SimpleDatasourceDTO.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/SimpleDatasourceDTO.java index 4c0c938..852a820 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/SimpleDatasourceDTO.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/SimpleDatasourceDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.dto; +package io.gisbi.extensions.datasource.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/TableField.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/TableField.java similarity index 93% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/TableField.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/TableField.java index 9e4b9a8..f3cd571 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/TableField.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/TableField.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.dto; +package io.gisbi.extensions.datasource.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/TableFieldWithValue.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/TableFieldWithValue.java similarity index 95% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/TableFieldWithValue.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/TableFieldWithValue.java index db7116c..57c6361 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/TableFieldWithValue.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/TableFieldWithValue.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.dto; +package io.gisbi.extensions.datasource.dto; import lombok.Getter; import lombok.Setter; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/TaskDTO.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/TaskDTO.java similarity index 93% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/TaskDTO.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/TaskDTO.java index 4d8f4af..d2b620c 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/TaskDTO.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/dto/TaskDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.dto; +package io.gisbi.extensions.datasource.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/factory/ProviderFactory.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/factory/ProviderFactory.java similarity index 50% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/factory/ProviderFactory.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/factory/ProviderFactory.java index 8c8ab27..5173881 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/factory/ProviderFactory.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/factory/ProviderFactory.java @@ -1,14 +1,12 @@ -package io.dataease.extensions.datasource.factory; +package io.gisbi.extensions.datasource.factory; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.plugin.DataEaseDatasourcePlugin; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.datasource.utils.SpringContextUtil; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; -import io.dataease.extensions.datasource.vo.XpackPluginsDatasourceVO; -import io.dataease.license.utils.LicenseUtil; -import io.dataease.license.utils.LogUtil; -import io.dataease.plugins.factory.DataEasePluginFactory; + +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.plugin.DataEaseDatasourcePlugin; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.datasource.utils.SpringContextUtil; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.extensions.datasource.vo.XpackPluginsDatasourceVO; import java.util.Arrays; import java.util.List; @@ -43,27 +41,28 @@ public class ProviderFactory { private static final Map templateMap = new ConcurrentHashMap<>(); public static Provider getInstance(String type) { - if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); +// if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); String key = type; return templateMap.get(key); } public static void loadPlugin(String type, DataEaseDatasourcePlugin plugin) { - if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); - String key = type; - if (templateMap.containsKey(key)) return; - templateMap.put(key, plugin); - try { - String moduleName = plugin.getPluginInfo().getModuleName(); - DataEasePluginFactory.loadTemplate(moduleName, plugin); - } catch (Exception e) { - LogUtil.error(e.getMessage(), new Throwable(e)); - DEException.throwException(e); - } +// if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); +// String key = type; +// if (templateMap.containsKey(key)) return; +// templateMap.put(key, plugin); +// try { +// String moduleName = plugin.getPluginInfo().getModuleName(); +// DataEasePluginFactory.loadTemplate(moduleName, plugin); +// } catch (Exception e) { +// LogUtil.error(e.getMessage(), new Throwable(e)); +// DEException.throwException(e); +// } } public static List getDsConfigList() { - if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); - return templateMap.values().stream().map(DataEaseDatasourcePlugin::getConfig).toList(); +// if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); +// return templateMap.values().stream().map(DataEaseDatasourcePlugin::getConfig).toList(); + return null; } } diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/model/SQLMeta.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/model/SQLMeta.java similarity index 95% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/model/SQLMeta.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/model/SQLMeta.java index 7f297a7..6ba4cf4 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/model/SQLMeta.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/model/SQLMeta.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.model; +package io.gisbi.extensions.datasource.model; import lombok.Data; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/model/SQLObj.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/model/SQLObj.java similarity index 93% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/model/SQLObj.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/model/SQLObj.java index a13781b..d8cbc45 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/model/SQLObj.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/model/SQLObj.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.model; +package io.gisbi.extensions.datasource.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/plugin/DataEaseDatasourcePlugin.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/plugin/DataEaseDatasourcePlugin.java new file mode 100644 index 0000000..cb421e1 --- /dev/null +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/plugin/DataEaseDatasourcePlugin.java @@ -0,0 +1,108 @@ +package io.gisbi.extensions.datasource.plugin; + +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.dto.DatasourceRequest; +import io.gisbi.extensions.datasource.factory.ProviderFactory; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.datasource.vo.XpackPluginsDatasourceVO; +import org.apache.commons.lang3.StringUtils; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.net.URI; +import java.nio.file.Paths; +import java.security.ProtectionDomain; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; + +/** + * @Author Junjun + */ +public abstract class DataEaseDatasourcePlugin extends Provider { + private final String DEFAULT_FILE_PATH = "/opt/gisbi1.0/drivers/plugin"; + + + @Override + public List getSchema(DatasourceRequest datasourceRequest) { + return new ArrayList<>(); + } + + +// @Override +// public void loadPlugin() { +// XpackPluginsDatasourceVO datasourceConfig = getConfig(); +// ProviderFactory.loadPlugin(datasourceConfig.getType(), this); +// try { +// loadDriver(); +// } catch (Exception e) { +// DEException.throwException(e); +// } +// } + +// private void loadDriver() throws Exception { +// XpackPluginsDatasourceVO config = getConfig(); +// String localPath = StringUtils.isEmpty(config.getDriverPath()) ? DEFAULT_FILE_PATH : config.getDriverPath(); +// ProtectionDomain protectionDomain = this.getClass().getProtectionDomain(); +// URI uri = protectionDomain.getCodeSource().getLocation().toURI(); +// try (JarFile jarFile = new JarFile(new File(uri))) { +// Enumeration entries = jarFile.entries(); +// while (entries.hasMoreElements()) { +// JarEntry entry = entries.nextElement(); +// String name = entry.getName(); +// if (StringUtils.endsWith(name, ".jar")) { +// File file = new File(localPath, Paths.get(name).getFileName().toString()); +// if (!file.getParentFile().exists()) { +// file.getParentFile().mkdirs(); +// } +// +// try (InputStream inputStream = jarFile.getInputStream(entry); +// FileOutputStream outputStream = new FileOutputStream(file)) { +// byte[] bytes = new byte[1024]; +// int length; +// while ((length = inputStream.read(bytes)) >= 0) { +// outputStream.write(bytes, 0, length); +// } +// } +// } +// } +// } +// } + +// public XpackPluginsDatasourceVO getConfig() { +// DataEasePluginVO pluginInfo = null; +// try { +// pluginInfo = getPluginInfo(); +// } catch (Exception e) { +// DEException.throwException(e); +// } +// String config = pluginInfo.getConfig(); +// XpackPluginsDatasourceVO vo = JsonUtil.parseObject(config, XpackPluginsDatasourceVO.class); +// vo.setIcon(pluginInfo.getIcon()); +// return vo; +// } + + + public void unloadPlugin() { + try { + ProtectionDomain protectionDomain = this.getClass().getProtectionDomain(); + URI uri = protectionDomain.getCodeSource().getLocation().toURI(); + try (JarFile jarFile = new JarFile(new File(uri))) { + Enumeration entries = jarFile.entries(); + while (entries.hasMoreElements()) { + JarEntry entry = entries.nextElement(); + String name = entry.getName(); + if (StringUtils.endsWith(name, ".jar")) { + File file = new File(DEFAULT_FILE_PATH, Paths.get(name).getFileName().toString()); + file.delete(); + } + } + } + } catch (Exception e) { + DEException.throwException(e); + } + } +} diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/provider/DriverShim.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/provider/DriverShim.java similarity index 94% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/provider/DriverShim.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/provider/DriverShim.java index 184a4a7..7557a6a 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/provider/DriverShim.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/provider/DriverShim.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.provider; +package io.gisbi.extensions.datasource.provider; import java.sql.*; import java.util.Properties; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/provider/ExtendedJdbcClassLoader.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/provider/ExtendedJdbcClassLoader.java similarity index 97% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/provider/ExtendedJdbcClassLoader.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/provider/ExtendedJdbcClassLoader.java index 2302b38..f909676 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/provider/ExtendedJdbcClassLoader.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/provider/ExtendedJdbcClassLoader.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.provider; +package io.gisbi.extensions.datasource.provider; import java.io.File; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/provider/Provider.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/provider/Provider.java similarity index 97% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/provider/Provider.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/provider/Provider.java index 72365c0..d6ae8f7 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/provider/Provider.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/provider/Provider.java @@ -1,12 +1,12 @@ -package io.dataease.extensions.datasource.provider; +package io.gisbi.extensions.datasource.provider; import com.jcraft.jsch.JSch; import com.jcraft.jsch.Session; -import io.dataease.exception.DEException; -import io.dataease.extensions.datasource.constant.SqlPlaceholderConstants; -import io.dataease.extensions.datasource.dto.*; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.vo.DatasourceConfiguration; +import io.gisbi.exception.DEException; +import io.gisbi.extensions.datasource.constant.SqlPlaceholderConstants; +import io.gisbi.extensions.datasource.dto.*; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.vo.DatasourceConfiguration; import lombok.Getter; import org.apache.calcite.config.Lex; import org.apache.calcite.sql.SqlDialect; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/utils/SpringContextUtil.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/utils/SpringContextUtil.java similarity index 97% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/utils/SpringContextUtil.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/utils/SpringContextUtil.java index 94d496e..8603362 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/utils/SpringContextUtil.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/utils/SpringContextUtil.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.utils; +package io.gisbi.extensions.datasource.utils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.support.DefaultListableBeanFactory; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/Configuration.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/vo/Configuration.java similarity index 97% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/Configuration.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/vo/Configuration.java index a967344..7131be4 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/Configuration.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/vo/Configuration.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.vo; +package io.gisbi.extensions.datasource.vo; import lombok.Data; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/DatasourceConfiguration.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/vo/DatasourceConfiguration.java similarity index 97% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/DatasourceConfiguration.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/vo/DatasourceConfiguration.java index a57b335..cdc55ca 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/DatasourceConfiguration.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/vo/DatasourceConfiguration.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.vo; +package io.gisbi.extensions.datasource.vo; import lombok.Data; diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/XpackPluginsDatasourceVO.java b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/vo/XpackPluginsDatasourceVO.java similarity index 92% rename from sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/XpackPluginsDatasourceVO.java rename to sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/vo/XpackPluginsDatasourceVO.java index 4543715..7217aac 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/XpackPluginsDatasourceVO.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/gisbi/extensions/datasource/vo/XpackPluginsDatasourceVO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.datasource.vo; +package io.gisbi.extensions.datasource.vo; import lombok.Data; diff --git a/sdk/extensions/extensions-view/pom.xml b/sdk/extensions/extensions-view/pom.xml index 2007cad..1beb4f6 100644 --- a/sdk/extensions/extensions-view/pom.xml +++ b/sdk/extensions/extensions-view/pom.xml @@ -4,18 +4,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.dataease + io.gisbi extensions - ${dataease.version} + 1.0.0 extensions-view - io.dataease + io.gisbi extensions-datasource - ${dataease.version} + 1.0.0 diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/FieldSource.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/FieldSource.java deleted file mode 100644 index 6d5a806..0000000 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/FieldSource.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.dataease.extensions.view.dto; - -public enum FieldSource { - DRILL -} diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/factory/PluginsChartFactory.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/factory/PluginsChartFactory.java deleted file mode 100644 index 16fba41..0000000 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/factory/PluginsChartFactory.java +++ /dev/null @@ -1,44 +0,0 @@ -package io.dataease.extensions.view.factory; - -import io.dataease.exception.DEException; -import io.dataease.extensions.view.plugin.AbstractChartPlugin; -import io.dataease.extensions.view.plugin.DataEaseChartPlugin; -import io.dataease.extensions.view.vo.XpackPluginsViewVO; -import io.dataease.license.utils.LicenseUtil; -import io.dataease.license.utils.LogUtil; -import io.dataease.plugins.factory.DataEasePluginFactory; - -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -public class PluginsChartFactory { - - private static final Map templateMap = new ConcurrentHashMap<>(); - - - public static AbstractChartPlugin getInstance(String render, String type) { - if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); - String key = render + "_" + type; - return templateMap.get(key); - } - - public static void loadPlugin(String render, String type, DataEaseChartPlugin plugin) { - if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); - String key = render + "_" + type; - if (templateMap.containsKey(key)) return; - templateMap.put(key, plugin); - try { - String moduleName = plugin.getPluginInfo().getModuleName(); - DataEasePluginFactory.loadTemplate(moduleName, plugin); - } catch (Exception e) { - LogUtil.error(e.getMessage(), new Throwable(e)); - DEException.throwException(e); - } - } - - public static List getViewConfigList() { - if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); - return templateMap.values().stream().map(DataEaseChartPlugin::getConfig).toList(); - } -} diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/plugin/DataEaseChartPlugin.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/plugin/DataEaseChartPlugin.java deleted file mode 100644 index 97dcfd1..0000000 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/plugin/DataEaseChartPlugin.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.dataease.extensions.view.plugin; - -import io.dataease.exception.DEException; -import io.dataease.extensions.view.factory.PluginsChartFactory; -import io.dataease.extensions.view.vo.XpackPluginsViewVO; -import io.dataease.license.utils.JsonUtil; -import io.dataease.plugins.template.DataEasePlugin; -import io.dataease.plugins.vo.DataEasePluginVO; - -public abstract class DataEaseChartPlugin extends AbstractChartPlugin implements DataEasePlugin { - - @Override - public void loadPlugin() { - XpackPluginsViewVO viewConfig = getConfig(); - PluginsChartFactory.loadPlugin(viewConfig.getRender(), viewConfig.getChartValue(), this); - } - - public XpackPluginsViewVO getConfig() { - DataEasePluginVO pluginInfo = null; - try { - pluginInfo = getPluginInfo(); - } catch (Exception e) { - DEException.throwException(e); - } - String config = pluginInfo.getConfig(); - XpackPluginsViewVO vo = JsonUtil.parseObject(config, XpackPluginsViewVO.class); - vo.setIcon(pluginInfo.getIcon()); - return vo; - } -} diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/AxisChartDataAntVDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/AxisChartDataAntVDTO.java similarity index 92% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/AxisChartDataAntVDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/AxisChartDataAntVDTO.java index b6b180f..c60b808 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/AxisChartDataAntVDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/AxisChartDataAntVDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/AxisChartDataDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/AxisChartDataDTO.java similarity index 86% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/AxisChartDataDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/AxisChartDataDTO.java index 8a6481f..870f79e 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/AxisChartDataDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/AxisChartDataDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/AxisFormatResult.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/AxisFormatResult.java similarity index 88% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/AxisFormatResult.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/AxisFormatResult.java index befd3b5..a292efd 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/AxisFormatResult.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/AxisFormatResult.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartAxis.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartAxis.java similarity index 79% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartAxis.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartAxis.java index fe76307..c5e4518 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartAxis.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartAxis.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; public enum ChartAxis { xAxis, diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartCalcDataResult.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartCalcDataResult.java similarity index 91% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartCalcDataResult.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartCalcDataResult.java index 73589c9..824c046 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartCalcDataResult.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartCalcDataResult.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartCustomFilterItemDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartCustomFilterItemDTO.java similarity index 91% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartCustomFilterItemDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartCustomFilterItemDTO.java index 64ef55c..67be754 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartCustomFilterItemDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartCustomFilterItemDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartDimensionDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartDimensionDTO.java similarity index 88% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartDimensionDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartDimensionDTO.java index da48ecc..4b1f9a5 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartDimensionDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartDimensionDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartDrillRequest.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartDrillRequest.java similarity index 79% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartDrillRequest.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartDrillRequest.java index 04a699e..6bef614 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartDrillRequest.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartDrillRequest.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartExtFilterDTO.java similarity index 84% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartExtFilterDTO.java index 1d653ce..09bfad4 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartExtFilterDTO.java @@ -1,13 +1,12 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.fasterxml.jackson.annotation.JsonIgnore; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; import lombok.Data; -import java.util.ArrayList; import java.util.List; @Data diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtRequest.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartExtRequest.java similarity index 94% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtRequest.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartExtRequest.java index 8b8f3e8..63ce21d 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtRequest.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartExtRequest.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCompareCustomDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartFieldCompareCustomDTO.java similarity index 89% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCompareCustomDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartFieldCompareCustomDTO.java index 15eb3b3..57954ed 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCompareCustomDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartFieldCompareCustomDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCompareDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartFieldCompareDTO.java similarity index 90% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCompareDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartFieldCompareDTO.java index ea3ace7..b045286 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCompareDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartFieldCompareDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCustomFilterDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartFieldCustomFilterDTO.java similarity index 72% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCustomFilterDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartFieldCustomFilterDTO.java index b37ef35..8b10595 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCustomFilterDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartFieldCustomFilterDTO.java @@ -1,6 +1,6 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; import lombok.Data; import java.util.List; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartQuotaDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartQuotaDTO.java similarity index 87% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartQuotaDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartQuotaDTO.java index c30c054..0229b60 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartQuotaDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartQuotaDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorAssistCfgDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartSeniorAssistCfgDTO.java similarity index 80% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorAssistCfgDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartSeniorAssistCfgDTO.java index eefa6d2..1974278 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorAssistCfgDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartSeniorAssistCfgDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorAssistDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartSeniorAssistDTO.java similarity index 94% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorAssistDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartSeniorAssistDTO.java index 86d4a93..a70b729 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorAssistDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartSeniorAssistDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorFunctionCfgDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartSeniorFunctionCfgDTO.java similarity index 86% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorFunctionCfgDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartSeniorFunctionCfgDTO.java index 2da7374..cec7960 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorFunctionCfgDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartSeniorFunctionCfgDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; import java.util.ArrayList; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorThresholdCfgDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartSeniorThresholdCfgDTO.java similarity index 85% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorThresholdCfgDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartSeniorThresholdCfgDTO.java index 2f6ea09..4929fae 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorThresholdCfgDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartSeniorThresholdCfgDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorThresholdDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartSeniorThresholdDTO.java similarity index 93% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorThresholdDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartSeniorThresholdDTO.java index 90b1696..bbbea12 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorThresholdDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartSeniorThresholdDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewBaseDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewBaseDTO.java similarity index 96% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewBaseDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewBaseDTO.java index 4ae9536..97c685e 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewBaseDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewBaseDTO.java @@ -1,10 +1,10 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.extensions.datasource.dto.CalParam; -import io.dataease.extensions.view.filter.FilterTreeObj; +import io.gisbi.extensions.datasource.dto.CalParam; +import io.gisbi.extensions.view.filter.FilterTreeObj; import lombok.Data; import java.io.Serializable; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewDTO.java similarity index 96% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewDTO.java index abf77a2..ee9eddc 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldBaseDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewFieldBaseDTO.java similarity index 85% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldBaseDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewFieldBaseDTO.java index dafa8e9..4ddd665 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldBaseDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewFieldBaseDTO.java @@ -1,6 +1,6 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; import lombok.Data; import java.io.Serializable; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewFieldDTO.java similarity index 93% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewFieldDTO.java index f94fe38..3ee66d3 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewFieldDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldFilterDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewFieldFilterDTO.java similarity index 85% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldFilterDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewFieldFilterDTO.java index 7e10821..e5cab40 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldFilterDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewFieldFilterDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ColumnPermissionItem.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ColumnPermissionItem.java similarity index 96% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ColumnPermissionItem.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ColumnPermissionItem.java index dbb1477..bcd73c0 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ColumnPermissionItem.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ColumnPermissionItem.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ColumnPermissions.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ColumnPermissions.java similarity index 79% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ColumnPermissions.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ColumnPermissions.java index 5005b04..2498ecc 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ColumnPermissions.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ColumnPermissions.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/CustomFilterResult.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/CustomFilterResult.java similarity index 86% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/CustomFilterResult.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/CustomFilterResult.java index f8c4403..b26e9a0 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/CustomFilterResult.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/CustomFilterResult.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetRowPermissionsTreeItem.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/DatasetRowPermissionsTreeItem.java similarity index 88% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetRowPermissionsTreeItem.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/DatasetRowPermissionsTreeItem.java index 3a30b85..30f7083 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetRowPermissionsTreeItem.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/DatasetRowPermissionsTreeItem.java @@ -1,9 +1,9 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; import lombok.Data; import java.io.Serializable; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetRowPermissionsTreeObj.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/DatasetRowPermissionsTreeObj.java similarity index 87% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetRowPermissionsTreeObj.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/DatasetRowPermissionsTreeObj.java index 4e9d173..0bd6fa5 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetRowPermissionsTreeObj.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/DatasetRowPermissionsTreeObj.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DynamicValueDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/DynamicValueDTO.java similarity index 89% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DynamicValueDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/DynamicValueDTO.java index 8ea0de2..6ddb260 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DynamicValueDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/DynamicValueDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/FieldSource.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/FieldSource.java new file mode 100644 index 0000000..e72ee64 --- /dev/null +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/FieldSource.java @@ -0,0 +1,5 @@ +package io.gisbi.extensions.view.dto; + +public enum FieldSource { + DRILL +} diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/FormatterCfgDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/FormatterCfgDTO.java similarity index 89% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/FormatterCfgDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/FormatterCfgDTO.java index aa8b1cb..8eaef97 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/FormatterCfgDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/FormatterCfgDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/SortAxis.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/SortAxis.java similarity index 87% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/SortAxis.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/SortAxis.java index c81fd0d..a725dbf 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/SortAxis.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/SortAxis.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/SqlVariableDetails.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/SqlVariableDetails.java similarity index 96% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/SqlVariableDetails.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/SqlVariableDetails.java index c8cccef..2a911bd 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/SqlVariableDetails.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/SqlVariableDetails.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableCalcTotal.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableCalcTotal.java similarity index 75% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableCalcTotal.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableCalcTotal.java index d88aef0..3efd65b 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableCalcTotal.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableCalcTotal.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableCalcTotalCfg.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableCalcTotalCfg.java similarity index 85% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableCalcTotalCfg.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableCalcTotalCfg.java index 8597539..e69b7a2 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableCalcTotalCfg.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableCalcTotalCfg.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableThresholdDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableThresholdDTO.java similarity index 89% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableThresholdDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableThresholdDTO.java index 060619c..ee7e48f 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableThresholdDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableThresholdDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableTotal.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableTotal.java similarity index 74% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableTotal.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableTotal.java index a75a9dc..5948a53 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableTotal.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableTotal.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableTotalCfg.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableTotalCfg.java similarity index 83% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableTotalCfg.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableTotalCfg.java index 7f07c51..0c8a1b5 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableTotalCfg.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableTotalCfg.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ThresholdDynamicFieldDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ThresholdDynamicFieldDTO.java similarity index 88% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ThresholdDynamicFieldDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ThresholdDynamicFieldDTO.java index 4cd2f87..cdcc64a 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ThresholdDynamicFieldDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ThresholdDynamicFieldDTO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.dto; +package io.gisbi.extensions.view.dto; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/factory/PluginsChartFactory.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/factory/PluginsChartFactory.java new file mode 100644 index 0000000..171405b --- /dev/null +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/factory/PluginsChartFactory.java @@ -0,0 +1,41 @@ +package io.gisbi.extensions.view.factory; + +import io.gisbi.exception.DEException; +import io.gisbi.extensions.view.plugin.AbstractChartPlugin; +import io.gisbi.extensions.view.plugin.DataEaseChartPlugin; +import io.gisbi.extensions.view.vo.XpackPluginsViewVO; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class PluginsChartFactory { + + private static final Map templateMap = new ConcurrentHashMap<>(); + + + public static AbstractChartPlugin getInstance(String render, String type) { +// if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); + String key = render + "_" + type; + return templateMap.get(key); + } + + public static void loadPlugin(String render, String type, DataEaseChartPlugin plugin) { +// if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); + String key = render + "_" + type; + if (templateMap.containsKey(key)) return; + templateMap.put(key, plugin); +// try { +// String moduleName = plugin.getPluginInfo().getModuleName(); +// DataEasePluginFactory.loadTemplate(moduleName, plugin); +// } catch (Exception e) { +// LogUtil.error(e.getMessage(), new Throwable(e)); +// DEException.throwException(e); +// } + } + + public static List getViewConfigList() { +// if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!"); + return templateMap.values().stream().map(DataEaseChartPlugin::getConfig).toList(); + } +} diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/DynamicTimeSetting.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/filter/DynamicTimeSetting.java similarity index 93% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/DynamicTimeSetting.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/filter/DynamicTimeSetting.java index ced0814..34663db 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/DynamicTimeSetting.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/filter/DynamicTimeSetting.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.filter; +package io.gisbi.extensions.view.filter; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/FilterTreeItem.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/filter/FilterTreeItem.java similarity index 89% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/FilterTreeItem.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/filter/FilterTreeItem.java index cc79af3..a7250cc 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/FilterTreeItem.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/filter/FilterTreeItem.java @@ -1,8 +1,8 @@ -package io.dataease.extensions.view.filter; +package io.gisbi.extensions.view.filter; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; import lombok.Data; import java.io.Serializable; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/FilterTreeObj.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/filter/FilterTreeObj.java similarity index 80% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/FilterTreeObj.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/filter/FilterTreeObj.java index 57e042a..b1424d5 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/FilterTreeObj.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/filter/FilterTreeObj.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.filter; +package io.gisbi.extensions.view.filter; import lombok.Data; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/plugin/AbstractChartPlugin.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/plugin/AbstractChartPlugin.java similarity index 93% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/plugin/AbstractChartPlugin.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/plugin/AbstractChartPlugin.java index 90af33f..6acde49 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/plugin/AbstractChartPlugin.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/plugin/AbstractChartPlugin.java @@ -1,8 +1,8 @@ -package io.dataease.extensions.view.plugin; +package io.gisbi.extensions.view.plugin; -import io.dataease.extensions.datasource.model.SQLMeta; -import io.dataease.extensions.datasource.provider.Provider; -import io.dataease.extensions.view.dto.*; +import io.gisbi.extensions.datasource.model.SQLMeta; +import io.gisbi.extensions.datasource.provider.Provider; +import io.gisbi.extensions.view.dto.*; import java.util.List; import java.util.Map; diff --git a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/plugin/DataEaseChartPlugin.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/plugin/DataEaseChartPlugin.java new file mode 100644 index 0000000..d806c66 --- /dev/null +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/plugin/DataEaseChartPlugin.java @@ -0,0 +1,27 @@ +package io.gisbi.extensions.view.plugin; + +import io.gisbi.exception.DEException; +import io.gisbi.extensions.view.factory.PluginsChartFactory; +import io.gisbi.extensions.view.vo.XpackPluginsViewVO; + +public abstract class DataEaseChartPlugin extends AbstractChartPlugin { + + + public void loadPlugin() { + XpackPluginsViewVO viewConfig = getConfig(); + PluginsChartFactory.loadPlugin(viewConfig.getRender(), viewConfig.getChartValue(), this); + } + + public XpackPluginsViewVO getConfig() { +// DataEasePluginVO pluginInfo = null; +// try { +// pluginInfo = getPluginInfo(); +// } catch (Exception e) { +// DEException.throwException(e); +// } +// String config = pluginInfo.getConfig(); +// XpackPluginsViewVO vo = JsonUtil.parseObject(config, XpackPluginsViewVO.class); +// vo.setIcon(pluginInfo.getIcon()); + return null; + } +} diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/util/ChartDataUtil.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/util/ChartDataUtil.java similarity index 99% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/util/ChartDataUtil.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/util/ChartDataUtil.java index d0b57e8..2b03c99 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/util/ChartDataUtil.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/util/ChartDataUtil.java @@ -1,8 +1,8 @@ -package io.dataease.extensions.view.util; +package io.gisbi.extensions.view.util; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import io.dataease.extensions.datasource.model.SQLObj; -import io.dataease.extensions.view.dto.*; +import io.gisbi.extensions.datasource.model.SQLObj; +import io.gisbi.extensions.view.dto.*; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/util/FieldUtil.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/util/FieldUtil.java similarity index 73% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/util/FieldUtil.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/util/FieldUtil.java index 67c46e9..d2232f0 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/util/FieldUtil.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/util/FieldUtil.java @@ -1,7 +1,7 @@ -package io.dataease.extensions.view.util; +package io.gisbi.extensions.view.util; -import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; -import io.dataease.extensions.view.dto.ChartViewFieldBaseDTO; +import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.view.dto.ChartViewFieldBaseDTO; import org.springframework.beans.BeanUtils; import java.util.List; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/util/Utils.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/util/Utils.java similarity index 85% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/util/Utils.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/util/Utils.java index 10ba952..bf747ed 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/util/Utils.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/util/Utils.java @@ -1,6 +1,6 @@ -package io.dataease.extensions.view.util; +package io.gisbi.extensions.view.util; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; +import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO; import org.apache.commons.lang3.ObjectUtils; import java.util.Arrays; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/vo/XpackPluginsViewVO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/vo/XpackPluginsViewVO.java similarity index 92% rename from sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/vo/XpackPluginsViewVO.java rename to sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/vo/XpackPluginsViewVO.java index 757e3fb..75728aa 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/vo/XpackPluginsViewVO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/vo/XpackPluginsViewVO.java @@ -1,4 +1,4 @@ -package io.dataease.extensions.view.vo; +package io.gisbi.extensions.view.vo; import lombok.Data; diff --git a/sdk/extensions/pom.xml b/sdk/extensions/pom.xml index 0c06ece..018ac59 100644 --- a/sdk/extensions/pom.xml +++ b/sdk/extensions/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.dataease + io.gisbi sdk - ${dataease.version} + 1.0.0 pom @@ -29,12 +29,6 @@ com.fasterxml.jackson.core jackson-databind - - - io.dataease - dataease-license-sdk - ${project.version} - diff --git a/sdk/pom.xml b/sdk/pom.xml index 06a133b..ae30161 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - dataease - io.dataease - ${dataease.version} + gisbi + io.gisbi + 1.0.0 4.0.0 pom @@ -14,7 +14,6 @@ common api - distributed extensions