解决进度条回退的问题

2 files changed, 6 insertions, 4 deletions

diff --git a/pom.xml b/pom.xml
index e6f92d6..25859ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.mesa</groupId>
 	<artifactId>galaxy-report-service</artifactId>
-	<version>22.03.18</version>
+	<version>22.04.11</version>
 	<name>galaxy-report-service</name>
 	<packaging>jar</packaging>
 	<description>Demo project for Spring Boot</description>
@@ -309,7 +309,7 @@
 					<forceTags>true</forceTags>
 
 					<imageTags>
-						<imageTag>22.03.18</imageTag>
+						<imageTag>22.04.11</imageTag>
 					</imageTags>
 					<!--远程docker构建，供dockerfile使用-->
 					<dockerHost>http://192.168.40.153:2375</dockerHost>
diff --git a/src/main/java/com/mesa/reportservice/service/impl/ExcuteProcessServiceImpl.java b/src/main/java/com/mesa/reportservice/service/impl/ExcuteProcessServiceImpl.java
index 05e9a67..ba8fa4a 100644
--- a/src/main/java/com/mesa/reportservice/service/impl/ExcuteProcessServiceImpl.java
+++ b/src/main/java/com/mesa/reportservice/service/impl/ExcuteProcessServiceImpl.java
@@ -142,10 +142,12 @@ public class ExcuteProcessServiceImpl implements ExcuteProcessService {
                         long read_rows = Long.parseLong(map.get("rows_read").toString());
                         float elapsed = Float.parseFloat(map.get("elapsed").toString());
                         double persent = Double.parseDouble(map.get("percent").toString());
-                        int result = (int) (persent * 100);
+                        int process = (int) (persent * 100);
                         job.setExcuteTime((int) elapsed);
                         job.setExcuteRow(read_rows);
-                        job.setExcuteProcess(result);
+                        if(job.getExcuteProcess()<process){
+                            job.setExcuteProcess(process);
+                        }
                         if (job.getExcuteRow() != 0 || job.getExcuteTime() != 0) {
                             ms.updateProcesses(job);
                         }