From fe323b176c9adb2369496a1dbc41f1a128a85ae5 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 16:46:35 +0800
Subject: [PATCH] 被终止的计划计算轮灌组实际灌溉时长时，如果时长为0则改为1
---
pipIrr-platform/pipIrr-mw/pom.xml | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pom.xml b/pipIrr-platform/pipIrr-mw/pom.xml
index 57010d3..69e82be 100644
--- a/pipIrr-platform/pipIrr-mw/pom.xml
+++ b/pipIrr-platform/pipIrr-mw/pom.xml
@@ -15,8 +15,12 @@
<description>姝ゆā鍧椾负鍏朵粬涓棿浠舵ā鍧楃殑鐖剁骇妯″潡锛屽彧瀹氫箟渚濊禆</description>
<modules>
- <module>pipIrr-mw-accept</module>
+ <module>pipIrr-mw-rtu</module>
+ <module>pipIrr-mw-rtu3rd</module>
+ <module>pipIrr-mw-simulate-rtu</module>
+ <module>pipIrr-mw-simulate-rtu202404</module>
<module>pipIrr-mwTest-server</module>
+ <module>pipIrr-mwTest-client</module>
</modules>
<dependencies>
@@ -24,7 +28,11 @@
<groupId>com.dy</groupId>
<artifactId>pipIrr-common</artifactId>
<version>1.0.0</version>
- <scope>provided</scope>
+ <!--
+ scope涓嶈兘鐢╬rovided锛屽惁鍒橲erver.java鐨勮繍琛屼笉璧锋潵
+ scope涓嶈兘鐢╮untime锛屽惁鍒欎笉鑳界紪杈�
+ -->
+ <scope>compile</scope>
<optional>true</optional>
<exclusions>
<exclusion>
@@ -38,7 +46,7 @@
<groupId>com.dy</groupId>
<artifactId>pipIrr-global</artifactId>
<version>1.0.0</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<optional>true</optional>
<exclusions>
<exclusion>
@@ -75,9 +83,8 @@
<artifactId>jackson-dataformat-yaml</artifactId>
<exclusions>
<exclusion>
- <!-- 鎺掗櫎鎺変緷璧� -->
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -118,6 +125,22 @@
<artifactId>jdom2</artifactId>
</dependency>
+ <!-- 鑾峰緱绯荤粺淇℃伅 -->
+ <dependency>
+ <groupId>com.github.oshi</groupId>
+ <artifactId>oshi-core</artifactId>
+ <version>6.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>5.12.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna-platform</artifactId>
+ <version>5.12.1</version>
+ </dependency>
<!-- 娴嬭瘯 -->
<dependency>
--
Gitblit v1.8.0