tijiao

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/impl/MultiSimulationProjectServiceImpl.java

@@ -654,25 +654,30 @@ public class MultiSimulationProjectServiceImpl implements MultiSimulationProject
         MultiSimulationProjectResultParam resultParam = new MultiSimulationProjectResultParam();
         resultParam.setSceneId(param.getSceneId());
         List<MultiSimulationProjectResultVO> multiSimulationProjectResultVOS = resultMapper.selectProjectResultList(resultParam);
+        String phrases = null;
         if (!CollectionUtils.isEmpty(multiSimulationProjectResultVOS)) {
             for (MultiSimulationProjectResultVO result : multiSimulationProjectResultVOS) {
                 Integer abnormalType = result.getAbnormalType();
-                Integer abnormalTime = result.getAbnormalTime();
-                String s = TimeUtil.changeTimeFormat(abnormalTime);
-                result.setAbnormalTimeDescription(s);
+//                String abnormalTime = result.getAbnormalTime();
+//                String s = TimeUtil.changeTimeFormat(abnormalTime);
+//                result.setAbnormalTimeDescription(abnormalTime);
                 if (abnormalType == MultiSimulationResultTypeEnum.COLLISION.getResultType()){
                     collisionDetail.add(result);
                 } else if (abnormalType == MultiSimulationResultTypeEnum.ABNORMAL_PARKING.getResultType()) {
                     abnormalParkingDetail.add(result);
                 } else if (abnormalType == MultiSimulationResultTypeEnum.OUT_OF_PAVEMENT.getResultType()) {
                     outOfPavementDetail.add(result);
+                }else if (abnormalType == MultiSimulationResultTypeEnum.LAST_DESCRIPTION.getResultType()){
+                    phrases = result.getAbnormalTimeDescription();
                 }
             }
         }
         MultiSimulationSceneResultVO multiSimulationSceneResultVO = new MultiSimulationSceneResultVO();
         multiSimulationSceneResultVO.setId(param.getSceneId()).setProjectId(sceneVO.getProjectId()).setProjectResultSimulationUrl(sceneVO.getProjectResultSimulationUrl())
-            .setProjectResultOverallUrl(sceneVO.getProjectResultOverallUrl()).setSceneName(sceneVO.getSceneName()).setCollisionTimes(collisionDetail.size())
-            .setAbnormalParkingTimes(abnormalParkingDetail.size()).setOutOfPavementTimes(outOfPavementDetail.size())
+            .setProjectResultOverallUrl(sceneVO.getProjectResultOverallUrl()).setSceneName(sceneVO.getSceneName())
+            .setPhrases(phrases)
+//            .setCollisionTimes(collisionDetail.size())
+//            .setAbnormalParkingTimes(abnormalParkingDetail.size()).setOutOfPavementTimes(outOfPavementDetail.size())
             .setCollisionDetail(collisionDetail).setAbnormalParkingDetail(abnormalParkingDetail).setOutOfPavementDetail(outOfPavementDetail);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, multiSimulationSceneResultVO);
     }