admin/gr_report_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改代码

Browse Source
This commit is contained in:
chy
2026-02-10 00:19:46 +08:00
parent 3de7be34b2 e0dd2a59ec
commit 8b9f4a5013
9 changed files with 8 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lidee-admin/src/main/resources/application-local.yaml
View File

@@ -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 # 密码，建议生产环境开启
--- #################### 地代码平台相关配置 ####################

4
lidee-core/src/main/java/com/lideeyunji/core/framework/config/btncommand/receiver/ButtonReceiverReportList.java
View File

@@ -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<ResultDa
String reportCode = param.getReportCode();
Page page = param.getPage();
Map<String, Object> params = param.getParams();
// 分组集合--测试数据
// String[] Groupbylist={"zonename","customname"};
// List<String> Groupbylist=param
IFrameService frameService = SpringUtils.getBean(IFrameService.class);
ResultDataModel reportDataPage = frameService.getReportDataList(reportCode, page, params);

3
lidee-core/src/main/java/com/lideeyunji/core/framework/controller/ReportController.java
View File

@@ -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();

6
lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ReportFieldEntity.java
View File

@@ -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;
}

4
lidee-core/src/main/java/com/lideeyunji/core/framework/params/vo/ReportFieldVo.java
View File

@@ -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;
}

2
lidee-core/src/main/java/com/lideeyunji/core/framework/service/IFrameService.java
View File

@@ -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<String, Object> params);
}

2
lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.java
View File

@@ -651,8 +651,6 @@ public class FrameServiceImpl implements IFrameService {
}
/**
* 单个保存
*

3
lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.java
View File

@@ -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<ReportMapper, ReportEntity> 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());

60
lidee-dependencies/.flattened-pom.xml
View File

@@ -9,67 +9,18 @@
<name>${project.artifactId}</name>
<description>基础 bom 文件，管理整个项目的依赖版本</description>
<properties>
<servlet.version>4.0.4</servlet.version>
<tika-core.version>2.9.1</tika-core.version>
<podam.version>7.2.11.RELEASE</podam.version>
<captcha-plus.version>1.0.10</captcha-plus.version>
<lidee.version>2.2.4</lidee.version>
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
<poi-ooxml.verion>4.1.2</poi-ooxml.verion>
<express.version>3.3.3</express.version>
<bizlog-sdk.version>3.0.6</bizlog-sdk.version>
<starter.validation.version>2.3.12.RELEASE</starter.validation.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<fastjson.version>1.2.83</fastjson.version>
<junit.version>4.13.2</junit.version>
<groovy.version>3.0.21</groovy.version>
<tencentcloud-sdk-java.version>3.1.880</tencentcloud-sdk-java.version>
<mybatis-plus-generator.version>3.5.5</mybatis-plus-generator.version>
<mybatis.version>3.5.15</mybatis.version>
<opentracing.version>0.33.0</opentracing.version>
<jsqlparser.version>4.3</jsqlparser.version>
<dom4j.version>1.6.1</dom4j.version>
<screw.version>1.0.5</screw.version>
<mybatis-plus-join.version>1.4.10</mybatis-plus-join.version>
<kingbase.jdbc.version>8.6.0</kingbase.jdbc.version>
<aspectjweaver.version>1.9.7</aspectjweaver.version>
<aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
<revision>2.0.1-jdk8-snapshot</revision>
<jsch.version>0.1.55</jsch.version>
<xercesImpl.version>2.12.2</xercesImpl.version>
<ip2region.version>2.7.0</ip2region.version>
<okio.version>3.5.0</okio.version>
<dynamic-datasource.version>4.3.0</dynamic-datasource.version>
<redisson.version>3.18.0</redisson.version>
<transmittable-thread-local.version>2.14.5</transmittable-thread-local.version>
<spring-boot-admin.version>2.7.15</spring-boot-admin.version>
<guice.version>5.1.0</guice.version>
<minio.version>8.5.7</minio.version>
<aliyun-java-sdk-core.version>4.6.4</aliyun-java-sdk-core.version>
<jedis-mock.version>1.0.13</jedis-mock.version>
<spring.boot.version>2.7.18</spring.boot.version>
<hutool.version>5.8.25</hutool.version>
<guava.version>33.0.0-jre</guava.version>
<servlet.versoin>2.5</servlet.versoin>
<springdoc.version>1.6.15</springdoc.version>
<resilience4j.version>1.7.1</resilience4j.version>
<lock4j.version>2.2.7</lock4j.version>
<commons-io.version>2.15.1</commons-io.version>
<poi-scratchpad.verion>4.1.2</poi-scratchpad.verion>
<okhttp3.version>4.9.3</okhttp3.version>
<commons-net.version>3.10.0</commons-net.version>
<jsoup.version>1.17.2</jsoup.version>
<mybatis-plus.version>3.5.5</mybatis-plus.version>
<knife4j.version>4.3.0</knife4j.version>
<lombok.version>1.18.30</lombok.version>
<easyexcel.verion>3.3.3</easyexcel.verion>
<flowable.version>6.8.0</flowable.version>
<druid.version>1.2.21</druid.version>
<skywalking.version>8.12.0</skywalking.version>
<mockito-inline.version>4.11.0</mockito-inline.version>
<justauth.version>1.0.8</justauth.version>
<dm8.jdbc.version>8.1.3.62</dm8.jdbc.version>
<velocity.version>2.3</velocity.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -91,7 +42,6 @@
<version>${bizlog-sdk.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</exclusion>
</exclusions>
@@ -197,7 +147,6 @@
<version>${redisson.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</exclusion>
</exclusions>
@@ -228,7 +177,6 @@
<version>${lock4j.version}</version>
<exclusions>
<exclusion>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
</exclusion>
</exclusions>
@@ -284,7 +232,6 @@
<version>${spring-boot-admin.version}</version>
<exclusions>
<exclusion>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server-cloud</artifactId>
</exclusion>
</exclusions>
@@ -311,11 +258,9 @@
<version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
<exclusion>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</exclusion>
</exclusions>
@@ -421,12 +366,10 @@
<version>${screw.version}</version>
<exclusions>
<exclusion>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
</exclusion>
<exclusion>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -491,12 +434,10 @@
<version>${aliyun-java-sdk-core.version}</version>
<exclusions>
<exclusion>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
</exclusion>
<exclusion>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -517,7 +458,6 @@
<exclusions>
<exclusion>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
</exclusion>
</exclusions>
</dependency>