Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test

performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceServiceImpl.java

@@ -69,17 +69,27 @@ public class TruckTraceServiceImpl implements TruckTraceService {
             }
             else {
                 if (parkIdx == null) {continue;}
-                long stayTime = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()), LocalDateTimeUtils.parseTime(traceList.get(i).getGpsTime())).getSeconds();
-                traceList.get(parkIdx).setStayTime(new BigDecimal(stayTime).divide(new BigDecimal(60), 1, RoundingMode.HALF_UP));
-                traceList.get(parkIdx).setStayEndTime(traceList.get(i).getGpsTime());
+                long duration = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()),
+                        LocalDateTimeUtils.parseTime(traceList.get(i).getGpsTime())).getSeconds();
+                BigDecimal stayTime = new BigDecimal(duration)
+                        .divide(new BigDecimal(60), 1, RoundingMode.HALF_UP);
+                for (int j= parkIdx; j<=i; j++){
+                    traceList.get(j).setStayTime(stayTime);
+                    traceList.get(j).setStayEndTime(traceList.get(traceList.size()-1).getGpsTime());
+                }
                 parkIdx = null;
             }
         }
 
         if (parkIdx!=null && parkIdx < traceList.size()-1){
-            long stayTime = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()), LocalDateTimeUtils.parseTime(traceList.get(traceList.size()-1).getGpsTime())).getSeconds();
-            traceList.get(parkIdx).setStayTime(new BigDecimal(stayTime).divide(new BigDecimal(60), 1, RoundingMode.HALF_UP));
-            traceList.get(parkIdx).setStayEndTime(traceList.get(traceList.size()-1).getGpsTime());
+            long duration = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()),
+                    LocalDateTimeUtils.parseTime(traceList.get(traceList.size()-1).getGpsTime())).getSeconds();
+            BigDecimal stayTime = new BigDecimal(duration)
+                    .divide(new BigDecimal(60), 1, RoundingMode.HALF_UP);
+            for (int j= parkIdx; j<=traceList.size()-1; j++){
+                traceList.get(j).setStayTime(stayTime);
+                traceList.get(j).setStayEndTime(traceList.get(traceList.size()-1).getGpsTime());
+            }
         }
 
         return traceList;
@@ -98,17 +108,25 @@ public class TruckTraceServiceImpl implements TruckTraceService {
             }
             else {
                 if (parkIdx == null) {continue;}
-                long stayTime = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()), LocalDateTimeUtils.parseTime(traceList.get(i).getGpsTime())).getSeconds();
-                traceList.get(parkIdx).setStayTime(new BigDecimal(stayTime).divide(new BigDecimal(60), 1, RoundingMode.HALF_UP));
-                traceList.get(parkIdx).setStayEndTime(traceList.get(i).getGpsTime());
+                long duration = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()), LocalDateTimeUtils.parseTime(traceList.get(i).getGpsTime())).getSeconds();
+                BigDecimal stayTime = new BigDecimal(duration)
+                        .divide(new BigDecimal(60), 1, RoundingMode.HALF_UP);
+                for (int j= parkIdx; j<=i; j++) {
+                    traceList.get(j).setStayTime(stayTime);
+                    traceList.get(j).setStayEndTime(traceList.get(i).getGpsTime());
+                }
                 parkIdx = null;
             }
         }
 
         if (parkIdx!=null && parkIdx < traceList.size()-1){
-            long stayTime = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()), LocalDateTimeUtils.parseTime(traceList.get(traceList.size()-1).getGpsTime())).getSeconds();
-            traceList.get(parkIdx).setStayTime(new BigDecimal(stayTime).divide(new BigDecimal(60), 1, RoundingMode.HALF_UP));
-            traceList.get(parkIdx).setStayEndTime(traceList.get(traceList.size()-1).getGpsTime());
+            long duration = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()), LocalDateTimeUtils.parseTime(traceList.get(traceList.size()-1).getGpsTime())).getSeconds();
+            BigDecimal stayTime = new BigDecimal(duration)
+                    .divide(new BigDecimal(60), 1, RoundingMode.HALF_UP);
+            for (int j= parkIdx; j<=traceList.size()-1; j++) {
+                traceList.get(j).setStayTime(stayTime);
+                traceList.get(j).setStayEndTime(traceList.get(traceList.size() - 1).getGpsTime());
+            }
         }
 
         return traceList;