From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pom.xml | 438 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 438 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pom.xml b/pipIrr-platform/pom.xml
new file mode 100644
index 0000000..b38001c
--- /dev/null
+++ b/pipIrr-platform/pom.xml
@@ -0,0 +1,438 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>3.1.3</version>
+ <relativePath/> <!-- lookup parent from repository -->
+ </parent>
+
+ <!--鐖剁骇妯″潡锛屾棤鍏ュ彛绋嬪簭锛屾墦鍖呬负pom-->
+ <packaging>pom</packaging>
+ <groupId>com.dy</groupId>
+ <artifactId>pipIrr-parent</artifactId>
+ <version>1.0.0</version>
+ <name>pipIrr-parent</name>
+ <description>鐖剁骇妯″潡锛屼緷璧栫増鏈鐞�</description>
+
+ <modules>
+ <module>pipIrr-common</module>
+ <module>pipIrr-global</module>
+ <module>pipIrr-mw</module>
+ <module>pipIrr-web</module>
+ </modules>
+
+ <properties>
+ <!-- 涓巎ava.version閰嶇疆鍦ㄤ竴璧凤紝璁剧疆缂栫爜闆�-->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <java.version>20</java.version>
+ <tomcat.version>10.1.12</tomcat.version>
+ <spring.boot.version>3.1.3</spring.boot.version>
+ <lombok.version>1.18.28</lombok.version>
+ <log4j.bom.version>2.20.0</log4j.bom.version>
+ <log4j2.version>2.7.9</log4j2.version>
+ <jackson-yaml>2.15.2</jackson-yaml>
+ <springdoc.version>2.2.0</springdoc.version>
+ <springdoc-security.version>1.7.0</springdoc-security.version>
+ <mysql.version>8.0.33</mysql.version>
+ <druid-start.version>1.2.20</druid-start.version>
+ <mybatis-plus.version>3.5.3.2</mybatis-plus.version>
+ <cglib.version>3.3.0</cglib.version>
+ <fastjson2.version>2.0.40</fastjson2.version>
+ <mapstruct.version>1.5.5.Final</mapstruct.version>
+ <hutool-all.version>5.8.22</hutool-all.version>
+ <org-jdom2.version>2.0.6.1</org-jdom2.version>
+ <net.exp4j>0.4.8</net.exp4j>
+
+ <spring-boot-maven-plugin.version>3.2.0</spring-boot-maven-plugin.version>
+ <maven-jar-plugin-plugin.version>3.3.0</maven-jar-plugin-plugin.version>
+ <maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
+ <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+ <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+ <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
+ <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
+ <encoding>UTF-8</encoding>
+ </properties>
+
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>3.1.3</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ <version>3.1.3</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <version>3.1.3</version>
+ <type>pom</type>
+ <scope>import</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-devtools</artifactId>
+ <version>3.1.3</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-websocket</artifactId>
+ <version>3.1.3</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- lombok -->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.28</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.9.20</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <!--log4j2鏃ュ織-->
+ <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-bom -->
+ <dependency>
+ <!--log4j-bom鏄釜pom锛屾病鏈夊叿浣撶殑jar鍖�-->
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-bom</artifactId>
+ <version>2.20.0</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
+ <version>2.7.9</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <!-- 鐢ㄤ簬杈ㄨlog4j2.yml鏂囦欢 -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>2.15.2</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- 绯荤粺鐩戠 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ <version>3.1.3</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- api鍦ㄧ嚎鏂囨。 https://springdoc.org/#modules-->
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+ <version>2.2.0</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-security</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+
+
+ <!--mysql椹卞姩-->
+ <dependency>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
+ <!--瀵瑰簲鑷繁鐢佃剳瀹夎鐨刴ysql鐗堟湰-->
+ <version>8.0.33</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <!--druid-spring-boot杩炴帴姹�-->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>druid-spring-boot-starter</artifactId>
+ <version>1.2.20</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!--mybatis-plus-spring-boot-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>3.5.3.2</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-extension</artifactId>
+ <version>3.5.3.2</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- 闃块噷fastjson -->
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>3.3.0</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
+ <version>2.0.40</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2-extension-spring6</artifactId>
+ <version>2.0.40</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- vo po杞崲 -->
+ <dependency>
+ <groupId>org.mapstruct</groupId>
+ <artifactId>mapstruct</artifactId>
+ <version>1.5.5.Final</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mapstruct</groupId>
+ <artifactId>mapstruct-processor</artifactId>
+ <version>1.5.5.Final</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- bean鍜宮ap浜掕浆鎹� -->
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo</artifactId>
+ <version>3.2.7</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- Hutool鏄竴涓皬鑰屽叏鐨凧ava宸ュ叿绫诲簱(https://github.com/dromara/hutool) -->
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>5.8.22</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- jdom2 -->
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom2</artifactId>
+ <version>2.0.6.1</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- apache mina -->
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>2.2.2</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- quartz -->
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>2.1.7</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- rocketmq-client -->
+ <dependency>
+ <groupId>org.apache.rocketmq</groupId>
+ <artifactId>rocketmq-client</artifactId>
+ <version>5.3.1</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!--閽夐拤娑堟伅鎺ㄩ��-->
+ <dependency>
+ <groupId>com.aliyun</groupId>
+ <artifactId>alibaba-dingtalk-service-sdk</artifactId>
+ <version>2.0.0</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.15</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- java瑙嗛澶勭悊 -->
+ <dependency>
+ <groupId>org.jcodec</groupId>
+ <artifactId>jcodec</artifactId>
+ <version>0.2.5</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jcodec</groupId>
+ <artifactId>jcodec-javase</artifactId>
+ <version>0.2.5</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.18.0</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- java鏁板鍏紡璁＄畻 -->
+ <dependency>
+ <groupId>net.objecthunter</groupId>
+ <artifactId>exp4j</artifactId>
+ <version>0.4.8</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- 娴嬭瘯 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <version>3.1.3</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- spring boot鎻愪緵鐨刴aven鎵撳寘鎻掍欢 -->
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <!-- 璇ユ彃浠朵笉浼氬皢椤圭洰涓紩鍏ョ殑渚濊禆鎵撹繘鏈�缁堢殑 Jar 鏂囦欢 -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <!-- 褰撻」鐩腑渚濊禆姣旇緝澶氭椂锛屾垜浠彲浠ュ�熷姪 maven-dependency-plugin 鎻掍欢鑷姩甯垜浠笅杞戒緷璧栫殑 Jar 鏂囦欢锛屾帹鑽愬皢璇ユ彃浠剁粦瀹氬埌package鐢熷懡鍛ㄦ湡涓� -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${maven-dependency-plugin.version}</version>
+ <executions>
+ <execution>
+ <!-- 缁戝畾鐢熷懡鍛ㄦ湡 -->
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <!-- 璁剧疆渚濊禆鐨勫瓨鏀捐矾寰� -->
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- 璁剧疆java缂栬瘧鐗堟湰锛岃繍琛岀幆澧冪増鏈� -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
+ <!-- source锛� 婧愪唬鐮佺紪璇戠増鏈紱target锛� 鐩爣骞冲彴缂栬瘧鐗堟湰锛沞ncoding锛� 瀛楃闆嗙紪鐮併�� -->
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ <encoding>${encoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- 瑙ｅ喅璧勬簮鏂囦欢鐨勭紪鐮侀棶棰� -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin.version}</version>
+ <configuration>
+ <encoding>${encoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- maven閲屾墽琛屾祴璇曠敤渚嬬殑鎻掍欢 -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <!-- 涓嬮潰瑙ｅ喅锛氬綋杩涜Maven Lifecycle package鏃舵姤閿欙細Could not find artifact org.apache.mina:mina-core:bundle:2.2.1 in maven (https://repo1.maven.org/maven2/)-->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven-bundle-plugin.version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
--
Gitblit v1.8.0