diff --git a/sdk/extensions/extensions-view/pom.xml b/sdk/extensions/extensions-view/pom.xml index 1beb4f6..13f5188 100644 --- a/sdk/extensions/extensions-view/pom.xml +++ b/sdk/extensions/extensions-view/pom.xml @@ -6,7 +6,7 @@ io.gisbi extensions - 1.0.0 + 2.0.0 extensions-view @@ -15,7 +15,7 @@ io.gisbi extensions-datasource - 1.0.0 + 2.0.0 diff --git a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartCalcDataResult.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartCalcDataResult.java index 824c046..e4845ca 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartCalcDataResult.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartCalcDataResult.java @@ -11,6 +11,8 @@ public class ChartCalcDataResult { private List originData; private List assistData; private List dynamicAssistFields; + private List assistDataOriginList; + private List dynamicAssistFieldsOriginList; private Map context; // TODO 数据源插件化之后换成整个请求对象 private String querySql; diff --git a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartExtFilterDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartExtFilterDTO.java index 09bfad4..ff63a63 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartExtFilterDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartExtFilterDTO.java @@ -4,9 +4,11 @@ package io.gisbi.extensions.view.dto; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.fasterxml.jackson.annotation.JsonIgnore; import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO; +import io.gisbi.extensions.view.filter.FilterTreeObj; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -24,6 +26,6 @@ public class ChartExtFilterDTO { private String datePattern; @JsonIgnore private List originValue; - private int filterType;// 0-过滤组件，1-下钻，2-联动，外部参数 - + private int filterType;// 0-过滤组件，1-下钻，2-联动，外部参数 3-联动 自定义参数 + private FilterTreeObj customFilter; } diff --git a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewFieldBaseDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewFieldBaseDTO.java index 4ddd665..fed4b96 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewFieldBaseDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/ChartViewFieldBaseDTO.java @@ -15,10 +15,21 @@ public class ChartViewFieldBaseDTO extends DatasetTableFieldDTO implements Seria private String sort; + /** + * 日期解析格式，后端参与聚合运算 + */ private String dateStyle; + /** + * 日期分隔符 + */ private String datePattern; + /** + * 日期显示格式，仅前端图表格式化 + */ + private String dateShowFormat; + private Integer extField; private String chartType; diff --git a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/FormatterCfgDTO.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/FormatterCfgDTO.java index 8eaef97..7f5094d 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/FormatterCfgDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/FormatterCfgDTO.java @@ -1,13 +1,16 @@ package io.gisbi.extensions.view.dto; import lombok.Data; +import lombok.experimental.Accessors; /** * @Author Junjun */ @Data +@Accessors(chain = true) public class FormatterCfgDTO { private String type = "auto"; // auto,value,percent + private String unitLanguage = "ch"; private Integer unit = 1; // 换算单位 private String suffix = ""; // 单位后缀 private Integer decimalCount = 0; // 小数位数 diff --git a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableCalcTotalCfg.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableCalcTotalCfg.java index e69b7a2..1d7b8d5 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableCalcTotalCfg.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableCalcTotalCfg.java @@ -4,7 +4,7 @@ import lombok.Data; @Data public class TableCalcTotalCfg { - private String dataeaseName; + private String gisbiName; private String aggregation; private String originName; private int extField; diff --git a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableHeader.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableHeader.java new file mode 100644 index 0000000..3831f65 --- /dev/null +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/dto/TableHeader.java @@ -0,0 +1,39 @@ +package io.gisbi.extensions.view.dto; + +import lombok.Data; +import lombok.Getter; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class TableHeader { + private HeaderGroupConfig headerGroupConfig; + private boolean headerGroup; + + + @Data + static + public class HeaderGroupConfig { + private List meta = new ArrayList<>(); + private List columns = new ArrayList<>(); + } + + @Data + static + public class ColumnInfo { + @Getter + private String key; + private List children = new ArrayList<>(); + private Integer width; + } + + @Getter + @Data + static + public class MetaInfo { + private String field; + private String name; + + } +} diff --git a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/util/ChartDataUtil.java b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/util/ChartDataUtil.java index 2b03c99..ddf8d14 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/util/ChartDataUtil.java +++ b/sdk/extensions/extensions-view/src/main/java/io/gisbi/extensions/view/util/ChartDataUtil.java @@ -127,16 +127,16 @@ public class ChartDataUtil { data.forEach(ele -> { Map d = new HashMap<>(); for (int i = 0; i < fields.size(); i++) { - if (ObjectUtils.isNotEmpty(desensitizationList.keySet()) && desensitizationList.keySet().contains(fields.get(i).getDataeaseName())) { - d.put(fields.get(i).getDataeaseName(), desensitizationValue(desensitizationList.get(fields.get(i).getDataeaseName()), String.valueOf(ele[i]))); + if (ObjectUtils.isNotEmpty(desensitizationList.keySet()) && desensitizationList.keySet().contains(fields.get(i).getGisbiName())) { + d.put(fields.get(i).getGisbiName(), desensitizationValue(desensitizationList.get(fields.get(i).getGisbiName()), String.valueOf(ele[i]))); continue; } if (i == ele.length) break; ChartViewFieldDTO chartViewFieldDTO = fields.get(i); if (chartViewFieldDTO.getDeType() == 0 || chartViewFieldDTO.getDeType() == 1 || chartViewFieldDTO.getDeType() == 5) { - d.put(fields.get(i).getDataeaseName(), StringUtils.isEmpty(ele[i]) ? "" : ele[i]); + d.put(fields.get(i).getGisbiName(), StringUtils.isEmpty(ele[i]) ? "" : ele[i]); } else if (chartViewFieldDTO.getDeType() == 2 || chartViewFieldDTO.getDeType() == 3 || chartViewFieldDTO.getDeType() == 4) { - d.put(fields.get(i).getDataeaseName(), StringUtils.isEmpty(ele[i]) ? null : new BigDecimal(ele[i]).setScale(8, RoundingMode.HALF_UP)); + d.put(fields.get(i).getGisbiName(), StringUtils.isEmpty(ele[i]) ? null : new BigDecimal(ele[i]).setScale(8, RoundingMode.HALF_UP)); } } tableRow.add(d);