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

Compare commits

base: admin:9f88c25baf8b4074056eb44823f52ef514fa5c5f
Branches Tags
admin:master admin:dev_js_20260323 admin:dev_js_20260317 admin:dev_js_20260309 admin:liug admin:dpx20260211 admin:main_hhl0209
...
compare: admin:20b6fdae116b40a97114ba8d81a730ba96febe85
Branches Tags
admin:master admin:dev_js_20260323 admin:dev_js_20260317 admin:dev_js_20260309 admin:liug admin:dpx20260211 admin:main_hhl0209

3 Commits
9f88c25baf ... 20b6fdae11

Author SHA1 Message Date
chy
20b6fdae11 Merge remote-tracking branch 'origin/master' 2026-03-14 09:35:24 +08:00
chy
0341a095ea JDK从21降至8 2026-03-14 09:35:05 +08:00
chy
2e96ca63aa 新增能耗数据同步 2026-03-13 13:00:06 +08:00
7 changed files with 91 additions and 70 deletions
Expand all files Collapse all files

16
.flattened-pom.xml
View File

@@ -17,16 +17,16 @@
</modules>
<properties>
<lombok.version>1.18.30</lombok.version>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.boot.version>2.7.17</spring.boot.version>
<lidee.version>2.2.4</lidee.version>
<java.version>1.8</java.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<maven.compiler.target>${java.version}</maven.compiler.target>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
<spring.boot.version>2.7.17</spring.boot.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
</properties>
<dependencyManagement>
<dependencies>

9
lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/GrNhMapper.java
View File

@@ -4,6 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.lideeyunji.core.framework.entity.GrNhEntity;
import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant;
import com.lideeyunji.tool.framework.sql.core.conditions.Wrapper;
import org.apache.ibatis.annotations.Param;
/**
@@ -18,4 +19,12 @@ public interface GrNhMapper extends BaseMapper<GrNhEntity> {
default int save(@Param("dataSourceType") String dataSourceType, GrNhEntity grNhEntity) {
return this.insert(grNhEntity);
}
@DS(value = "#dataSourceType")
default int delete(@Param("dataSourceType") String dataSourceType, GrNhEntity grNhEntity) {
return 0;
}
}

1
lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrNhServiceImpl.java
View File

@@ -26,6 +26,7 @@ public class GrNhServiceImpl extends ServiceImpl<GrNhMapper, GrNhEntity> impleme
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(List<Long> idList) {
removeByIds(idList);
}

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

@@ -9,67 +9,67 @@
<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>
<podam.version>7.2.11.RELEASE</podam.version>
<velocity.version>2.3</velocity.version>
<junit.version>4.13.2</junit.version>
<jsqlparser.version>4.3</jsqlparser.version>
<spring.boot.version>2.7.18</spring.boot.version>
<tika-core.version>2.9.1</tika-core.version>
<lock4j.version>2.2.7</lock4j.version>
<okio.version>3.5.0</okio.version>
<guice.version>5.1.0</guice.version>
<aspectjweaver.version>1.9.7</aspectjweaver.version>
<lombok.version>1.18.30</lombok.version>
<xercesImpl.version>2.12.2</xercesImpl.version>
<jsoup.version>1.17.2</jsoup.version>
<fastjson.version>1.2.83</fastjson.version>
<commons-net.version>3.10.0</commons-net.version>
<kingbase.jdbc.version>8.6.0</kingbase.jdbc.version>
<poi-ooxml.verion>4.1.2</poi-ooxml.verion>
<hutool.version>5.8.25</hutool.version>
<resilience4j.version>1.7.1</resilience4j.version>
<transmittable-thread-local.version>2.14.5</transmittable-thread-local.version>
<lidee.version>2.2.4</lidee.version>
<flowable.version>6.8.0</flowable.version>
<redisson.version>3.18.0</redisson.version>
<okhttp3.version>4.9.3</okhttp3.version>
<bizlog-sdk.version>3.0.6</bizlog-sdk.version>
<mybatis-plus.version>3.5.5</mybatis-plus.version>
<druid.version>1.2.21</druid.version>
<starter.validation.version>2.3.12.RELEASE</starter.validation.version>
<servlet.version>4.0.4</servlet.version>
<commons-io.version>2.15.1</commons-io.version>
<easyexcel.verion>3.3.3</easyexcel.verion>
<springdoc.version>1.6.15</springdoc.version>
<minio.version>8.5.7</minio.version>
<mockito-inline.version>4.11.0</mockito-inline.version>
<jedis-mock.version>1.0.13</jedis-mock.version>
<tencentcloud-sdk-java.version>3.1.880</tencentcloud-sdk-java.version>
<dm8.jdbc.version>8.1.3.62</dm8.jdbc.version>
<express.version>3.3.3</express.version>
<ip2region.version>2.7.0</ip2region.version>
<jsch.version>0.1.55</jsch.version>
<aliyun-java-sdk-core.version>4.6.4</aliyun-java-sdk-core.version>
<captcha-plus.version>1.0.10</captcha-plus.version>
<dynamic-datasource.version>4.3.0</dynamic-datasource.version>
<servlet.versoin>2.5</servlet.versoin>
<knife4j.version>4.3.0</knife4j.version>
<spring-boot-admin.version>2.7.15</spring-boot-admin.version>
<mybatis.version>3.5.15</mybatis.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<groovy.version>3.0.21</groovy.version>
<aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
<justauth.version>1.0.8</justauth.version>
<screw.version>1.0.5</screw.version>
<guava.version>33.0.0-jre</guava.version>
<skywalking.version>8.12.0</skywalking.version>
<opentracing.version>0.33.0</opentracing.version>
<mybatis-plus-generator.version>3.5.5</mybatis-plus-generator.version>
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
<dom4j.version>1.6.1</dom4j.version>
<poi-scratchpad.verion>4.1.2</poi-scratchpad.verion>
<revision>2.0.1-jdk8-snapshot</revision>
</properties>
<dependencyManagement>
<dependencies>

11
lidee-tool/tool-common/.flattened-pom.xml
View File

@@ -117,4 +117,15 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

4
lidee-tool/tool-common/pom.xml
View File

@@ -13,8 +13,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>10</source>
<target>10</target>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>

2
lidee-tool/tool-common/src/main/java/com/lideeyunji/tool/framework/common/util/http/HttpUtils.java
View File

@@ -218,7 +218,7 @@ public class HttpUtils {
}
paramStr.append(entry.getKey())
.append("=")
.append(java.net.URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8));
.append(java.net.URLEncoder.encode(entry.getValue(), String.valueOf(StandardCharsets.UTF_8)));
}
writer = new BufferedWriter(
new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8));