From eb3dd00b0b7fcda477229d518d250f9c842b790b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 21 十月 2025 17:45:44 +0800
Subject: [PATCH] 2025.10.21 1. 走航季度报告相关数据计算逻辑调整
---
pom.xml | 306 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 290 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7c168a5..a0c3395 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,15 +9,16 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.flightfeather</groupId>
- <artifactId>obd</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <artifactId>uav</artifactId>
+ <version>1.0.0</version>
<packaging>war</packaging>
- <name>obd</name>
- <description>Obd data server</description>
+ <name>uav</name>
+ <description>Uav data server</description>
<properties>
<java.version>1.8</java.version>
- <kotlin.version>1.2.71</kotlin.version>
+ <kotlin.version>2.1.0</kotlin.version>
+ <itext.version>7.2.2</itext.version>
<!-- tk.mybatis -->
<mapper.plugin>tk.mybatis.mapper.generator.MapperPlugin</mapper.plugin>
<mapper.Mapper>tk.mybatis.mapper.common.Mapper</mapper.Mapper>
@@ -27,6 +28,17 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <!-- 鍘婚櫎鏃og渚濊禆 -->
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
@@ -35,10 +47,6 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>
<dependency>
@@ -62,6 +70,7 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
+
<!--mybatis-->
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
@@ -88,16 +97,213 @@
<version>4.1.39.Final</version>
</dependency>
+ <!--Gson-->
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.8.6</version>
+ </dependency>
+
+ <!--鍒嗛〉-->
+ <dependency>
+ <groupId>com.github.pagehelper</groupId>
+ <artifactId>pagehelper-spring-boot-starter</artifactId>
+ <version>1.2.12</version>
+ </dependency>
+
+ <!--澧炲姞log4j2渚濊禆鈫�-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
+ </dependency>
+
+ <!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>4.1.2</version>
+ </dependency>
+
+ <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>4.1.2</version>
+ </dependency>
+
+
+ <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>1.2.75</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib-jdk8</artifactId>
+ <version>${kotlin.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-test-junit</artifactId>
+ <version>${kotlin.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-maven-plugin -->
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-maven-plugin</artifactId>
+ <version>${kotlin.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-maven-allopen -->
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-maven-allopen</artifactId>
+ <version>${kotlin.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-boot-starter</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.plugin</groupId>
+ <artifactId>spring-plugin-core</artifactId>
+ <version>2.0.0.RELEASE</version>
+ </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.plugin</groupId>-->
+<!-- <artifactId>spring-plugin-metadata</artifactId>-->
+<!-- <version>2.0.0.RELEASE</version>-->
+<!-- </dependency>-->
+
+
+ <!-- https://mvnrepository.com/artifact/org.freemarker/freemarker -->
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.31</version>
+ </dependency>
+
+ <!-- https://mvnrepository.com/artifact/com.itextpdf/html2pdf -->
+ <dependency>
+ <groupId>com.itextpdf</groupId>
+ <artifactId>html2pdf</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.itextpdf</groupId>
+ <artifactId>font-asian</artifactId>
+ <version>${itext.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- 鏀寔css鏍峰紡娓叉煋 -->
+ <dependency>
+ <groupId>org.xhtmlrenderer</groupId>
+ <artifactId>flying-saucer-pdf-itext5</artifactId>
+ <version>9.1.16</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/org.apache.pdfbox/pdfbox -->
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>2.0.26</version>
+ </dependency>
+
+ <!-- echarts-->
+ <dependency>
+ <groupId>org.icepear.echarts</groupId>
+ <artifactId>echarts-java</artifactId>
+ <version>1.0.7</version>
+ </dependency>
+
+ <!-- JFreeChart-->
+ <dependency>
+ <groupId>org.jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <!-- Httpclient-->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.5.14</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/javax.xml.ws/jaxws-api -->
+<!-- <dependency>-->
+<!-- <groupId>javax.xml.ws</groupId>-->
+<!-- <artifactId>jaxws-api</artifactId>-->
+<!-- <version>2.3.1</version>-->
+<!-- </dependency>-->
+<!-- <!– https://mvnrepository.com/artifact/org.apache.axis2/axis2-jaxws –>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.axis2</groupId>-->
+<!-- <artifactId>axis2-jaxws</artifactId>-->
+<!-- <version>1.8.2</version>-->
+<!-- </dependency>-->
+<!-- <!– https://mvnrepository.com/artifact/org.apache.axis2/axis2-adb –>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.axis2</groupId>-->
+<!-- <artifactId>axis2-adb</artifactId>-->
+<!-- <version>1.8.2</version>-->
+<!-- </dependency>-->
+<!-- <!– https://mvnrepository.com/artifact/org.apache.axis2/axis2-transport-base –>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.axis2</groupId>-->
+<!-- <artifactId>axis2-transport-base</artifactId>-->
+<!-- <version>1.8.2</version>-->
+<!-- </dependency>-->
+ <!-- https://mvnrepository.com/artifact/org.apache.axis2/axis2-kernel -->
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>1.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.17.0</version>
+ </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.docx4j</groupId>-->
+<!-- <artifactId>docx4j-core</artifactId>-->
+<!-- <version>11.4.9</version> <!– 浣跨敤鏈�鏂扮ǔ瀹氱増 –>-->
+<!-- </dependency>-->
+<!-- <!– 濡傞渶澶勭悊鍥剧墖/琛ㄦ牸绛夐珮绾у姛鑳斤紝鍙坊鍔� –>-->
+<!-- <dependency>-->
+<!-- <groupId>org.docx4j</groupId>-->
+<!-- <artifactId>docx4j-ImportXHTML</artifactId>-->
+<!-- <version>11.4.8</version>-->
+<!-- </dependency>-->
+<!-- <!– MockK 鍗曞厓娴嬭瘯搴擄紙鐢ㄤ簬 Kotlin锛� –>-->
+<!-- <dependency>-->
+<!-- <groupId>io.mockk</groupId>-->
+<!-- <artifactId>mockk</artifactId>-->
+<!-- <version>1.14.5</version> <!– 浣跨敤鏈�鏂扮ǔ瀹氱増 –>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.junit.jupiter</groupId>-->
+<!-- <artifactId>junit-jupiter</artifactId>-->
+<!-- <version>RELEASE</version>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
+
+
+
</dependencies>
<build>
- <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
- <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
+ <sourceDirectory>src/main/kotlin</sourceDirectory>
+ <testSourceDirectory>src/test/kotlin</testSourceDirectory>
<plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
+<!-- <plugin>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
+<!-- </plugin>-->
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
@@ -137,15 +343,83 @@
</dependency>
</dependencies>
</plugin>
+<!-- <plugin>-->
+<!-- <groupId>org.jetbrains.kotlin</groupId>-->
+<!-- <artifactId>kotlin-maven-plugin</artifactId>-->
+<!-- <version>${kotlin.version}</version>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <id>compile</id>-->
+<!-- <phase>compile</phase>-->
+<!-- <goals>-->
+<!-- <goal>compile</goal>-->
+<!-- </goals>-->
+<!-- </execution>-->
+<!-- <execution>-->
+<!-- <id>test-compile</id>-->
+<!-- <phase>test-compile</phase>-->
+<!-- <goals>-->
+<!-- <goal>test-compile</goal>-->
+<!-- </goals>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- <configuration>-->
+<!-- <jvmTarget>1.8</jvmTarget>-->
+<!-- </configuration>-->
+<!-- </plugin>-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>testCompile</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <profileActive>dev</profileActive>
+ </properties>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>pro</id>
+ <properties>
+ <profileActive>pro</profileActive>
+ </properties>
+ </profile>
+ <profile>
+ <id>test</id>
+ <properties>
+ <profileActive>test</profileActive>
+ </properties>
+ </profile>
+ </profiles>
<!--渚濊禆涓嬭浇鍦板潃-->
<repositories>
<repository>
<id>alimaven</id>
<name>aliyun maven</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public</url>
</repository>
<repository>
<id>spring-snapshots</id>
--
Gitblit v1.9.3