From 7d29685e196cc97d9b368572d9e5c18178018f06 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 22 十一月 2024 16:56:54 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pom.xml | 7 +++++++
pipIrr-platform/pipIrr-global/pom.xml | 6 +++++-
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java | 4 ++--
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java | 7 +++++++
pipIrr-platform/pipIrr-common/pom.xml | 11 ++++++-----
5 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/pom.xml b/pipIrr-platform/pipIrr-common/pom.xml
index c044a21..fa7c5a5 100644
--- a/pipIrr-platform/pipIrr-common/pom.xml
+++ b/pipIrr-platform/pipIrr-common/pom.xml
@@ -101,6 +101,11 @@
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.3.2</version>
</dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-extension</artifactId>
+ <version>3.5.3.2</version>
+ </dependency>
<!-- 闃块噷fastjson -->
<dependency>
@@ -167,11 +172,7 @@
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.17.2</version>
</dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-extension</artifactId>
- <version>3.5.3.2</version>
- </dependency>
+
</dependencies>
<build>
diff --git a/pipIrr-platform/pipIrr-global/pom.xml b/pipIrr-platform/pipIrr-global/pom.xml
index 84298ca..161108e 100644
--- a/pipIrr-platform/pipIrr-global/pom.xml
+++ b/pipIrr-platform/pipIrr-global/pom.xml
@@ -69,7 +69,6 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.18.28</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
@@ -94,6 +93,11 @@
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.3.2</version>
</dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-extension</artifactId>
+ <version>3.5.3.2</version>
+ </dependency>
<!-- 闃块噷fastjson -->
<dependency>
<groupId>cglib</groupId>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java
index a2449e2..e11e3f3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java
@@ -74,7 +74,7 @@
baCaptcha.setCode(captchaDomain.getCode());
baCaptcha.setExpiration(calendar.getTimeInMillis());
Long rec = captchaSV.addCaptcha(baCaptcha);
- System.out.println("token: " + captchaDomain.getToken() + "; code: " + captchaDomain.getCode());
+ //System.out.println("token: " + captchaDomain.getToken() + "; code: " + captchaDomain.getCode());
// 鏃犵敤淇℃伅璁剧┖
captchaDomain.setText(null);
@@ -118,7 +118,7 @@
baCaptcha.setCode(captchaDomain.getCode());
baCaptcha.setExpiration(calendar.getTimeInMillis());
Long rec = captchaSV.addCaptcha(baCaptcha);
- System.out.println("token: " + captchaDomain.getToken() + "; code: " + captchaDomain.getCode());
+ //System.out.println("token: " + captchaDomain.getToken() + "; code: " + captchaDomain.getCode());
// 浠ユ枃浠舵祦鐨勫舰寮忥紝杈撳嚭楠岃瘉鐮佸浘鐗�
ServletOutputStream out = null;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java
index f379023..897e5a7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java
@@ -317,6 +317,13 @@
if(!hasRunning){
cache.ugOverallState.allOver = true ;
}
+ if(cache.ugOverallState.allOver){
+ if(cache.ugRtuStateList != null && cache.ugRtuStateList.size() > 0){
+ for(UpgradeRtu rtu : cache.ugRtuStateList){
+ rtu.isOver = true ;
+ }
+ }
+ }
return hasRunning ;
}
}
diff --git a/pipIrr-platform/pom.xml b/pipIrr-platform/pom.xml
index 61492eb..a7955fc 100644
--- a/pipIrr-platform/pom.xml
+++ b/pipIrr-platform/pom.xml
@@ -186,6 +186,13 @@
<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>
--
Gitblit v1.8.0