diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index 908f5b1..b65566c 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -1153,7 +1153,8 @@ public class PatrolResultController extends BaseController { double runProgress = 0.0; double dbProgress = 0.0; try { - runProgress = Double.parseDouble(patrolTaskStatusItem.getTaskProgress()); + String runProgressStr = patrolTaskStatusItem.getTaskProgress().replaceAll("[^0-9]", ""); + runProgress = Double.parseDouble(runProgressStr); dbProgress = Double.parseDouble(patrolTaskStatusOfDb.getTaskProgress()); } catch (Exception e) { logger.error("patrol_task_status error number, run_progress: {}, db_progress: {}", patrolTaskStatusItem.getTaskProgress(), patrolTaskStatusOfDb.getTaskProgress()); @@ -2312,13 +2313,18 @@ public class PatrolResultController extends BaseController { } public static void main(String[] args) { + double runProgress = 0.0; double dbProgress = 0.0; - if(runProgress > dbProgress) { - System.out.println("1"); - } else { - System.out.println("2"); + String input = "100%"; + String input2 = input.replaceAll("[^0-9]", ""); + try { + runProgress = Double.parseDouble(input2); + } catch (Exception e) { + } + + System.out.println("runProgress:" + runProgress); } }