LingxinMeng 2 anni fa
parent
commit
53f7e90598

+ 6 - 6
simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/impl/SimulationProjectServiceImpl.java

@@ -1257,7 +1257,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 // throttle_list.add(Double.valueOf(split[]));///TODO 没有
 
             }
-            // 里程
+            // 计算总里程
             double lc = 0.0;
             for (int i = 0; i < time_list.size(); i++) {
                 if (i == 0) {
@@ -1271,8 +1271,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             Double pjsd = lc / time_list.get(time_list.size() - 1);
             pjsd = saveTwoDecimalPlaces(pjsd, 4);
 
-            Double zdsd = Collections.max(longitudinal_velocity_list); // 最大速度
-            Double zxsd = Collections.min(longitudinal_velocity_list); // 最小速度
+            double zdsd = Collections.max(longitudinal_velocity_list) * 3.6; // 最大速度
+            double zxsd = Collections.min(longitudinal_velocity_list) * 3.6; // 最小速度
             Double maxLateralAcceleration = Collections.max(lateral_acceleration_list); // 最大横向加速度
             Double minLateralAcceleration = Collections.min(lateral_acceleration_list); // 最小横向加速度(最大横向减速度)
             Double maxLongitudinalAcceleration = Collections.max(longitudinal_acceleration_list); // 最大纵向加速度
@@ -1331,8 +1331,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             // 任务详情信息
             resultVo.setMileage(Double.toString(lc));
             resultVo.setAverageVelocity(saveTwoDecimalPlaces(pjsd * 3.6, 4).toString());
-            resultVo.setMaximunSpeed(zdsd.toString()); // 最大速度
-            resultVo.setMinimunVelocity(zxsd.toString()); // 最小速度
+            resultVo.setMaximunSpeed(Double.toString(zdsd)); // 最大速度
+            resultVo.setMinimunVelocity(Double.toString(zxsd)); // 最小速度
             resultVo.setMaximumAcceleration(maxLateralAcceleration.toString()); // 最大横向加速度
             resultVo.setMaximumDeceleration(minLateralAcceleration.toString()); // 最大横向减速度
             resultVo.setMaxLongitudinalAcceleration(maxLongitudinalAcceleration.toString()); // 最大纵向加速度
@@ -2131,7 +2131,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             if (isEmpty(targetEvaluate) || isEmpty(sp.getScoreExplain())) {
                 sublistName += ProjectConstants.SEPARATOR + sp.getReturnSceneId() + ProjectConstants.SEPARATOR + sp.getSceneType() + ProjectConstants.SEPARATOR + "--" + ProjectConstants.SEPARATOR + "--" + ProjectConstants.SEPARATOR + "--";
             } else {
-                sublistName += ProjectConstants.SEPARATOR + sp.getReturnSceneId() + ProjectConstants.SEPARATOR + sp.getSceneType() + ProjectConstants.SEPARATOR + sceneScore + ProjectConstants.SEPARATOR + targetEvaluate + ProjectConstants.SEPARATOR + sp.getScoreExplain()+ ProjectConstants.SEPARATOR + sp.getTimeActual()+ ProjectConstants.SEPARATOR + sp.getTimeCorrection();
+                sublistName += ProjectConstants.SEPARATOR + sp.getReturnSceneId() + ProjectConstants.SEPARATOR + sp.getSceneType() + ProjectConstants.SEPARATOR + sceneScore + ProjectConstants.SEPARATOR + targetEvaluate + ProjectConstants.SEPARATOR + sp.getScoreExplain() + ProjectConstants.SEPARATOR + sp.getTimeActual() + ProjectConstants.SEPARATOR + sp.getTimeCorrection();
             }
             String[] split = sublistName.split(ProjectConstants.SEPARATOR);
             List<String> strings = new LinkedList<>(Arrays.asList(split));