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/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java index 15dd9b50d2..daa534f6bf 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java @@ -58,6 +58,11 @@ public class VisualizationOuterParamsInfo implements Serializable { */ private String defaultValue; + /** + * 是否启用默认值 + */ + private Boolean enabledDefault; + public String getParamsInfoId() { return paramsInfoId; } @@ -122,6 +127,14 @@ public class VisualizationOuterParamsInfo implements Serializable { this.defaultValue = defaultValue; } + public Boolean getEnabledDefault() { + return enabledDefault; + } + + public void setEnabledDefault(Boolean enabledDefault) { + this.enabledDefault = enabledDefault; + } + @Override public String toString() { return "VisualizationOuterParamsInfo{" + @@ -133,6 +146,7 @@ public class VisualizationOuterParamsInfo implements Serializable { ", copyId = " + copyId + ", required = " + required + ", defaultValue = " + defaultValue + + ", enabledDefault = " + enabledDefault + "}"; } } diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationOuterParamsService.java b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationOuterParamsService.java index 56ec45a7d9..ddf4c31d4d 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationOuterParamsService.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationOuterParamsService.java @@ -56,7 +56,7 @@ public class VisualizationOuterParamsService implements VisualizationOuterParams @Override public VisualizationOuterParamsDTO queryWithVisualizationId(String visualizationId) { - VisualizationOuterParamsDTO visualizationOuterParamsDTO = extOuterParamsMapper.queryWithVisualizationId(visualizationId); + VisualizationOuterParamsDTO visualizationOuterParamsDTO = extOuterParamsMapper.queryWithVisualizationId(visualizationId); return visualizationOuterParamsDTO; } @@ -77,21 +77,21 @@ public class VisualizationOuterParamsService implements VisualizationOuterParams String paramsId = UUID.randomUUID().toString(); outerParamsDTO.setParamsId(paramsId); VisualizationOuterParams newOuterParams = new VisualizationOuterParams(); - BeanUtils.copyBean(newOuterParams,outerParamsDTO); + BeanUtils.copyBean(newOuterParams, outerParamsDTO); outerParamsMapper.insert(newOuterParams); Optional.ofNullable(outerParamsDTO.getOuterParamsInfoArray()).orElse(new ArrayList<>()).forEach(outerParamsInfo -> { String paramsInfoId = UUID.randomUUID().toString(); outerParamsInfo.setParamsInfoId(paramsInfoId); outerParamsInfo.setParamsId(paramsId); VisualizationOuterParamsInfo newOuterParamsInfo = new VisualizationOuterParamsInfo(); - BeanUtils.copyBean(newOuterParamsInfo,outerParamsInfo); + BeanUtils.copyBean(newOuterParamsInfo, outerParamsInfo); outerParamsInfoMapper.insert(newOuterParamsInfo); Optional.ofNullable(outerParamsInfo.getTargetViewInfoList()).orElse(new ArrayList<>()).forEach(targetViewInfo -> { String targetViewInfoId = UUID.randomUUID().toString(); targetViewInfo.setTargetId(targetViewInfoId); targetViewInfo.setParamsInfoId(paramsInfoId); VisualizationOuterParamsTargetViewInfo newOuterParamsTargetViewInfo = new VisualizationOuterParamsTargetViewInfo(); - BeanUtils.copyBean(newOuterParamsTargetViewInfo,targetViewInfo); + BeanUtils.copyBean(newOuterParamsTargetViewInfo, targetViewInfo); outerParamsTargetViewInfoMapper.insert(newOuterParamsTargetViewInfo); }); }); @@ -101,28 +101,30 @@ public class VisualizationOuterParamsService implements VisualizationOuterParams @Override public VisualizationOuterParamsBaseResponse getOuterParamsInfo(String visualizationId) { List result = extOuterParamsMapper.getVisualizationOuterParamsInfo(visualizationId); - return new VisualizationOuterParamsBaseResponse(Optional.ofNullable(result).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(VisualizationOuterParamsInfoDTO::getSourceInfo, VisualizationOuterParamsInfoDTO::getTargetInfoList))); + return new VisualizationOuterParamsBaseResponse(Optional.ofNullable(result).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(VisualizationOuterParamsInfoDTO::getSourceInfo, VisualizationOuterParamsInfoDTO::getTargetInfoList)), + Optional.ofNullable(result).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(VisualizationOuterParamsInfoDTO::getSourceInfo, paramsInfo -> paramsInfo)) + ); } @Override public List queryDsWithVisualizationId(String visualizationId) { - List result = extOuterParamsMapper.queryDsWithVisualizationId(visualizationId); - if(!CollectionUtils.isEmpty(result)){ + List result = extOuterParamsMapper.queryDsWithVisualizationId(visualizationId); + if (!CollectionUtils.isEmpty(result)) { result.forEach(coreDatasetGroupVO -> { List fields = coreDatasetGroupVO.getDatasetFields(); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("dataset_group_id", coreDatasetGroupVO.getId()); List tableResult = coreDatasetTableMapper.selectList(wrapper); - if(!CollectionUtils.isEmpty(tableResult)){ + if (!CollectionUtils.isEmpty(tableResult)) { tableResult.forEach(coreDatasetTable -> { String sqlVarDetail = coreDatasetTable.getSqlVariableDetails(); - if(StringUtils.isNotEmpty(sqlVarDetail)){ + if (StringUtils.isNotEmpty(sqlVarDetail)) { TypeReference> listTypeReference = new TypeReference>() { }; List defaultsSqlVariableDetails = JsonUtil.parseList(sqlVarDetail, listTypeReference); defaultsSqlVariableDetails.forEach(sqlVariableDetails -> { - String varFieldId = coreDatasetTable.getId()+"|DE|"+sqlVariableDetails.getVariableName(); - fields.add(new CoreDatasetTableFieldVO(varFieldId,sqlVariableDetails.getVariableName(), DeTypeConstants.DE_STRING)); + String varFieldId = coreDatasetTable.getId() + "|DE|" + sqlVariableDetails.getVariableName(); + fields.add(new CoreDatasetTableFieldVO(varFieldId, sqlVariableDetails.getVariableName(), DeTypeConstants.DE_STRING)); }); } }); 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 index 0743c4fafa..e2230f73e1 100644 --- 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 @@ -1,4 +1,5 @@ ALTER TABLE `visualization_outer_params_info` ADD COLUMN `required` tinyint(1) DEFAULT 0 COMMENT '是否必填', ADD COLUMN `default_value` longtext NULL COMMENT '默认值 JSON格式'; +ADD COLUMN `enabled_default` tinyint(1) NULL DEFAULT 0 COMMENT '是否启用默认值'; update visualization_outer_params_info set required =0; \ No newline at end of file diff --git a/core/core-backend/src/main/resources/db/migration/V2.10.1__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10.1__ddl.sql index 0743c4fafa..e2230f73e1 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.10.1__ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.10.1__ddl.sql @@ -1,4 +1,5 @@ ALTER TABLE `visualization_outer_params_info` ADD COLUMN `required` tinyint(1) DEFAULT 0 COMMENT '是否必填', ADD COLUMN `default_value` longtext NULL COMMENT '默认值 JSON格式'; +ADD COLUMN `enabled_default` tinyint(1) NULL DEFAULT 0 COMMENT '是否启用默认值'; update visualization_outer_params_info set required =0; \ No newline at end of file diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml index 3f07de6333..9e8361b763 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml @@ -16,8 +16,9 @@ - - + + + @@ -51,6 +52,9 @@ + + + @@ -61,6 +65,9 @@ pop.visualization_id, popi.params_info_id, popi.param_name, + popi.enabled_default, + popi.required, + popi.default_value, ifnull( popi.checked, 0 ) AS checked, poptvi.target_view_id, poptvi.target_ds_id, @@ -118,7 +125,10 @@