diff --git a/lidee-admin/src/main/resources/application-local.yaml b/lidee-admin/src/main/resources/application-local.yaml index 3da250c..4fc534c 100644 --- a/lidee-admin/src/main/resources/application-local.yaml +++ b/lidee-admin/src/main/resources/application-local.yaml @@ -9,23 +9,15 @@ spring: datasource: master: # MYSQL数据库 主库,业务库 - url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 username: root - password: root lideeyunji: # 从库,框架库 - url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 username: root - password: root slave: # 日志库单独 lazy: true # 开启懒加载,保证启动速度 - url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 username: root - password: root redis: - host: 127.0.0.1 # 地址 port: 6379 # 端口 database: 2 # 数据库索引 - password: lidee@123 # 密码,建议生产环境开启 --- #################### 地代码平台相关配置 #################### diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/btncommand/receiver/ButtonReceiverReportList.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/btncommand/receiver/ButtonReceiverReportList.java index 89aa6f9..fe50cd8 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/btncommand/receiver/ButtonReceiverReportList.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/btncommand/receiver/ButtonReceiverReportList.java @@ -7,7 +7,6 @@ import com.lideeyunji.core.framework.service.IFrameService; import com.lideeyunji.tool.framework.yunji.model.ResultDataModel; import com.lideeyunji.tool.framework.yunji.tool.spring.SpringUtils; -import java.util.List; import java.util.Map; /** @@ -34,9 +33,6 @@ public class ButtonReceiverReportList implements IButtonCommandReceiver params = param.getParams(); - // 分组集合--测试数据 -// String[] Groupbylist={"zonename","customname"}; -// List Groupbylist=param IFrameService frameService = SpringUtils.getBean(IFrameService.class); ResultDataModel reportDataPage = frameService.getReportDataList(reportCode, page, params); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/controller/ReportController.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/controller/ReportController.java index 89fb42c..5b43095 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/controller/ReportController.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/controller/ReportController.java @@ -1,4 +1,3 @@ - package com.lideeyunji.core.framework.controller; import com.lideeyunji.core.framework.config.aspect.enhancereport.enums.RefreshPluginEnums; @@ -57,7 +56,7 @@ public class ReportController extends BaseController { @ApiOperationSupport(order = 2) @Operation(tags = "报表统计",summary = "数据报表 - 修改") public BaseWebResult updateDbFormConfig(@RequestBody ReportAddOrUpdateParam param) { - Long reportId = param.getReport().getId(); + Long reportId = param.getReport().getId(); ReportEntity oldEntity = reportService.getReportEntityById(reportId); String oldJavaConfig = oldEntity.getJavaConfig(); String newJavaConfig = param.getReport().getJavaConfig(); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ReportFieldEntity.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ReportFieldEntity.java index 04affd3..b2e8d9e 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ReportFieldEntity.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ReportFieldEntity.java @@ -3,7 +3,6 @@ package com.lideeyunji.core.framework.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.lideeyunji.tool.framework.yunji.model.global.BaseTenantEntity; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -95,9 +94,8 @@ public class ReportFieldEntity extends BaseTenantEntity { //父字段名称 private String parentFieldName; - - - + //是否隐藏维度 + private String isHideDimension; } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/params/vo/ReportFieldVo.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/params/vo/ReportFieldVo.java index 5f8d5e1..9e4005a 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/params/vo/ReportFieldVo.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/params/vo/ReportFieldVo.java @@ -1,4 +1,3 @@ - package com.lideeyunji.core.framework.params.vo; import io.swagger.v3.oas.annotations.media.Schema; @@ -59,5 +58,8 @@ public class ReportFieldVo extends ReportFieldIdVo { //父字段名称 private String parentFieldName; + + //是否隐藏维度 + private String isHideDimension; } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/IFrameService.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/IFrameService.java index 39b745d..894f88b 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/IFrameService.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/IFrameService.java @@ -7,7 +7,6 @@ import com.lideeyunji.tool.framework.yunji.model.ExecuteEnhanceModel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import net.sf.jsqlparser.JSQLParserException; -import javax.swing.*; import java.util.List; import java.util.Map; @@ -80,5 +79,4 @@ public interface IFrameService { //获取数据表数据 -分页 ResultDataModel getReportDataList(String reportCode, Page page, Map params); - } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.java index 9a775b7..3487195 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.java @@ -651,8 +651,6 @@ public class FrameServiceImpl implements IFrameService { } - - /** * 单个保存 * diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.java index 9cda0f9..03a2e63 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.java @@ -1,4 +1,3 @@ - package com.lideeyunji.core.framework.service.impl; import cn.hutool.core.bean.BeanUtil; @@ -377,7 +376,9 @@ public class ReportServiceImpl extends ServiceImpl i entity.setDictCode(vo.getDictCode()); entity.setIsExport(vo.getIsExport()); entity.setIsShowSort(vo.getIsShowSort()); + entity.setIsShowSort(vo.getIsDimension()); entity.setIsDimension(vo.getIsDimension()); + entity.setIsHideDimension(vo.getIsHideDimension()); entity.setHasChildren(vo.getHasChildren()); entity.setParentFieldCode(vo.getParentFieldCode()); entity.setParentFieldName(vo.getParentFieldName()); diff --git a/lidee-dependencies/.flattened-pom.xml b/lidee-dependencies/.flattened-pom.xml index 6a7179e..0ac104a 100644 --- a/lidee-dependencies/.flattened-pom.xml +++ b/lidee-dependencies/.flattened-pom.xml @@ -9,67 +9,18 @@ ${project.artifactId} 基础 bom 文件,管理整个项目的依赖版本 - 4.0.4 - 2.9.1 7.2.11.RELEASE - 1.0.10 - 2.2.4 - 1.5.0 - 4.1.2 - 3.3.3 - 3.0.6 - 2.3.12.RELEASE - 1.5.5.Final - 1.2.83 4.13.2 - 3.0.21 - 3.1.880 - 3.5.5 - 3.5.15 - 0.33.0 4.3 - 1.6.1 - 1.0.5 - 1.4.10 - 8.6.0 - 1.9.7 - 2.2.1 - 2.0.1-jdk8-snapshot - 0.1.55 - 2.12.2 - 2.7.0 3.5.0 - 4.3.0 - 3.18.0 - 2.14.5 - 2.7.15 5.1.0 - 8.5.7 - 4.6.4 - 1.0.13 - 2.7.18 5.8.25 - 33.0.0-jre - 2.5 - 1.6.15 1.7.1 - 2.2.7 - 2.15.1 - 4.1.2 4.9.3 - 3.10.0 - 1.17.2 3.5.5 - 4.3.0 - 1.18.30 3.3.3 - 6.8.0 - 1.2.21 - 8.12.0 4.11.0 - 1.0.8 8.1.3.62 - 2.3 @@ -91,7 +42,6 @@ ${bizlog-sdk.version} - org.springframework.boot spring-boot-starter @@ -197,7 +147,6 @@ ${redisson.version} - org.springframework.boot spring-boot-starter-actuator @@ -228,7 +177,6 @@ ${lock4j.version} - org.redisson redisson-spring-boot-starter @@ -284,7 +232,6 @@ ${spring-boot-admin.version} - de.codecentric spring-boot-admin-server-cloud @@ -311,11 +258,9 @@ ${spring.boot.version} - org.ow2.asm asm - org.mockito mockito-core @@ -421,12 +366,10 @@ ${screw.version} - org.freemarker freemarker com.alibaba - fastjson @@ -491,12 +434,10 @@ ${aliyun-java-sdk-core.version} - io.opentracing opentracing-api io.opentracing - opentracing-util @@ -517,7 +458,6 @@ cn.hutool - hutool-core