Skip to content

G
gf_back
Commit 135d935b authored by ZWT's avatar ZWT
Browse files
Options

feat(吉林演示): 松原 

1.天气数据接收定时任务,解决代码扫描问题,修改文件读取相关代码,解决资源未关流问题;
2.修改登录验证码生成工具类,解决代码扫描问题,修复随机数不安全问题;
3.删除除主程序启动类外其他启动类模块,解决代码扫描问题;
4.删除自定义httputlis类,解决代码扫描问题,替换部分代码远程调用方法;
5.重构光伏预测模块下载电站实际发电数据导入模板接口,解决代码扫描问题;
6.重构光伏预测模块导入电站实际发电数据接口,解决代码扫描问题;
7.删除公用excel导入导出工具类及poi相关pom依赖,解决代码扫描问题;
8.光伏功率预测模块,增加查询线路列表接口,解决页面接口报错问题;
9.增加测试用历史数据导入接口;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent ba4128d4
Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 0 deletions
C00-common/pps-common/pom.xml
View file @ 135d935b
...@@ -80,6 +80,12 @@ ...@@ -80,6 +80,12 @@
<artifactId>jakarta.validation-api</artifactId> <artifactId>jakarta.validation-api</artifactId>
<version>3.1.0-M2</version> <version>3.1.0-M2</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.oracle.database.jdbc/ojdbc6 -->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc6</artifactId>
<version>11.2.0.4</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
C13-middle/pom.xml 0 → 100644
View file @ 135d935b
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gf_back</artifactId>
<groupId>gf</groupId>
<version>1.0.0-pps</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<description>中间库模块</description>
<artifactId>C13-middle</artifactId>
<packaging>pom</packaging>
<modules>
<module>pps-cloud-middle</module>
<module>pps-core-middle</module>
</modules>
<repositories>
<repository>
<id>central</id>
<name>aliyun maven</name>
<url>https://maven.aliyun.com/repository/public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>xstartup-hz</id>
<url>http://dev.sunboxauto.com/HZ/_packaging/xstartup-hz/maven/v1</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
</project>
\ No newline at end of file
C13-middle/pps-cloud-middle/pom.xml 0 → 100644
View file @ 135d935b
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-parent-cloud</artifactId>
<version>1.15.169-xstartup-cloud</version>
<relativePath/>
</parent>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
<scope>compile</scope>
</dependency>
</dependencies>
<modelVersion>4.0.0</modelVersion>
<groupId>gf</groupId>
<artifactId>pps-cloud-middle</artifactId>
<version>1.0.0-pps</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<repositories>
<repository>
<id>central</id>
<name>aliyun maven</name>
<url>https://maven.aliyun.com/repository/public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>xstartup-hz</id>
<url>http://dev.sunboxauto.com/HZ/_packaging/xstartup-hz/maven/v1</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
</project>
\ No newline at end of file
C13-middle/pps-core-middle/pom.xml 0 → 100644
View file @ 135d935b
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-parent-core</artifactId>
<version>1.15.169-xstartup-cloud</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>gf</groupId>
<artifactId>pps-core-middle</artifactId>
<version>1.0.0-pps</version>
<properties>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-common</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-middle</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-system</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-base</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-prediction</artifactId>
<version>${pps.version}</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>central</id>
<name>aliyun maven</name>
<url>https://maven.aliyun.com/repository/public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>xstartup-hz</id>
<url>http://dev.sunboxauto.com/HZ/_packaging/xstartup-hz/maven/v1</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
</project>
\ No newline at end of file
C13-middle/pps-core-middle/src/main/java/pps/core/middle/module/PpsCoreMiddleModule.java 0 → 100644
View file @ 135d935b
package pps.core.middle.module;
import pps.core.common.utils.ManifestComponentInfoHelper;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.XModule;
/**
* 中间库模块
*
* @author ZWT
* @date 2023/08/29
*/
@XText("中间库模块")
public class PpsCoreMiddleModule extends XModule {
protected PpsCoreMiddleModule() {
super(1011);
}
@Override
protected void onStarted(XContext context) {
ManifestComponentInfoHelper.init(this.getClass().getClassLoader());
}
}
\ No newline at end of file
C13-middle/pps-core-middle/src/main/java/pps/core/middle/mybatis/PpsCoreMiddleMybatis.java 0 → 100644
View file @ 135d935b
package pps.core.middle.mybatis;
import com.baomidou.mybatisplus.core.config.GlobalConfig;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import pps.core.common.mybatis.MybaitisGlobalConfigSuppiler;
import xstartup.service.mybatis.XMybatis;
/**
* mybatis配置
*
* @author ZWT
* @date 2023/09/05
*/
@Component
@EnableTransactionManagement
@MapperScan(sqlSessionTemplateRef = "sqlSessionTemplateRef.pps.core.middle",
sqlSessionFactoryRef = "sqlSessionFactoryRef.pps.core.middle",
basePackages = {"pps.core.middle.mapper"})
public class PpsCoreMiddleMybatis extends XMybatis {
@Override
public GlobalConfig getGlobalConfig() {
return MybaitisGlobalConfigSuppiler.INSTANCE.get();
}
}
D03-deploy/deploy-pps-all/pom.xml
View file @ 135d935b
...@@ -63,6 +63,16 @@ ...@@ -63,6 +63,16 @@
<artifactId>pps-cloud-prediction</artifactId> <artifactId>pps-cloud-prediction</artifactId>
<version>${pps.version}</version> <version>${pps.version}</version>
</dependency> </dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-core-middle</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-middle</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency> <dependency>
<groupId>xstartup</groupId> <groupId>xstartup</groupId>
<artifactId>xstartup-feature-mybatis</artifactId> <artifactId>xstartup-feature-mybatis</artifactId>
......
pom.xml
View file @ 135d935b
...@@ -15,5 +15,6 @@ ...@@ -15,5 +15,6 @@
<module>C09-base</module> <module>C09-base</module>
<module>C11-space</module> <module>C11-space</module>
<module>C12-prediction</module> <module>C12-prediction</module>
<module>C13-middle</module>
</modules> </modules>
</project> </project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment